refactor: handle standalone by default change

Remove redundant `standalone: true` settings in schematics. In tests, add `standalone: false` where it's missing. Note: In the future, we should update our integration tests to use a standalone app.
angular · Oct 17, 2024 · c8f1247 · c8f1247
1 parent f0f8252
commit c8f1247
Show file tree

Hide file tree

Showing 30 changed files with 37 additions and 96 deletions.
diff --git a/modules/testing/builder/projects/hello-world-app/src/app/app.component.ts b/modules/testing/builder/projects/hello-world-app/src/app/app.component.ts
@@ -10,6 +10,7 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-root',
+  standalone: false,
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css'],
 })

diff --git a/packages/angular/build/src/builders/application/tests/behavior/rebuild-errors_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/rebuild-errors_spec.ts
@@ -27,7 +27,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
 
       const goodDirectiveContents = `
         import { Directive, Input } from '@angular/core';
-        @Directive({ selector: 'dir' })
+        @Directive({ selector: 'dir', standalone: false })
         export class Dir {
           @Input() foo: number;
         }
@@ -66,6 +66,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
         import { Component } from '@angular/core'
         @Component({
           selector: 'app-root',
+          standalone: false,
           template: '<dir [foo]="123">',
         })
         export class AppComponent { }
@@ -87,7 +88,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
                   'src/app/dir.ts',
                   `
                   import { Directive, Input } from '@angular/core';
-                  @Directive({ selector: 'dir' })
+                  @Directive({ selector: 'dir', standalone: false })
                   export class Dir {
                     @Input() foo: string;
                   }

diff --git a/packages/angular/build/src/builders/application/tests/behavior/rebuild-general_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/rebuild-general_spec.ts
@@ -38,6 +38,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
         import './file-a';
         @Component({
           selector: 'app-root',
+          standalone: false,
           template: 'App component',
         })
         export class AppComponent { }

