fix(material/schematics): use single style and styleUrl in generated …

…code Switches the schematics to use a single string in `styles` and the new `styleUrl` property.
angular · Dec 18, 2023 · b4bb466 · b4bb466
1 parent 1bb36bb
commit b4bb466
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/...g-drop/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/...g-drop/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -7,10 +7,10 @@ import { <% if(standalone) { %>CdkDrag, CdkDropList, <% } %>CdkDragDrop, moveIte
     <%= indentTextContent(resolvedFiles.template, 4) %>
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
-  styles: [`
+  styles: `
     <%= indentTextContent(resolvedFiles.stylesheet, 4) %>
-  `]<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  `<% } else { %>
+  styleUrl: './<%= dasherize(name) %>.component.<%= style %>'<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %><% if(standalone) { %>,
   standalone: true,

diff --git a/...s-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/...s-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -16,10 +16,10 @@ import { FormBuilder, Validators } from '@angular/forms';
     <%= indentTextContent(resolvedFiles.template, 4) %>
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
-  styles: [`
+  styles: `
     <%= indentTextContent(resolvedFiles.stylesheet, 4) %>
-  `]<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  `<% } else { %>
+  styleUrl: './<%= dasherize(name) %>.component.<%= style %>'<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %><% if(standalone) { %>,
   standalone: true,

diff --git a/src/material/schematics/ng-generate/address-form/index.spec.ts b/src/material/schematics/ng-generate/address-form/index.spec.ts
@@ -119,7 +119,7 @@ describe('Material address-form schematic', () => {
       );
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
       expect(tree.readContent('/projects/material/src/app/foo/foo.component.ts')).toContain(
-        'styles: [`',
+        'styles: `',
       );
     });
 

diff --git a/...hboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/...hboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -14,10 +14,10 @@ import { MatCardModule } from '@angular/material/card';<% } %>
     <%= indentTextContent(resolvedFiles.template, 4) %>
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
-  styles: [`
+  styles: `
     <%= indentTextContent(resolvedFiles.stylesheet, 4) %>
-  `]<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  `<% } else { %>
+  styleUrl: './<%= dasherize(name) %>.component.<%= style %>'<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %><% if(standalone) { %>,
   standalone: true,

diff --git a/...gation/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/...gation/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -15,10 +15,10 @@ import { map, shareReplay } from 'rxjs/operators';
     <%= indentTextContent(resolvedFiles.template, 4) %>
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
-  styles: [`
+  styles: `
     <%= indentTextContent(resolvedFiles.stylesheet, 4) %>
-  `]<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  `<% } else { %>
+  styleUrl: './<%= dasherize(name) %>.component.<%= style %>'<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %><% if(standalone) { %>,
   standalone: true,

diff --git a/.../table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/.../table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -10,10 +10,10 @@ import { <%= classify(name) %>DataSource, <%= classify(name) %>Item } from './<%
     <%= indentTextContent(resolvedFiles.template, 4) %>
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
-  styles: [`
+  styles: `
     <%= indentTextContent(resolvedFiles.stylesheet, 4) %>
-  `]<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  `<% } else { %>
+  styleUrl: './<%= dasherize(name) %>.component.<%= style %>'<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %><% if(standalone) { %>,
   standalone: true,

diff --git a/...e/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/...e/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -29,10 +29,10 @@ export interface FlatTreeNode {
     <%= indentTextContent(resolvedFiles.template, 4) %>
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if (inlineStyle) { %>
-  styles: [`
+  styles: `
     <%= indentTextContent(resolvedFiles.stylesheet, 4) %>
-  `]<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  `<% } else { %>
+  styleUrl: './<%= dasherize(name) %>.component.<%= style %>'<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %><% if(standalone) { %>,
   standalone: true,