refactor: handle standalone by default change

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 · 3cbbf45 · 3cbbf45
1 parent 3db884a
commit 3cbbf45
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 86 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/tests/legacy-cli/e2e/tests/basic/standalone.ts b/tests/legacy-cli/e2e/tests/basic/standalone.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/trusted-types.ts b/tests/legacy-cli/e2e/tests/misc/trusted-types.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { appendToFile, prependToFile, replaceInFile, writeFile } from '../../utils/fs';
+import { replaceInFile, writeFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';