(
}
}
+export function elementAttributeInternal(
+ index: number, name: string, value: any, lView: LView, sanitizer?: SanitizerFn | null,
+ namespace?: string) {
+ ngDevMode && assertNotSame(value, NO_CHANGE as any, 'Incoming value should never be NO_CHANGE.');
+ ngDevMode && validateAgainstEventAttributes(name);
+ const element = getNativeByIndex(index, lView) as RElement;
+ const renderer = lView[RENDERER];
+ 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 {
+ namespace ? element.setAttributeNS(namespace, name, strValue) :
+ element.setAttribute(name, strValue);
+ }
+ }
+}
+
/**
* Sets initial input properties on directive instances from attribute data
*
diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts
index 4e88949712..3ecb11f346 100644
--- a/packages/core/src/render3/interfaces/node.ts
+++ b/packages/core/src/render3/interfaces/node.ts
@@ -47,19 +47,22 @@ export const enum TNodeType {
*/
export const enum TNodeFlags {
/** This bit is set if the node is a component */
- isComponent = 0b00001,
+ isComponent = 0b000001,
/** This bit is set if the node has been projected */
- isProjected = 0b00010,
+ isProjected = 0b000010,
/** This bit is set if any directive on this node has content queries */
- hasContentQuery = 0b00100,
+ hasContentQuery = 0b000100,
/** This bit is set if the node has any "class" inputs */
- hasClassInput = 0b01000,
+ hasClassInput = 0b001000,
/** This bit is set if the node has any "style" inputs */
- hasStyleInput = 0b10000,
+ hasStyleInput = 0b010000,
+
+ /** This bit is set if the node has been detached by i18n */
+ isDetached = 0b100000,
}
/**
diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts
index d5180a3158..120ba7195d 100644
--- a/packages/core/src/render3/jit/environment.ts
+++ b/packages/core/src/render3/jit/environment.ts
@@ -46,7 +46,6 @@ export const angularCoreEnv: {[name: string]: Function} =
'ɵɵNgOnChangesFeature': r3.ɵɵNgOnChangesFeature,
'ɵɵProvidersFeature': r3.ɵɵProvidersFeature,
'ɵɵInheritDefinitionFeature': r3.ɵɵInheritDefinitionFeature,
- 'ɵɵelementAttribute': r3.ɵɵelementAttribute,
'ɵɵbind': r3.ɵɵbind,
'ɵɵcontainer': r3.ɵɵcontainer,
'ɵɵnextContext': r3.ɵɵnextContext,
@@ -87,7 +86,6 @@ export const angularCoreEnv: {[name: string]: Function} =
'ɵɵlistener': r3.ɵɵlistener,
'ɵɵload': r3.ɵɵload,
'ɵɵprojection': r3.ɵɵprojection,
- 'ɵɵelementProperty': r3.ɵɵelementProperty,
'ɵɵupdateSyntheticHostBinding': r3.ɵɵupdateSyntheticHostBinding,
'ɵɵcomponentHostSyntheticListener': r3.ɵɵcomponentHostSyntheticListener,
'ɵɵpipeBind1': r3.ɵɵpipeBind1,
diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index 8fc447f32b..50dd8cd1d9 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -784,15 +784,17 @@ export function appendProjectedNodes(
appendChild(nodeToProject, tProjectionNode, lView);
} else {
while (nodeToProject) {
- if (nodeToProject.type === TNodeType.Projection) {
- appendProjectedNodes(
- lView, tProjectionNode, (nodeToProject as TProjectionNode).projection,
- findComponentView(projectedView));
- } else {
- // This flag must be set now or we won't know that this node is projected
- // if the nodes are inserted into a container later.
- nodeToProject.flags |= TNodeFlags.isProjected;
- appendProjectedNode(nodeToProject, tProjectionNode, lView, projectedView);
+ if (!(nodeToProject.flags & TNodeFlags.isDetached)) {
+ if (nodeToProject.type === TNodeType.Projection) {
+ appendProjectedNodes(
+ lView, tProjectionNode, (nodeToProject as TProjectionNode).projection,
+ findComponentView(projectedView));
+ } else {
+ // This flag must be set now or we won't know that this node is projected
+ // if the nodes are inserted into a container later.
+ nodeToProject.flags |= TNodeFlags.isProjected;
+ appendProjectedNode(nodeToProject, tProjectionNode, lView, projectedView);
+ }
}
nodeToProject = nodeToProject.projectionNext;
}
diff --git a/packages/core/src/render3/util/misc_utils.ts b/packages/core/src/render3/util/misc_utils.ts
index cf45c6f6c4..50db0983e2 100644
--- a/packages/core/src/render3/util/misc_utils.ts
+++ b/packages/core/src/render3/util/misc_utils.ts
@@ -26,7 +26,6 @@ export function isDifferent(a: any, b: any): boolean {
* be extra careful not to introduce megamorphic reads in it.
*/
export function renderStringify(value: any): string {
- if (typeof value === 'function') return value.name || value;
if (typeof value === 'string') return value;
if (value == null) return '';
return '' + value;
@@ -38,9 +37,10 @@ export function renderStringify(value: any): string {
* Important! This function contains a megamorphic read and should only be
* used for error messages.
*/
-export function stringifyForError(value: any) {
+export function stringifyForError(value: any): string {
+ if (typeof value === 'function') return value.name || value.toString();
if (typeof value === 'object' && value != null && typeof value.type === 'function') {
- return value.type.name || value.type;
+ return value.type.name || value.type.toString();
}
return renderStringify(value);
diff --git a/packages/core/test/acceptance/i18n_spec.ts b/packages/core/test/acceptance/i18n_spec.ts
index 4e9bc759b5..e1a8b742ba 100644
--- a/packages/core/test/acceptance/i18n_spec.ts
+++ b/packages/core/test/acceptance/i18n_spec.ts
@@ -9,6 +9,7 @@
import {registerLocaleData} from '@angular/common';
import localeRo from '@angular/common/locales/ro';
import {Component, ContentChild, ContentChildren, Directive, HostBinding, Input, LOCALE_ID, QueryList, TemplateRef, Type, ViewChild, ViewContainerRef, ɵi18nConfigureLocalize} from '@angular/core';
+import {setDelayProjection} from '@angular/core/src/render3/instructions/projection';
import {TestBed} from '@angular/core/testing';
import {expect} from '@angular/platform-browser/testing/src/matchers';
import {onlyInIvy} from '@angular/private/testing';
@@ -19,6 +20,8 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
TestBed.configureTestingModule({declarations: [AppComp, DirectiveWithTplRef]});
});
+ afterEach(() => { setDelayProjection(false); });
+
it('should translate text', () => {
ɵi18nConfigureLocalize({translations: {'text': 'texte'}});
const fixture = initWithTemplate(AppComp, `text
`);
@@ -712,6 +715,42 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
const element = fixture.nativeElement.firstChild;
expect(element.title).toBe('Bonjour Angular');
});
+
+ it('should apply i18n attributes during second template pass', () => {
+ @Directive({
+ selector: '[test]',
+ inputs: ['test'],
+ exportAs: 'dir',
+ })
+ class Dir {
+ }
+
+ @Component({
+ selector: 'other',
+ template: ``
+ })
+ class Other {
+ }
+
+ @Component({
+ selector: 'blah',
+ template: `
+
+
+ `
+ })
+ class Cmp {
+ }
+
+ TestBed.configureTestingModule({
+ declarations: [Dir, Cmp, Other],
+ });
+
+ const fixture = TestBed.createComponent(Cmp);
+ fixture.detectChanges();
+ expect(fixture.debugElement.children[0].children[0].references.ref.test).toBe('Set');
+ expect(fixture.debugElement.children[1].children[0].references.ref.test).toBe('Set');
+ });
});
it('should work with directives and host bindings', () => {
@@ -936,8 +975,7 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
.toEqual('Bonjour monde!
');
});
- // FW-1319 Runtime i18n should be able to remove projected placeholders
- xit('should be able to remove projected placeholders', () => {
+ it('should be able to remove projected placeholders', () => {
@Component({selector: 'grand-child', template: '
'})
class GrandChild {
}
@@ -990,6 +1028,170 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
expect(fixture.nativeElement.innerHTML)
.toEqual('Contenu');
});
+
+ it('should project content in i18n blocks', () => {
+ @Component({
+ selector: 'child',
+ template: `Content projected from
`
+ })
+ class Child {
+ }
+
+ @Component({selector: 'parent', template: `{{name}}`})
+ class Parent {
+ name: string = 'Parent';
+ }
+ TestBed.configureTestingModule({declarations: [Parent, Child]});
+ ɵi18nConfigureLocalize({
+ translations: {
+ 'Content projected from {$startTagNgContent}{$closeTagNgContent}':
+ 'Contenu projeté depuis {$startTagNgContent}{$closeTagNgContent}'
+ }
+ });
+
+ const fixture = TestBed.createComponent(Parent);
+ fixture.detectChanges();
+ expect(fixture.nativeElement.innerHTML)
+ .toEqual(`Contenu projeté depuis Parent
`);
+
+ fixture.componentRef.instance.name = 'Parent component';
+ fixture.detectChanges();
+ expect(fixture.nativeElement.innerHTML)
+ .toEqual(`Contenu projeté depuis Parent component
`);
+ });
+
+ it('should project content in i18n blocks with placeholders', () => {
+ @Component({
+ selector: 'child',
+ template: `Content projected from
`
+ })
+ class Child {
+ }
+
+ @Component({selector: 'parent', template: `{{name}}`})
+ class Parent {
+ name: string = 'Parent';
+ }
+ TestBed.configureTestingModule({declarations: [Parent, Child]});
+ ɵi18nConfigureLocalize({
+ translations: {
+ 'Content projected from {$startTagNgContent}{$closeTagNgContent}':
+ '{$startTagNgContent}{$closeTagNgContent} a projeté le contenu'
+ }
+ });
+ const fixture = TestBed.createComponent(Parent);
+ fixture.detectChanges();
+ expect(fixture.nativeElement.innerHTML)
+ .toEqual(`Parent a projeté le contenu
`);
+ });
+
+ it('should project translated content in i18n blocks', () => {
+ @Component(
+ {selector: 'child', template: `Child content
`})
+ class Child {
+ }
+
+ @Component({selector: 'parent', template: `and projection from {{name}}`})
+ class Parent {
+ name: string = 'Parent';
+ }
+ TestBed.configureTestingModule({declarations: [Parent, Child]});
+ ɵi18nConfigureLocalize({
+ translations: {
+ 'Child content {$startTagNgContent}{$closeTagNgContent}':
+ 'Contenu enfant {$startTagNgContent}{$closeTagNgContent}',
+ 'and projection from {$interpolation}': 'et projection depuis {$interpolation}'
+ }
+ });
+ const fixture = TestBed.createComponent(Parent);
+ fixture.detectChanges();
+ expect(fixture.nativeElement.innerHTML)
+ .toEqual(`Contenu enfant et projection depuis Parent
`);
+ });
+
+ it('should project bare ICU expressions', () => {
+ @Component({selector: 'child', template: '
'})
+ class Child {
+ }
+
+ @Component({
+ selector: 'parent',
+ template: `
+ {
+ value // i18n(ph = "blah"),
+ plural,
+ =1 {one}
+ other {at least {{value}} .}
+ }`
+ })
+ 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');
+ });
+
+ it('should project ICUs in i18n blocks', () => {
+ @Component(
+ {selector: 'child', template: `Child content
`})
+ class Child {
+ }
+
+ @Component({
+ selector: 'parent',
+ template:
+ `and projection from {name, select, angular {Angular} other {{{name}}}}`
+ })
+ class Parent {
+ name: string = 'Parent';
+ }
+ TestBed.configureTestingModule({declarations: [Parent, Child]});
+ ɵi18nConfigureLocalize({
+ translations: {
+ 'Child content {$startTagNgContent}{$closeTagNgContent}':
+ 'Contenu enfant {$startTagNgContent}{$closeTagNgContent}',
+ 'and projection from {$icu}': 'et projection depuis {$icu}'
+ }
+ });
+ const fixture = TestBed.createComponent(Parent);
+ fixture.detectChanges();
+ expect(fixture.nativeElement.innerHTML)
+ .toEqual(
+ `Contenu enfant et projection depuis Parent
`);
+
+ fixture.componentRef.instance.name = 'angular';
+ fixture.detectChanges();
+ expect(fixture.nativeElement.innerHTML)
+ .toEqual(
+ `Contenu enfant et projection depuis Angular
`);
+ });
+
+ it(`shouldn't project deleted projections in i18n blocks`, () => {
+ @Component(
+ {selector: 'child', template: `Child content
`})
+ class Child {
+ }
+
+ @Component({selector: 'parent', template: `and projection from {{name}}`})
+ class Parent {
+ name: string = 'Parent';
+ }
+ TestBed.configureTestingModule({declarations: [Parent, Child]});
+ ɵi18nConfigureLocalize({
+ translations: {
+ 'Child content {$startTagNgContent}{$closeTagNgContent}': 'Contenu enfant',
+ 'and projection from {$interpolation}': 'et projection depuis {$interpolation}'
+ }
+ });
+ const fixture = TestBed.createComponent(Parent);
+ fixture.detectChanges();
+ expect(fixture.nativeElement.innerHTML).toEqual(`Contenu enfant
`);
+ });
});
describe('queries', () => {
diff --git a/packages/core/test/acceptance/text_spec.ts b/packages/core/test/acceptance/text_spec.ts
index 3f3e665f06..87f6d28664 100644
--- a/packages/core/test/acceptance/text_spec.ts
+++ b/packages/core/test/acceptance/text_spec.ts
@@ -112,4 +112,20 @@ describe('text instructions', () => {
expect(div.innerHTML).toBe('<h1>LOL, big text</h1>');
});
+
+ it('should stringify functions used in bindings', () => {
+ @Component({
+ template: '{{test}}
',
+ })
+ class App {
+ test = function foo() {};
+ }
+
+ TestBed.configureTestingModule({declarations: [App]});
+ const fixture = TestBed.createComponent(App);
+ fixture.detectChanges();
+ const div = fixture.nativeElement.querySelector('div');
+
+ expect(div.innerHTML).toBe('function foo() { }');
+ });
});
diff --git a/packages/core/test/debug/debug_node_spec.ts b/packages/core/test/debug/debug_node_spec.ts
index cbec33a9ca..4f318f0b1a 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, DebugNode, 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, Renderer2, 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';
@@ -736,5 +736,58 @@ class TestCmptWithPropBindings {
]);
});
+ it('should preserve the attribute case in DebugNode.attributes', () => {
+ @Component({selector: 'my-icon', template: ''})
+ class Icon {
+ @Input() svgIcon: any = '';
+ }
+ @Component({template: ``})
+ class App {
+ }
+
+ TestBed.configureTestingModule({declarations: [App, Icon]});
+ const fixture = TestBed.createComponent(App);
+ fixture.detectChanges();
+ const element = fixture.debugElement.children[0];
+
+ // Assert that the camel-case attribute is correct.
+ expect(element.attributes.svgIcon).toBe('test');
+
+ // Make sure that we somehow didn't preserve the native lower-cased value.
+ expect(element.attributes.svgicon).toBeFalsy();
+ });
+
+
+ it('should include namespaced attributes in DebugNode.attributes', () => {
+ @Component({
+ template: ``,
+ })
+ class Comp {
+ }
+
+ TestBed.configureTestingModule({declarations: [Comp]});
+ const fixture = TestBed.createComponent(Comp);
+ fixture.detectChanges();
+
+ expect(fixture.debugElement.query(By.css('div')).attributes['xlink:href']).toBe('foo');
+ });
+
+ it('should include attributes added via Renderer2 in DebugNode.attributes', () => {
+ @Component({
+ template: '',
+ })
+ class Comp {
+ constructor(public renderer: Renderer2) {}
+ }
+
+ TestBed.configureTestingModule({declarations: [Comp]});
+ const fixture = TestBed.createComponent(Comp);
+ const div = fixture.debugElement.query(By.css('div'));
+
+ fixture.componentInstance.renderer.setAttribute(div.nativeElement, 'foo', 'bar');
+
+ expect(div.attributes.foo).toBe('bar');
+ });
+
});
}
diff --git a/packages/core/test/render3/change_detection_spec.ts b/packages/core/test/render3/change_detection_spec.ts
index 52629da45b..9e27b42ec1 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, ɵɵproperty, ɵɵselect} from '../../src/render3/index';
+import {detectChanges, markDirty, tick, ɵɵbind, ɵɵelement, ɵɵelementEnd, ɵɵ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';
@@ -186,7 +186,8 @@ describe('change detection', () => {
ɵɵelement(0, 'manual-comp');
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(0, 'name', ɵɵbind(ctx.name));
+ ɵɵselect(0);
+ ɵɵproperty('name', ctx.name);
}
},
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index fbd43b429e..6526e39a43 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -8,8 +8,8 @@
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, ɵɵproperty, ɵɵselect, ɵɵtemplate} from '../../src/render3/index';
+import {tick, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵ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';
@@ -137,7 +137,8 @@ describe('component', () => {
ɵɵelement(4097, 'comp');
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(4097, 'name', ɵɵbind(ctx.name));
+ ɵɵselect(4097);
+ ɵɵproperty('name', ctx.name);
}
}, 4098, 1, [Comp]);
@@ -188,7 +189,8 @@ it('should not invoke renderer destroy method for embedded views', () => {
2, MyComponent_div_Template_2, 2, 0, 'div', [AttributeMarker.Template, 'ngIf']);
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(2, 'ngIf', ɵɵbind(ctx.visible));
+ ɵɵselect(2);
+ ɵɵproperty('ngIf', ctx.visible);
}
}
});
@@ -269,7 +271,8 @@ describe('component with a container', () => {
ɵɵelement(0, 'wrapper');
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(0, 'items', ɵɵbind(ctx.items));
+ ɵɵselect(0);
+ ɵɵproperty('items', ctx.items);
}
}
@@ -339,7 +342,8 @@ describe('recursive components', () => {
ɵɵelement(0, 'tree-comp');
}
if (rf0 & RenderFlags.Update) {
- ɵɵelementProperty(0, 'data', ɵɵbind(ctx.data.left));
+ ɵɵselect(0);
+ ɵɵproperty('data', ctx.data.left);
}
ɵɵembeddedViewEnd();
}
@@ -353,7 +357,8 @@ describe('recursive components', () => {
ɵɵelement(0, 'tree-comp');
}
if (rf0 & RenderFlags.Update) {
- ɵɵelementProperty(0, 'data', ɵɵbind(ctx.data.right));
+ ɵɵselect(0);
+ ɵɵproperty('data', ctx.data.right);
}
ɵɵembeddedViewEnd();
}
@@ -400,8 +405,10 @@ describe('recursive components', () => {
}
if (rf & RenderFlags.Update) {
ɵɵtextBinding(0, ɵɵbind(ctx.data.value));
- ɵɵelementProperty(1, 'ngIf', ɵɵbind(ctx.data.left));
- ɵɵelementProperty(2, 'ngIf', ɵɵbind(ctx.data.right));
+ ɵɵselect(1);
+ ɵɵproperty('ngIf', ɵɵbind(ctx.data.left));
+ ɵɵselect(2);
+ ɵɵproperty('ngIf', ctx.data.right);
}
},
@@ -416,7 +423,8 @@ describe('recursive components', () => {
}
if (rf & RenderFlags.Update) {
const parent = ɵɵnextContext();
- ɵɵelementProperty(0, 'data', ɵɵbind(parent.data.left));
+ ɵɵselect(0);
+ ɵɵproperty('data', parent.data.left);
}
}
@@ -427,7 +435,8 @@ describe('recursive components', () => {
}
if (rf & RenderFlags.Update) {
const parent = ɵɵnextContext();
- ɵɵelementProperty(0, 'data', ɵɵbind(parent.data.right));
+ ɵɵselect(0);
+ ɵɵproperty('data', parent.data.right);
}
}
diff --git a/packages/core/test/render3/i18n_spec.ts b/packages/core/test/render3/i18n_spec.ts
index 154e974cde..0da67146a4 100644
--- a/packages/core/test/render3/i18n_spec.ts
+++ b/packages/core/test/render3/i18n_spec.ts
@@ -8,13 +8,14 @@
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 {setDelayProjection, ɵɵ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';
import {TemplateFixture} from './render_util';
describe('Runtime i18n', () => {
+ afterEach(() => { setDelayProjection(false); });
describe('getTranslationForTemplate', () => {
it('should crop messages for the selected template', () => {
let message = `simple text`;
diff --git a/packages/core/test/render3/instructions_spec.ts b/packages/core/test/render3/instructions_spec.ts
index cc75beec31..ee6e856108 100644
--- a/packages/core/test/render3/instructions_spec.ts
+++ b/packages/core/test/render3/instructions_spec.ts
@@ -9,7 +9,7 @@
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 {RenderFlags, ɵɵattribute, ɵɵclassMap, ɵɵelement, ɵɵelementEnd, ɵɵ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';
@@ -58,10 +58,16 @@ 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(() => {
+ ɵɵselect(0);
+ ɵɵproperty('title', 'Hello');
+ });
expect(t.html).toEqual('');
- t.update(() => ɵɵelementProperty(0, 'title', ɵɵbind('World')));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵproperty('title', 'World');
+ });
expect(t.html).toEqual('');
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
@@ -74,7 +80,10 @@ 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 = () => {
+ ɵɵselect(0);
+ ɵɵproperty('title', 'Hello');
+ };
const t = new TemplateFixture(createAnchor, idempotentUpdate, 1, 1);
t.update();
@@ -110,16 +119,20 @@ describe('instructions', () => {
});
});
- describe('elementAttribute', () => {
+ describe('attribute', () => {
it('should use sanitizer function', () => {
- const t = new TemplateFixture(createDiv, () => {}, 1);
+ const t = new TemplateFixture(createDiv, () => {}, 1, 1);
- t.update(() => ɵɵelementAttribute(0, 'title', 'javascript:true', ɵɵsanitizeUrl));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('title', 'javascript:true', ɵɵsanitizeUrl);
+ });
expect(t.html).toEqual('');
- t.update(
- () => ɵɵelementAttribute(
- 0, 'title', bypassSanitizationTrustUrl('javascript:true'), ɵɵsanitizeUrl));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('title', bypassSanitizationTrustUrl('javascript:true'), ɵɵsanitizeUrl);
+ });
expect(t.html).toEqual('');
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
@@ -295,7 +308,8 @@ describe('instructions', () => {
}
if (rf & RenderFlags.Update) {
const row_r2 = ctx0.$implicit;
- ɵɵelementProperty(1, 'ngForOf', ɵɵbind(row_r2));
+ ɵɵselect(1);
+ ɵɵproperty('ngForOf', row_r2);
}
}
@@ -331,7 +345,8 @@ describe('instructions', () => {
ɵɵtemplate(0, ToDoAppComponent_NgForOf_Template_0, 2, 1, 'ul', _c0);
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(0, 'ngForOf', ɵɵbind(ctx.rows));
+ ɵɵselect(0);
+ ɵɵproperty('ngForOf', ctx.rows);
}
},
directives: [NgForOf]
@@ -349,165 +364,210 @@ describe('instructions', () => {
describe('sanitization injection compatibility', () => {
it('should work for url sanitization', () => {
const s = new LocalMockSanitizer(value => `${value}-sanitized`);
- const t = new TemplateFixture(createAnchor, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createAnchor, undefined, 1, 1, null, null, s);
const inputValue = 'http://foo';
const outputValue = 'http://foo-sanitized';
- t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('href', inputValue, ɵɵsanitizeUrl);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toEqual(outputValue);
});
it('should bypass url sanitization if marked by the service', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createAnchor, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createAnchor, undefined, 1, 1, null, null, s);
const inputValue = s.bypassSecurityTrustUrl('http://foo');
const outputValue = 'http://foo';
- t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('href', inputValue, ɵɵsanitizeUrl);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should bypass ivy-level url sanitization if a custom sanitizer is used', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createAnchor, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createAnchor, undefined, 1, 1, null, null, s);
const inputValue = bypassSanitizationTrustUrl('http://foo');
const outputValue = 'http://foo-ivy';
- t.update(() => ɵɵelementAttribute(0, 'href', inputValue, ɵɵsanitizeUrl));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('href', inputValue, ɵɵsanitizeUrl);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should work for style sanitization', () => {
const s = new LocalMockSanitizer(value => `color:blue`);
- const t = new TemplateFixture(createDiv, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
const inputValue = 'color:red';
const outputValue = 'color:blue';
- t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('style', inputValue, ɵɵsanitizeStyle);
+ });
expect(stripStyleWsCharacters(t.html)).toEqual(``);
expect(s.lastSanitizedValue).toEqual(outputValue);
});
it('should bypass style sanitization if marked by the service', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createDiv, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
const inputValue = s.bypassSecurityTrustStyle('color:maroon');
const outputValue = 'color:maroon';
- t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('style', inputValue, ɵɵsanitizeStyle);
+ });
expect(stripStyleWsCharacters(t.html)).toEqual(``);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should bypass ivy-level style sanitization if a custom sanitizer is used', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createDiv, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
const inputValue = bypassSanitizationTrustStyle('font-family:foo');
const outputValue = 'font-family:foo-ivy';
- t.update(() => ɵɵelementAttribute(0, 'style', inputValue, ɵɵsanitizeStyle));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('style', inputValue, ɵɵsanitizeStyle);
+ });
expect(stripStyleWsCharacters(t.html)).toEqual(``);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should work for resourceUrl sanitization', () => {
const s = new LocalMockSanitizer(value => `${value}-sanitized`);
- const t = new TemplateFixture(createScript, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
const inputValue = 'http://resource';
const outputValue = 'http://resource-sanitized';
- t.update(() => ɵɵelementAttribute(0, 'src', inputValue, ɵɵsanitizeResourceUrl));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵattribute('src', inputValue, ɵɵsanitizeResourceUrl);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toEqual(outputValue);
});
it('should bypass resourceUrl sanitization if marked by the service', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createScript, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
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(() => {
+ ɵɵselect(0);
+ ɵɵattribute('src', inputValue, ɵɵsanitizeResourceUrl);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should bypass ivy-level resourceUrl sanitization if a custom sanitizer is used', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createScript, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
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(() => {
+ ɵɵselect(0);
+ ɵɵattribute('src', inputValue, ɵɵsanitizeResourceUrl);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should work for script sanitization', () => {
const s = new LocalMockSanitizer(value => `${value} //sanitized`);
- const t = new TemplateFixture(createScript, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
const inputValue = 'fn();';
const outputValue = 'fn(); //sanitized';
- t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵproperty('innerHTML', inputValue, ɵɵsanitizeScript);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toEqual(outputValue);
});
it('should bypass script sanitization if marked by the service', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createScript, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
const inputValue = s.bypassSecurityTrustScript('alert("bar")');
const outputValue = 'alert("bar")';
- t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵproperty('innerHTML', inputValue, ɵɵsanitizeScript);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should bypass ivy-level script sanitization if a custom sanitizer is used', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createScript, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createScript, undefined, 1, 1, null, null, s);
const inputValue = bypassSanitizationTrustScript('alert("bar")');
const outputValue = 'alert("bar")-ivy';
- t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeScript));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵproperty('innerHTML', inputValue, ɵɵsanitizeScript);
+ });
expect(t.html).toEqual(``);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should work for html sanitization', () => {
const s = new LocalMockSanitizer(value => `${value} `);
- const t = new TemplateFixture(createDiv, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
const inputValue = '';
const outputValue = ' ';
- t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵproperty('innerHTML', inputValue, ɵɵsanitizeHtml);
+ });
expect(t.html).toEqual(`${outputValue}
`);
expect(s.lastSanitizedValue).toEqual(outputValue);
});
it('should bypass html sanitization if marked by the service', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createDiv, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
const inputValue = s.bypassSecurityTrustHtml('');
const outputValue = '';
- t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵproperty('innerHTML', inputValue, ɵɵsanitizeHtml);
+ });
expect(t.html).toEqual(`${outputValue}
`);
expect(s.lastSanitizedValue).toBeFalsy();
});
it('should bypass ivy-level script sanitization if a custom sanitizer is used', () => {
const s = new LocalMockSanitizer(value => '');
- const t = new TemplateFixture(createDiv, undefined, 1, 0, null, null, s);
+ const t = new TemplateFixture(createDiv, undefined, 1, 1, null, null, s);
const inputValue = bypassSanitizationTrustHtml('');
const outputValue = '-ivy';
- t.update(() => ɵɵelementProperty(0, 'innerHTML', inputValue, ɵɵsanitizeHtml));
+ t.update(() => {
+ ɵɵselect(0);
+ ɵɵproperty('innerHTML', inputValue, ɵɵsanitizeHtml);
+ });
expect(t.html).toEqual(`${outputValue}
`);
expect(s.lastSanitizedValue).toBeFalsy();
});
diff --git a/packages/core/test/render3/integration_spec.ts b/packages/core/test/render3/integration_spec.ts
index 0674229a90..2bf250c4e7 100644
--- a/packages/core/test/render3/integration_spec.ts
+++ b/packages/core/test/render3/integration_spec.ts
@@ -8,8 +8,8 @@
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, ɵɵattribute, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵproperty} from '../../src/render3/index';
+import {ɵɵallocHostVars, ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵ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';
@@ -159,8 +159,9 @@ describe('render3 integration test', () => {
ɵɵelementEnd();
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(0, 'beforeTree', ɵɵbind(ctx.beforeTree));
- ɵɵelementProperty(0, 'afterTree', ɵɵbind(ctx.afterTree));
+ ɵɵselect(0);
+ ɵɵproperty('beforeTree', ctx.beforeTree);
+ ɵɵproperty('afterTree', ctx.afterTree);
ɵɵcontainerRefreshStart(1);
{
const rf0 = ɵɵembeddedViewStart(0, 3, 0);
@@ -285,7 +286,8 @@ describe('component animations', () => {
ɵɵelement(0, 'div', [AttributeMarker.Bindings, '@fooAnimation']);
}
if (rf & RenderFlags.Update) {
- ɵɵelementAttribute(0, '@fooAnimation', ɵɵbind(ctx.animationValue));
+ ɵɵselect(0);
+ ɵɵattribute('@fooAnimation', ctx.animationValue);
}
}
});
@@ -335,48 +337,54 @@ describe('component animations', () => {
expect(attr).toEqual('@fooAnimation');
});
- it('should allow host binding animations to be picked up and rendered', () => {
- class ChildCompWithAnim {
- 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);
- }
- },
- });
+ // TODO(benlesh): this test does not seem to be testing anything we could actually generate with
+ // these instructions. ɵɵbind should be present in the ɵɵelementProperty call in the hostBindings,
+ // however adding that causes an error because the slot has not been allocated. There is a
+ // directive called `comp-with-anim`, that seems to want to be a component, but is defined as a
+ // directive that is looking for a property `@fooAnim` to update.
- exp = 'go';
- }
+ // it('should allow host binding animations to be picked up and rendered', () => {
+ // class ChildCompWithAnim {
+ // 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);
+ // }
+ // },
+ // });
- class ParentComp {
- static ngComponentDef = ɵɵdefineComponent({
- type: ParentComp,
- consts: 1,
- vars: 1,
- selectors: [['foo']],
- factory: () => new ParentComp(),
- template: (rf: RenderFlags, ctx: ParentComp) => {
- if (rf & RenderFlags.Create) {
- ɵɵelement(0, 'child-comp-with-anim');
- }
- },
- directives: [ChildCompWithAnim]
- });
- }
+ // exp = 'go';
+ // }
- const rendererFactory = new MockRendererFactory(['setProperty']);
- const fixture = new ComponentFixture(ParentComp, {rendererFactory});
+ // class ParentComp {
+ // static ngComponentDef = ɵɵdefineComponent({
+ // type: ParentComp,
+ // consts: 1,
+ // vars: 1,
+ // selectors: [['foo']],
+ // factory: () => new ParentComp(),
+ // template: (rf: RenderFlags, ctx: ParentComp) => {
+ // if (rf & RenderFlags.Create) {
+ // ɵɵelement(0, 'child-comp-with-anim');
+ // }
+ // },
+ // directives: [ChildCompWithAnim]
+ // });
+ // }
- const renderer = rendererFactory.lastRenderer !;
- fixture.update();
+ // const rendererFactory = new MockRendererFactory(['setProperty']);
+ // const fixture = new ComponentFixture(ParentComp, {rendererFactory});
- const spy = renderer.spies['setProperty'];
- const [elm, attr, value] = spy.calls.mostRecent().args;
- expect(attr).toEqual('@fooAnim');
- });
+ // const renderer = rendererFactory.lastRenderer !;
+ // fixture.update();
+
+ // const spy = renderer.spies['setProperty'];
+ // const [elm, attr, value] = spy.calls.mostRecent().args;
+ // expect(attr).toEqual('@fooAnim');
+ // });
});
describe('element discovery', () => {
@@ -485,7 +493,8 @@ describe('element discovery', () => {
ɵɵelementEnd();
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(1, 'ngIf', true);
+ ɵɵselect(1);
+ ɵɵproperty('ngIf', true);
}
}
});
@@ -1087,7 +1096,8 @@ describe('sanitization', () => {
ɵɵelement(0, 'a');
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(0, 'href', ɵɵbind(ctx.href), ɵɵsanitizeUrl);
+ ɵɵselect(0);
+ ɵɵproperty('href', ctx.href, ɵɵsanitizeUrl);
}
}
});
@@ -1127,7 +1137,8 @@ describe('sanitization', () => {
ɵɵallocHostVars(1);
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(elementIndex, 'cite', ɵɵbind(ctx.cite), ɵɵsanitizeUrl, true);
+ ɵɵselect(elementIndex);
+ ɵɵproperty('cite', ctx.cite, ɵɵsanitizeUrl, true);
}
}
});
diff --git a/packages/core/test/render3/lifecycle_spec.ts b/packages/core/test/render3/lifecycle_spec.ts
index 2c69104aad..c60cd26a34 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, ɵɵproperty} from '../../src/render3/index';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelement, ɵɵelementEnd, ɵɵ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';
@@ -22,7 +22,8 @@ describe('lifecycles', () => {
ɵɵelement(0, name);
}
if (rf & RenderFlags.Update) {
- ɵɵelementProperty(0, 'val', ɵɵbind(ctx.val));
+ ɵɵselect(0);
+ ɵɵproperty('val', ctx.val);
}
};
}
diff --git a/packages/core/test/render3/pure_function_spec.ts b/packages/core/test/render3/pure_function_spec.ts
index 42f7a17476..c394358e35 100644
--- a/packages/core/test/render3/pure_function_spec.ts
+++ b/packages/core/test/render3/pure_function_spec.ts
@@ -5,8 +5,8 @@
* 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, ɵɵproperty, ɵɵselect} from '../../src/render3/index';
+import {ɵɵbind, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart} from '../../src/render3/instructions/all';
import {RenderFlags} from '../../src/render3/interfaces/definition';
import {ɵɵpureFunction2} from '../../src/render3/pure_function';
import {getDirectiveOnNode, renderToHtml} from '../../test/render3/render_util';
@@ -58,9 +58,10 @@ describe('object literals', () => {
ɵɵelementEnd();
}
if (rf1 & RenderFlags.Update) {
- ɵɵelementProperty(
- 0, 'config', ɵɵbind(ɵɵpureFunction2(
- 1, e0_ff, ctx.configs[i].opacity, ctx.configs[i].duration)));
+ ɵɵselect(0);
+ ɵɵproperty(
+ 'config',
+ ɵɵpureFunction2(1, e0_ff, ctx.configs[i].opacity, ctx.configs[i].duration));
}
ɵɵembeddedViewEnd();
}
diff --git a/packages/core/testing/tsconfig-build.json b/packages/core/testing/tsconfig-build.json
deleted file mode 100644
index 7b91f4043b..0000000000
--- a/packages/core/testing/tsconfig-build.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "rxjs/*": [
- "../../../node_modules/rxjs/*"
- ],
- "@angular/core": [
- "../../../dist/packages/core"
- ],
- "@angular/compiler": [
- "../../../dist/packages/compiler"
- ],
- },
- "outDir": "../../../dist/packages/core"
- },
- "files": [
- "public_api.ts",
- "../../../node_modules/zone.js/dist/zone.js.d.ts",
- "../../system.d.ts",
- "../../types.d.ts"
- ],
- "angularCompilerOptions": {
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "testing.js",
- "flatModuleId": "@angular/core/testing"
- }
-}
\ No newline at end of file
diff --git a/packages/core/tsconfig-build.json b/packages/core/tsconfig-build.json
deleted file mode 100644
index a60be80d19..0000000000
--- a/packages/core/tsconfig-build.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "rxjs/*": [
- "../../node_modules/rxjs/*"
- ],
- "@angular/core": [
- "."
- ],
- "@angular/compiler": [
- "../../dist/packages/compiler"
- ]
- },
- "outDir": "../../dist/packages/core"
- },
- "files": [
- "public_api.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts",
- "../system.d.ts"
- ],
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "core.js",
- "flatModuleId": "@angular/core"
- }
-}
\ No newline at end of file
diff --git a/packages/elements/tsconfig-build.json b/packages/elements/tsconfig-build.json
deleted file mode 100644
index 47c15f8038..0000000000
--- a/packages/elements/tsconfig-build.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"],
- "rxjs/*": ["../../node_modules/rxjs/*"]
- },
- "outDir": "../../dist/packages/elements"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "elements.js",
- "flatModuleId": "@angular/elements"
- }
-}
diff --git a/packages/forms/tsconfig-build.json b/packages/forms/tsconfig-build.json
deleted file mode 100644
index d766f005fe..0000000000
--- a/packages/forms/tsconfig-build.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/core/testing": ["../../dist/packages/core/testing"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/common/testing": ["../../dist/packages/common/testing"],
- "@angular/compiler": ["../../dist/packages/compiler"],
- "@angular/compiler/testing": ["../../dist/packages/compiler/testing"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"]
- },
- "outDir": "../../dist/packages/forms"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "forms.js",
- "flatModuleId": "@angular/forms"
- }
-}
diff --git a/packages/http/testing/tsconfig-build.json b/packages/http/testing/tsconfig-build.json
deleted file mode 100644
index caef5194fb..0000000000
--- a/packages/http/testing/tsconfig-build.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "@angular/core": ["../../../dist/packages/core"],
- "@angular/http": ["../../../dist/packages/http"],
- "rxjs/*": ["../../../node_modules/rxjs/*"]
- },
- "outDir": "../../../dist/packages/http"
- },
-
- "files": [
- "public_api.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "testing.js",
- "flatModuleId": "@angular/http/testing"
- }
-}
diff --git a/packages/http/tsconfig-build.json b/packages/http/tsconfig-build.json
deleted file mode 100644
index 4c42fd5359..0000000000
--- a/packages/http/tsconfig-build.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"]
- },
- "outDir": "../../dist/packages/http"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "http.js",
- "flatModuleId": "@angular/http"
- }
-}
diff --git a/packages/language-service/tsconfig-build.json b/packages/language-service/tsconfig-build.json
deleted file mode 100644
index 5641c2bd19..0000000000
--- a/packages/language-service/tsconfig-build.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "emitDecoratorMetadata": true,
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/animation": ["../../dist/packages/animation"],
- "@angular/animation/browser": ["../../dist/packages/animation/browser"],
- "@angular/core/testing": ["../../dist/packages/core/testing"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/compiler": ["../../dist/packages/compiler"],
- "@angular/compiler-cli": ["../../dist/packages/compiler-cli"],
- "@angular/compiler-cli/*": ["../../dist/packages/compiler-cli/*"],
- "@angular/http": ["../../dist/packages/http"],
- "@angular/platform-server": ["../../dist/packages/platform-server"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"]
- },
- "outDir": "../../dist/packages/language-service"
- },
-
- "files": [
- "index.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts",
- "../../node_modules/@types/node/index.d.ts",
- "../../node_modules/@types/jasmine/index.d.ts"
- ]
-}
diff --git a/packages/platform-browser-dynamic/testing/tsconfig-build.json b/packages/platform-browser-dynamic/testing/tsconfig-build.json
deleted file mode 100644
index 398fe63fc5..0000000000
--- a/packages/platform-browser-dynamic/testing/tsconfig-build.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "@angular/core": ["../../../dist/packages/core"],
- "@angular/core/testing": ["../../../dist/packages/core/testing"],
- "@angular/common": ["../../../dist/packages/common"],
- "@angular/common/testing": ["../../../dist/packages/common/testing"],
- "@angular/compiler": ["../../../dist/packages/compiler"],
- "@angular/compiler/testing": ["../../../dist/packages/compiler/testing"],
- "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
- "@angular/platform-browser/testing": ["../../../dist/packages/platform-browser/testing"],
- "@angular/platform-browser-dynamic": ["../../../dist/packages/platform-browser-dynamic"]
- },
- "outDir": "../../../dist/packages/platform-browser-dynamic"
- },
-
- "files": [
- "public_api.ts",
- "../../../node_modules/@types/jasmine/index.d.ts",
- "../../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "testing.js",
- "flatModuleId": "@angular/platform-browser-dynamic/testing"
- }
-}
diff --git a/packages/platform-browser-dynamic/tsconfig-build.json b/packages/platform-browser-dynamic/tsconfig-build.json
deleted file mode 100644
index 27dabc973f..0000000000
--- a/packages/platform-browser-dynamic/tsconfig-build.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/core/testing": ["../../dist/packages/core/testing"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/common/testing": ["../../dist/packages/common/testing"],
- "@angular/compiler": ["../../dist/packages/compiler"],
- "@angular/compiler/testing": ["../../dist/packages/compiler/testing"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"],
- "@angular/platform-browser/testing": ["../../dist/packages/platform-browser/testing"]
- },
- "outDir": "../../dist/packages/platform-browser-dynamic"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/@types/jasmine/index.d.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "platform-browser-dynamic.js",
- "flatModuleId": "@angular/platform-browser-dynamic"
- }
-}
diff --git a/packages/platform-browser/animations/tsconfig-build.json b/packages/platform-browser/animations/tsconfig-build.json
deleted file mode 100644
index b0f35fcdd6..0000000000
--- a/packages/platform-browser/animations/tsconfig-build.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "rxjs/*": ["../../../node_modules/rxjs/*"],
- "@angular/common": ["../../../dist/packages/common"],
- "@angular/core": ["../../../dist/packages/core"],
- "@angular/core/testing": ["../../../dist/packages/core/testing"],
- "@angular/animations": ["../../../dist/packages/animations"],
- "@angular/animations/browser": ["../../../dist/packages/animations/browser"],
- "@angular/platform-browser": ["../../../dist/packages/platform-browser"]
- },
- "outDir": "../../../dist/packages/platform-browser"
- },
-
- "files": [
- "public_api.ts",
- "../../../node_modules/zone.js/dist/zone.js.d.ts",
- "../../system.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "animations.js",
- "flatModuleId": "@angular/platform-browser/animations"
- }
-}
diff --git a/packages/platform-browser/testing/tsconfig-build.json b/packages/platform-browser/testing/tsconfig-build.json
deleted file mode 100644
index 41f39c9aca..0000000000
--- a/packages/platform-browser/testing/tsconfig-build.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "@angular/core": ["../../../dist/packages/core"],
- "@angular/core/testing": ["../../../dist/packages/core/testing"],
- "@angular/common": ["../../../dist/packages/common"],
- "@angular/common/testing": ["../../../dist/packages/common/testing"],
- "@angular/platform-browser": ["../../../dist/packages/platform-browser"]
- },
- "outDir": "../../../dist/packages/platform-browser"
- },
-
- "files": [
- "public_api.ts",
- "../../../node_modules/@types/hammerjs/index.d.ts",
- "../../../node_modules/@types/jasmine/index.d.ts",
- "../../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "testing.js",
- "flatModuleId": "@angular/platform-browser/testing"
- }
-}
diff --git a/packages/platform-browser/tsconfig-build.json b/packages/platform-browser/tsconfig-build.json
deleted file mode 100644
index f1c58e2ef6..0000000000
--- a/packages/platform-browser/tsconfig-build.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/platform-browser/animations": ["../../dist/packages/platform-browser/animations"],
- "@angular/common": ["../../dist/packages/common"]
- },
- "outDir": "../../dist/packages/platform-browser"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/@types/hammerjs/index.d.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts",
- "../goog.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "platform-browser.js",
- "flatModuleId": "@angular/platform-browser"
- }
-}
diff --git a/packages/platform-server/testing/tsconfig-build.json b/packages/platform-server/testing/tsconfig-build.json
deleted file mode 100644
index b5aa98165d..0000000000
--- a/packages/platform-server/testing/tsconfig-build.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "@angular/animations": ["../../../dist/packages/animations"],
- "@angular/animations/browser": ["../../../dist/packages/animations/browser"],
- "@angular/core": ["../../../dist/packages/core"],
- "@angular/core/testing": ["../../../dist/packages/core/testing"],
- "@angular/common": ["../../../dist/packages/common"],
- "@angular/common/http": ["../../../dist/packages/common/http"],
- "@angular/common/testing": ["../../../dist/packages/common/testing"],
- "@angular/compiler": ["../../../dist/packages/compiler"],
- "@angular/compiler/testing": ["../../../dist/packages/compiler/testing"],
- "@angular/http": ["../../../dist/packages/http"],
- "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
- "@angular/platform-browser/animations": ["../../../dist/packages/platform-browser/animations"],
- "@angular/platform-browser/testing": ["../../../dist/packages/platform-browser/testing"],
- "@angular/platform-browser-dynamic": ["../../../dist/packages/platform-browser-dynamic"],
- "@angular/platform-browser-dynamic/testing": ["../../../dist/packages/platform-browser-dynamic/testing"],
- "@angular/platform-server": ["../../../dist/packages/platform-server"]
- },
- "outDir": "../../../dist/packages/platform-server"
- },
-
- "files": [
- "public_api.ts",
- "../../../node_modules/@types/jasmine/index.d.ts",
- "../../../node_modules/@types/node/index.d.ts",
- "../../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "testing.js",
- "flatModuleId": "@angular/platform-server/testing"
- }
-}
diff --git a/packages/platform-server/tsconfig-build.json b/packages/platform-server/tsconfig-build.json
deleted file mode 100644
index 180dbe5df5..0000000000
--- a/packages/platform-server/tsconfig-build.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/animations": ["../../dist/packages/animations"],
- "@angular/animations/browser": ["../../dist/packages/animations/browser"],
- "@angular/core": ["../../dist/packages/core"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/common/http": ["../../dist/packages/common/http"],
- "@angular/compiler": ["../../dist/packages/compiler"],
- "@angular/http": ["../../dist/packages/http"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"],
- "@angular/platform-browser/animations": ["../../dist/packages/platform-browser/animations"],
- "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"]
- },
- "outDir": "../../dist/packages/platform-server"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/@types/node/index.d.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "platform-server.js",
- "flatModuleId": "@angular/platform-server"
- }
-}
diff --git a/packages/platform-webworker-dynamic/tsconfig-build.json b/packages/platform-webworker-dynamic/tsconfig-build.json
deleted file mode 100644
index de65f48f3e..0000000000
--- a/packages/platform-webworker-dynamic/tsconfig-build.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/compiler": ["../../dist/packages/compiler"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"],
- "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"],
- "@angular/platform-webworker": ["../../dist/packages/platform-webworker"]
- },
- "outDir": "../../dist/packages/platform-webworker-dynamic"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "platform-webworker-dynamic.js",
- "flatModuleId": "@angular/platform-webworker-dynamic"
- }
-}
diff --git a/packages/platform-webworker/tsconfig-build.json b/packages/platform-webworker/tsconfig-build.json
deleted file mode 100644
index a62277f4cd..0000000000
--- a/packages/platform-webworker/tsconfig-build.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"]
- },
- "outDir": "../../dist/packages/platform-webworker"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "platform-webworker.js",
- "flatModuleId": "@angular/platform-webworker"
- }
-}
diff --git a/packages/router/testing/tsconfig-build.json b/packages/router/testing/tsconfig-build.json
deleted file mode 100644
index 423129cda9..0000000000
--- a/packages/router/testing/tsconfig-build.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "@angular/core": ["../../../dist/packages/core"],
- "@angular/common": ["../../../dist/packages/common"],
- "@angular/common/testing": ["../../../dist/packages/common/testing"],
- "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
- "@angular/router": ["../../../dist/packages/router"]
- },
- "outDir": "../../../dist/packages/router"
- },
-
- "files": [
- "public_api.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "testing.js",
- "flatModuleId": "@angular/router/testing"
- }
-}
diff --git a/packages/router/tsconfig-build.json b/packages/router/tsconfig-build.json
deleted file mode 100644
index c18fc6d5c7..0000000000
--- a/packages/router/tsconfig-build.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "emitDecoratorMetadata": true,
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"]
- },
- "outDir": "../../dist/packages/router"
- },
-
- "files": [
- "public_api.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "router.js",
- "flatModuleId": "@angular/router"
- }
-}
diff --git a/packages/router/upgrade/tsconfig-build.json b/packages/router/upgrade/tsconfig-build.json
deleted file mode 100644
index 9b59f4ff9b..0000000000
--- a/packages/router/upgrade/tsconfig-build.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "@angular/common": ["../../../dist/packages/common"],
- "@angular/core": ["../../../dist/packages/core"],
- "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
- "@angular/router": ["../../../dist/packages/router"],
- "@angular/upgrade/static": ["../../../dist/packages/upgrade/static"]
- },
- "outDir": "../../../dist/packages/router"
- },
-
- "files": [
- "public_api.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "upgrade.js",
- "flatModuleId": "@angular/router/upgrade"
- }
-}
diff --git a/packages/service-worker/config/tsconfig-build.json b/packages/service-worker/config/tsconfig-build.json
deleted file mode 100644
index e2faf6fd75..0000000000
--- a/packages/service-worker/config/tsconfig-build.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "@angular/core": ["../../../dist/packages/core"]
- },
- "outDir": "../../../dist/packages/service-worker"
- },
-
- "files": [
- "public_api.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "flatModuleOutFile": "config.js",
- "flatModuleId": "@angular/service-worker/config",
- "skipTemplateCodegen": true
- }
-}
diff --git a/packages/service-worker/tsconfig-build.json b/packages/service-worker/tsconfig-build.json
deleted file mode 100644
index 9e6c2b0ad2..0000000000
--- a/packages/service-worker/tsconfig-build.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/common": ["../../dist/packages/common"]
- },
- "outDir": "../../dist/packages/service-worker"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "flatModuleOutFile": "service-worker.js",
- "flatModuleId": "@angular/service-worker",
- "skipTemplateCodegen": true
- }
-}
diff --git a/packages/upgrade/static/tsconfig-build.json b/packages/upgrade/static/tsconfig-build.json
deleted file mode 100644
index 6379e30530..0000000000
--- a/packages/upgrade/static/tsconfig-build.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": "../",
- "paths": {
- "@angular/core": ["../../../dist/packages/core"],
- "@angular/common": ["../../../dist/packages/common"],
- "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
- "@angular/platform-browser-dynamic": ["../../../dist/packages/platform-browser-dynamic"]
- },
- "outDir": "../../../dist/packages/upgrade"
- },
-
- "files": [
- "public_api.ts",
- "../../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "static.js",
- "flatModuleId": "@angular/upgrade/static"
- }
-}
diff --git a/packages/upgrade/tsconfig-build.json b/packages/upgrade/tsconfig-build.json
deleted file mode 100644
index 2019498aad..0000000000
--- a/packages/upgrade/tsconfig-build.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "extends": "../tsconfig-build.json",
-
- "compilerOptions": {
- "baseUrl": ".",
- "rootDir": ".",
- "paths": {
- "@angular/core": ["../../dist/packages/core"],
- "@angular/common": ["../../dist/packages/common"],
- "@angular/compiler": ["../../dist/packages/compiler"],
- "@angular/platform-browser": ["../../dist/packages/platform-browser"],
- "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"]
- },
- "outDir": "../../dist/packages/upgrade"
- },
-
- "files": [
- "public_api.ts",
- "../../node_modules/zone.js/dist/zone.js.d.ts"
- ],
-
- "angularCompilerOptions": {
- "annotateForClosureCompiler": true,
- "strictMetadataEmit": false,
- "skipTemplateCodegen": true,
- "flatModuleOutFile": "upgrade.js",
- "flatModuleId": "@angular/upgrade"
- }
-}
diff --git a/scripts/package-builder.sh b/scripts/package-builder.sh
index a3f349661a..475196bb8c 100755
--- a/scripts/package-builder.sh
+++ b/scripts/package-builder.sh
@@ -23,8 +23,10 @@ readonly bazel_bin=$(yarn bin)/bazel
readonly bin=$(${bazel_bin} info bazel-bin)
function buildTargetPackages() {
- # List of targets to build, e.g. core, common, compiler, etc.
- targets=$(${bazel_bin} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)')
+ # List of targets to build, e.g. core, common, compiler, etc. Note that we want to
+ # remove all carriage return ("\r") characters form the query output because otherwise
+ # the carriage return is part of the bazel target name and bazel will complain.
+ targets=$(${bazel_bin} query --output=label 'attr("tags", "\[.*release-with-framework.*\]", //packages/...) intersect kind(".*_package", //packages/...)' | tr -d "\r")
# Path to the output directory into which we copy the npm packages.
dest_path="$1"
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts
index 15d50079a4..ef6757b785 100644
--- a/tools/public_api_guard/core/core.d.ts
+++ b/tools/public_api_guard/core/core.d.ts
@@ -818,8 +818,6 @@ 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;
@@ -828,8 +826,6 @@ export declare function ɵɵelementEnd(): void;
export declare function ɵɵelementHostAttrs(attrs: TAttributes): void;
-export declare function ɵɵelementProperty(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;