From dd6065cec47647980291bd2c24067cdc71966f33 Mon Sep 17 00:00:00 2001 From: Klemen Oslaj Date: Tue, 4 Dec 2018 00:31:25 +0100 Subject: [PATCH] fix(schematics): two consecutive commas generated (#14371) When generating any Material schematic with OnPush changeDetection, we get two consecutive commas in component decorator. Fixes: #14366 --- .../__name@dasherize__.component.ts | 4 ++-- .../__name@dasherize__.component.ts | 4 ++-- .../__name@dasherize__.component.ts | 4 ++-- .../__name@dasherize__.component.ts | 4 ++-- .../__name@dasherize__.component.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts index 12648374d50..bdec8c0582c 100644 --- a/src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts +++ b/src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts @@ -9,8 +9,8 @@ import { FormBuilder, Validators } from '@angular/forms'; templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %> styles: [` <%= indentTextContent(resolvedFiles.stylesheet, 4) %> - `],<% } else { %> - styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if(!!viewEncapsulation) { %> + `]<% } else { %> + styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>, encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>, changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %> }) diff --git a/src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts index f18d96b49ca..8988d16b35e 100644 --- a/src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts +++ b/src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts @@ -10,8 +10,8 @@ import { Breakpoints, BreakpointObserver } from '@angular/cdk/layout'; templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %> styles: [` <%= indentTextContent(resolvedFiles.stylesheet, 4) %> - `],<% } else { %> - styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if(!!viewEncapsulation) { %> + `]<% } else { %> + styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>, encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>, changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %> }) diff --git a/src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts index 6921eceb6b0..0451729d7f0 100644 --- a/src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts +++ b/src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts @@ -11,8 +11,8 @@ import { map } from 'rxjs/operators'; templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %> styles: [` <%= indentTextContent(resolvedFiles.stylesheet, 4) %> - `],<% } else { %> - styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if(!!viewEncapsulation) { %> + `]<% } else { %> + styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>, encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>, changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %> }) diff --git a/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts index 0ba85c783c0..c41d25fef5c 100644 --- a/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts +++ b/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts @@ -10,8 +10,8 @@ import { <%= classify(name) %>DataSource } from './<%= dasherize(name) %>-dataso templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %> styles: [` <%= indentTextContent(resolvedFiles.stylesheet, 4) %> - `],<% } else { %> - styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if(!!viewEncapsulation) { %> + `]<% } else { %> + styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>, encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>, changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %> }) diff --git a/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts index 92678ba1140..7ea246530f9 100644 --- a/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts +++ b/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts @@ -30,8 +30,8 @@ export interface FlatTreeNode { templateUrl: './<%= dasherize(name) %>.component.html',<% } if (inlineStyle) { %> styles: [` <%= indentTextContent(resolvedFiles.stylesheet, 4) %> - `],<% } else { %> - styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>'],<% } %><% if (!!viewEncapsulation) { %> + `]<% } else { %> + styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>, encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>, changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %> })