diff --git a/packages/angular/build/src/builders/application/tests/behavior/rebuild-web-workers_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/rebuild-web-workers_spec.ts
@@ -47,6 +47,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
         import { Component } from '@angular/core'
         @Component({
           selector: 'app-root',
+          standalone: false,
           template: '<h1>Worker Test</h1>',
         })
         export class AppComponent {

diff --git a/...ges/angular/build/src/builders/application/tests/behavior/web-workers-application_spec.ts b/...ges/angular/build/src/builders/application/tests/behavior/web-workers-application_spec.ts
@@ -42,6 +42,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
         import { Component } from '@angular/core'
         @Component({
           selector: 'app-root',
+          standalone: false,
           template: '<h1>Worker Test</h1>',
         })
         export class AppComponent {

diff --git a/packages/angular/build/src/builders/application/tests/options/app-shell_spec.ts b/packages/angular/build/src/builders/application/tests/options/app-shell_spec.ts
@@ -16,6 +16,7 @@ const appShellRouteFiles: Record<string, string> = {
 
     @Component({
       selector: 'app-app-shell',
+      standalone: false,
       styles: ['div { color: #fff; }'],
       template: '<p>app-shell works!</p>',
     })

diff --git a/packages/angular/build/src/builders/application/tests/options/external-dependencies_spec.ts b/packages/angular/build/src/builders/application/tests/options/external-dependencies_spec.ts
@@ -61,6 +61,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
           import { Component } from '@angular/core'
           @Component({
             selector: 'app-root',
+            standalone: false,
             template: '<h1>Worker Test</h1>',
           })
           export class AppComponent {

diff --git a/packages/angular_devkit/build_angular/src/builders/app-shell/app-shell_spec.ts b/packages/angular_devkit/build_angular/src/builders/app-shell/app-shell_spec.ts
@@ -34,6 +34,7 @@ describe('AppShell Builder', () => {
 
       @Component({
         selector: 'app-app-shell',
+        standalone: false,
         templateUrl: './app-shell.component.html',
       })
       export class AppShellComponent implements OnInit {

diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts
@@ -73,6 +73,7 @@ describe('Browser Builder styles', () => {
 
         @Component({
           selector: 'app-root',
+          standalone: false,
           templateUrl: './app.component.html',
           styleUrls: []
         })
@@ -92,6 +93,7 @@ describe('Browser Builder styles', () => {
 
         @Component({
           selector: 'app-root',
+          standalone: false,
           templateUrl: './app.component.html',
           styles: ['div { mask-composite: add; }'],
         })
@@ -118,6 +120,7 @@ describe('Browser Builder styles', () => {
 
         @Component({
           selector: 'app-root',
+          standalone: false,
           templateUrl: './app.component.html',
           styles: ['div { mask-composite: add; }'],
         })
@@ -637,6 +640,7 @@ describe('Browser Builder styles', () => {
 
         @Component({
           selector: 'app-root',
+          standalone: false,
           templateUrl: './app.component.html',
           styleUrls: ['../styles.css']
         })

diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/svg_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/svg_spec.ts
@@ -33,6 +33,7 @@ describe('Browser Builder allow svg', () => {
 
         @Component({
           selector: 'app-root',
+          standalone: false,
           templateUrl: './app.component.svg',
           styleUrls: []
         })

diff --git a/...s/angular_devkit/build_angular/src/builders/browser/tests/behavior/rebuild-errors_spec.ts b/...s/angular_devkit/build_angular/src/builders/browser/tests/behavior/rebuild-errors_spec.ts
@@ -22,7 +22,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       const goodDirectiveContents = `
         import { Directive, Input } from '@angular/core';
-        @Directive({ selector: 'dir' })
+        @Directive({ selector: 'dir', standalone: false })
         export class Dir {
           @Input() foo: number;
         }
@@ -61,6 +61,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
         import { Component } from '@angular/core'
         @Component({
           selector: 'app-root',
+          standalone: false,
           template: '<dir [foo]="123">',
         })
         export class AppComponent { }
@@ -82,7 +83,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
                   'src/app/dir.ts',
                   `
                   import { Directive, Input } from '@angular/core';
-                  @Directive({ selector: 'dir' })
+                  @Directive({ selector: 'dir', standalone: false })
                   export class Dir {
                     @Input() foo: string;
                   }
@@ -162,7 +163,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
         'src/app/dir.ts',
         `
         import { Directive, Input } from '@angular/core';
-        @Directive({ selector: 'dir' })
+        @Directive({ selector: 'dir', standalone: false })
         export class Dir {
           @Input() foo: number;
         }
@@ -172,7 +173,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       // Same selector with a different type on the `foo` property but initially no `@Input`
       const goodDirectiveContents = `
         import { Directive } from '@angular/core';
-        @Directive({ selector: 'dir' })
+        @Directive({ selector: 'dir', standalone: false })
         export class Dir2 {
           foo: string;
         }
@@ -210,6 +211,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
         import { Component } from '@angular/core'
         @Component({
           selector: 'app-root',
+          standalone: false,
           template: '<dir [foo]="123">',
         })
         export class AppComponent { }
@@ -231,7 +233,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
                   'src/app/dir2.ts',
                   `
                   import { Directive, Input } from '@angular/core';
-                  @Directive({ selector: 'dir' })
+                  @Directive({ selector: 'dir', standalone: false })
                   export class Dir2 {
                     @Input() foo: string;
                   }

diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/fake-async_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/behavior/fake-async_spec.ts
@@ -22,6 +22,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
 
             @Component({
               selector: 'app-root',
+              standalone: false,
               template: '<button (click)="changeMessage()" class="change">{{ message }}</button>',
             })
             export class AppComponent {

diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/assets_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/assets_spec.ts
@@ -47,6 +47,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
 
             @Component({
               selector: 'app-root',
+              standalone: false,
               template: '<p *ngFor="let asset of assets">{{ asset.content }}</p>'
             })
             export class AppComponent {

diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage_spec.ts
@@ -79,6 +79,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
 
           @Component({
             selector: 'app-root',
+            standalone: false,
             templateUrl: './app.component.html',
             styleUrls: ['./app.component.css']
           })

diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/styles_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/styles_spec.ts
@@ -23,6 +23,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
 
           @Component({
             selector: 'app-root',
+            standalone: false,
             template: '<p>Hello World</p>'
           })
           export class AppComponent {
@@ -79,6 +80,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {
         import { HttpClient } from '@angular/common/http';
         @Component({
           selector: 'app-root',
+          standalone: false,
           template: '<p *ngFor="let asset of css">{{ asset.content }}</p>'
         })
         export class AppComponent {

diff --git a/...angular_devkit/build_angular/src/builders/karma/tests/options/web-worker-tsconfig_spec.ts b/...angular_devkit/build_angular/src/builders/karma/tests/options/web-worker-tsconfig_spec.ts
@@ -45,6 +45,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget, isAppli
 
         @Component({
           selector: 'app-root',
+          standalone: false,
           template: ''
         })
         export class AppComponent {

diff --git a/packages/angular_devkit/build_angular/src/builders/prerender/works_spec.ts b/packages/angular_devkit/build_angular/src/builders/prerender/works_spec.ts
@@ -27,6 +27,7 @@ describe('Prerender Builder', () => {
 
         @Component({
           selector: 'app-foo',
+          standalone: false,
           template: '<p>foo works!</p>',
         })
         export class FooComponent {}

diff --git a/...ages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts b/...ages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/lib/lib.module.ts
diff --git a/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts b/packages/angular_devkit/build_angular/test/hello-world-lib/projects/lib/src/public-api.ts
@@ -12,4 +12,3 @@
 
 export * from './lib/lib.service';
 export * from './lib/lib.component';
-export * from './lib/lib.module';
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.ts
@@ -10,6 +10,7 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-root',
+  standalone: false,
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css'],
 })

diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
@@ -562,7 +562,7 @@ describe('Application Schematic', () => {
     const tree = await schematicRunner.runSchematic('application', options, workspaceTree);
 
     const component = tree.readContent('/projects/foo/src/app/app.component.ts');
-    expect(component).toMatch(/standalone: true/);
+    expect(component).not.toContain('standalone: false');
   });
 
   it('should create routing information by default', async () => {

diff --git a/...ponent/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template b/...ponent/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template
@@ -2,7 +2,6 @@ import { <% if(changeDetection !== 'Default') { %>ChangeDetectionStrategy, <% }%
 
 @Component({<% if(!skipSelector) {%>
   selector: '<%= selector %>',<%}%><% if(standalone) {%>
-  standalone: true,
   imports: [],<%} else { %>
   standalone: false,
   <% }%><% if(inlineTemplate) { %>

diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
@@ -350,7 +350,6 @@ describe('Component Schematic', () => {
     const componentContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(componentContent).toContain('class FooComponent');
     expect(moduleContent).not.toContain('FooComponent');
-    expect(componentContent).toContain('standalone: true');
   });
 
   it('should declare standalone components in the `imports` of a test', async () => {

diff --git a/...gular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template b/...gular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template
@@ -1,8 +1,7 @@
 import { Directive } from '@angular/core';
 
 @Directive({
-  selector: '[<%= selector %>]'<% if(standalone) {%>,
-  standalone: true<%} else {%>,
+  selector: '[<%= selector %>]'<% if(!standalone) {%>,
   standalone: false<%}%>
 })
 export class <%= classify(name) %>Directive {

diff --git a/packages/schematics/angular/directive/index_spec.ts b/packages/schematics/angular/directive/index_spec.ts
@@ -107,7 +107,7 @@ describe('Directive Schematic', () => {
     const options = { ...defaultOptions, standalone: true };
     const tree = await schematicRunner.runSchematic('directive', options, appTree);
     const directiveContent = tree.readContent('/projects/bar/src/app/foo.directive.ts');
-    expect(directiveContent).toContain('standalone: true');
+    expect(directiveContent).not.toContain('standalone: false');
     expect(directiveContent).toContain('class FooDirective');
   });
 

diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
@@ -71,7 +71,7 @@ describe('Library Schematic', () => {
   it('should create a standalone component', async () => {
     const tree = await schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
     const componentContent = tree.readContent('/projects/foo/src/lib/foo.component.ts');
-    expect(componentContent).toContain('standalone: true');
+    expect(componentContent).not.toContain('standalone: false');
   });
 
   describe('custom projectRoot', () => {

diff --git a/...ematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template b/...ematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template
@@ -1,8 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-  name: '<%= camelize(name) %>'<% if(standalone) {%>,
-  standalone: true<%} else {%>,
+  name: '<%= camelize(name) %>'<% if(!standalone) {%>,
   standalone: false<%}%>
 })
 export class <%= classify(name) %>Pipe implements PipeTransform {

diff --git a/packages/schematics/angular/pipe/index_spec.ts b/packages/schematics/angular/pipe/index_spec.ts
@@ -156,7 +156,7 @@ describe('Pipe Schematic', () => {
       const tree = await schematicRunner.runSchematic('pipe', defaultOptions, appTree);
       const moduleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
       const pipeContent = tree.readContent('/projects/bar/src/app/foo.pipe.ts');
-      expect(pipeContent).toContain('standalone: true');
+      expect(pipeContent).not.toContain('standalone: false');
       expect(pipeContent).toContain('class FooPipe');
       expect(moduleContent).not.toContain('FooPipe');
     });