0173c88 build: update devinfra digest to 85eab90

Angular Builds · Angular Builds · commit cd6c1812b78f · 2025-03-14T18:39:34.000Z
diff --git a/app-shell/index.js b/app-shell/index.js
@@ -143,7 +143,7 @@ function addServerRoutes(options) {
                 .filter((node) => node.kind === typescript_1.default.SyntaxKind.ImportDeclaration)
                 .sort((a, b) => a.getStart() - b.getStart());
             const insertPosition = imports[imports.length - 1].getEnd();
-            const routeText = `\n\nconst routes: Routes = [ { path: '${APP_SHELL_ROUTE}', component: AppShellComponent }];`;
+            const routeText = `\n\nconst routes: Routes = [ { path: '${APP_SHELL_ROUTE}', component: AppShell }];`;
             recorder.insertRight(insertPosition, routeText);
             host.commitUpdate(recorder);
         }
@@ -195,13 +195,13 @@ function addStandaloneServerRoute(options) {
         multi: true,
         useValue: [{
           path: '${APP_SHELL_ROUTE}',
-          component: AppShellComponent
+          component: AppShell
         }]
       }\n  `,
         ];
         recorder.insertRight(providersLiteral.getStart(), `[\n${updatedProvidersString.join(',\n')}]`);
         (0, change_1.applyToUpdateRecorder)(recorder, [
-            (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'AppShellComponent', './app-shell/app-shell.component'),
+            (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'AppShell', './app-shell/app-shell'),
         ]);
         host.commitUpdate(recorder);
     };
@@ -228,10 +228,10 @@ function addServerRoutingConfig(options, isStandalone) {
             throw new schematics_1.SchematicsException(`Cannot find the "provideServerRouting" function call in "${configFilePath}".`);
         }
         recorder = host.beginUpdate(configFilePath);
-        recorder.insertLeft(functionCall.end - 1, `, withAppShell(AppShellComponent)`);
+        recorder.insertLeft(functionCall.end - 1, `, withAppShell(AppShell)`);
         (0, change_1.applyToUpdateRecorder)(recorder, [
             (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'withAppShell', '@angular/ssr'),
-            (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'AppShellComponent', './app-shell/app-shell.component'),
+            (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'AppShell', './app-shell/app-shell'),
         ]);
         host.commitUpdate(recorder);
     };
diff --git a/application/files/common-files/src/app/app.ng.html.template b/application/files/common-files/src/app/app.ng.html.template
diff --git a/application/files/module-files/src/app/app.module.ts.template b/application/files/module-files/src/app/app.module.ts.template
@@ -2,17 +2,17 @@ import { NgModule<% if(experimentalZoneless) { %>, provideExperimentalZonelessCh
 import { BrowserModule } from '@angular/platform-browser';
 <% if (routing) { %>
 import { AppRoutingModule } from './app-routing.module';<% } %>
-import { AppComponent } from './app.component';
+import { App } from './app';
 
 @NgModule({
   declarations: [
-    AppComponent
+    App
   ],
   imports: [
     BrowserModule<% if (routing) { %>,
     AppRoutingModule<% } %>
   ],
   providers: [<% if (experimentalZoneless) { %>provideExperimentalZonelessChangeDetection()<% } %>],
-  bootstrap: [AppComponent]
+  bootstrap: [App]
 })
 export class AppModule { }
diff --git a/application/files/module-files/src/app/app.spec.ts.template b/application/files/module-files/src/app/app.spec.ts.template
@@ -1,35 +1,35 @@
 <% if(experimentalZoneless) { %>import { provideExperimentalZonelessChangeDetection } from '@angular/core';
 <% } %>import { TestBed } from '@angular/core/testing';<% if (routing) { %>
 import { RouterModule } from '@angular/router';<% } %>
-import { AppComponent } from './app.component';
+import { App } from './app';
 
-describe('AppComponent', () => {
+describe('App', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({<% if (routing) { %>
       imports: [
         RouterModule.forRoot([])
       ],<% } %>
       declarations: [
-        AppComponent
+        App
       ],<% if(experimentalZoneless) { %>
       providers: [provideExperimentalZonelessChangeDetection()]<% } %>
     }).compileComponents();
   });
 
   it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
+    const fixture = TestBed.createComponent(App);
     const app = fixture.componentInstance;
     expect(app).toBeTruthy();
   });
 
   it(`should have as title '<%= name %>'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
+    const fixture = TestBed.createComponent(App);
     const app = fixture.componentInstance;
     expect(app.title).toEqual('<%= name %>');
   });
 
   it('should render title', () => {
-    const fixture = TestBed.createComponent(AppComponent);
+    const fixture = TestBed.createComponent(App);
     fixture.detectChanges();
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('h1')?.textContent).toContain('Hello, <%= name %>');
diff --git a/application/files/module-files/src/app/app.ts.template b/application/files/module-files/src/app/app.ts.template
@@ -9,11 +9,11 @@ import { Component } from '@angular/core';
      %><router-outlet /><%
     } %>
   `,<% } else { %>
-  templateUrl: './app.component.ng.html',<% } %>
+  templateUrl: './app.ng.html',<% } %>
   standalone: false,<% if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrl: './app.component.<%= style %>'<% } %>
+  styleUrl: './app.<%= style %>'<% } %>
 })
-export class AppComponent {
+export class App {
   title = '<%= name %>';
 }
diff --git a/application/files/standalone-files/src/app/app.spec.ts.template b/application/files/standalone-files/src/app/app.spec.ts.template
@@ -1,29 +1,29 @@
 <% if(experimentalZoneless) { %>import { provideExperimentalZonelessChangeDetection } from '@angular/core';
 <% } %>import { TestBed } from '@angular/core/testing';
-import { AppComponent } from './app.component';
+import { App } from './app';
 
-describe('AppComponent', () => {
+describe('App', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [AppComponent],<% if(experimentalZoneless) { %>
+      imports: [App],<% if(experimentalZoneless) { %>
       providers: [provideExperimentalZonelessChangeDetection()]<% } %>
     }).compileComponents();
   });
 
   it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
+    const fixture = TestBed.createComponent(App);
     const app = fixture.componentInstance;
     expect(app).toBeTruthy();
   });
 
   it(`should have the '<%= name %>' title`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
+    const fixture = TestBed.createComponent(App);
     const app = fixture.componentInstance;
     expect(app.title).toEqual('<%= name %>');
   });
 
   it('should render title', () => {
-    const fixture = TestBed.createComponent(AppComponent);
+    const fixture = TestBed.createComponent(App);
     fixture.detectChanges();
     const compiled = fixture.nativeElement as HTMLElement;
     expect(compiled.querySelector('h1')?.textContent).toContain('Hello, <%= name %>');
diff --git a/application/files/standalone-files/src/app/app.ts.template b/application/files/standalone-files/src/app/app.ts.template
@@ -11,10 +11,10 @@ import { RouterOutlet } from '@angular/router';<% } %>
      %><router-outlet /><%
     } %>
   `,<% } else { %>
-  templateUrl: './app.component.ng.html',<% } if(inlineStyle) { %>
+  templateUrl: './app.ng.html',<% } if(inlineStyle) { %>
   styles: [],<% } else { %>
-  styleUrl: './app.component.<%= style %>'<% } %>
+  styleUrl: './app.<%= style %>'<% } %>
 })
-export class AppComponent {
+export class App {
   title = '<%= name %>';
 }
diff --git a/application/files/standalone-files/src/main.ts.template b/application/files/standalone-files/src/main.ts.template
@@ -1,6 +1,6 @@
 import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
-import { AppComponent } from './app/app.component';
+import { App } from './app/app';
 
-bootstrapApplication(AppComponent, appConfig)
+bootstrapApplication(App, appConfig)
   .catch((err) => console.error(err));
diff --git a/component/index.js b/component/index.js
@@ -36,6 +36,8 @@ function default_1(options) {
             options.path = (0, workspace_1.buildDefaultPath)(project);
         }
         options.module = (0, find_module_1.findModuleFromOptions)(host, options);
+        // Schematic templates require a defined type value
+        options.type ??= '';
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;
diff --git a/component/schema.json b/component/schema.json
@@ -93,8 +93,7 @@
     },
     "type": {
       "type": "string",
-      "description": "Append a custom type to the component's filename. For example, if you set the type to `container`, the file will be named `my-component.container.ts`.",
-      "default": "Component"
+      "description": "Append a custom type to the component's filename. For example, if you set the type to `container`, the file will be named `my-component.container.ts`."
     },
     "skipTests": {
       "type": "boolean",
diff --git a/library/files/src/__entryFile__.ts.template b/library/files/src/__entryFile__.ts.template
@@ -3,5 +3,5 @@
  */
 
 export * from './lib/<%= dasherize(name) %>.service';
-export * from './lib/<%= dasherize(name) %>.component';<% if (!standalone) { %>
+export * from './lib/<%= dasherize(name) %>';<% if (!standalone) { %>
 export * from './lib/<%= dasherize(name) %>.module';<% } %>
diff --git a/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template b/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template
@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';<% if (lazyRoute) { %>
-import { <%= classify(name) %>Component } from './<%= dasherize(name) %>.component';<% } %>
+import { <%= classify(name) %> } from './<%= dasherize(name) %>';<% } %>
 
-const routes: Routes = [<% if (lazyRoute) { %>{ path: '', component: <%= classify(name) %>Component }<% } %>];
+const routes: Routes = [<% if (lazyRoute) { %>{ path: '', component: <%= classify(name) %> }<% } %>];
 
 @NgModule({
   imports: [RouterModule.for<%= routingScope %>(routes)],
diff --git a/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template b/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template
@@ -5,7 +5,7 @@ import { Routes, RouterModule } from '@angular/router';<% } %>
 import { <%= classify(name) %>RoutingModule } from './<%= dasherize(name) %>-routing.module';<% } %>
 <% if (lazyRouteWithoutRouteModule) { %>
 const routes: Routes = [
-  { path: '', component: <%= classify(name) %>Component }
+  { path: '', component: <%= classify(name) %> }
 ];<% } %>
 
 @NgModule({
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "20.0.0-next.1+sha-29a58e5",
+  "version": "20.0.0-next.1+sha-0173c88",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -22,8 +22,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#29a58e5",
-    "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#29a58e5",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#0173c88",
+    "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#0173c88",
     "jsonc-parser": "3.3.1"
   },
   "repository": {
diff --git a/server/files/application-builder/ngmodule-src/app/app.module.server.ts.template b/server/files/application-builder/ngmodule-src/app/app.module.server.ts.template
@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
 import { provideServerRouting } from '@angular/ssr';
-import { AppComponent } from './app.component';
+import { App } from './app';
 import { AppModule } from './app.module';
 import { serverRoutes } from './app.routes.server';
 
 @NgModule({
   imports: [AppModule, ServerModule],
   providers: [provideServerRouting(serverRoutes)],
-  bootstrap: [AppComponent],
+  bootstrap: [App],
 })
 export class AppServerModule {}
diff --git a/server/files/application-builder/standalone-src/main.server.ts.template b/server/files/application-builder/standalone-src/main.server.ts.template
@@ -1,7 +1,7 @@
 import { bootstrapApplication } from '@angular/platform-browser';
-import { AppComponent } from './app/app.component';
+import { App } from './app/app';
 import { config } from './app/app.config.server';
 
-const bootstrap = () => bootstrapApplication(AppComponent, config);
+const bootstrap = () => bootstrapApplication(App, config);
 
 export default bootstrap;
diff --git a/server/files/server-builder/ngmodule-src/app/app.module.server.ts.template b/server/files/server-builder/ngmodule-src/app/app.module.server.ts.template
@@ -2,13 +2,13 @@ import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
 
 import { AppModule } from './app.module';
-import { AppComponent } from './app.component';
+import { App } from './app';
 
 @NgModule({
   imports: [
     AppModule,
     ServerModule,
   ],
-  bootstrap: [AppComponent],
+  bootstrap: [App],
 })
 export class AppServerModule {}
diff --git a/server/files/server-builder/standalone-src/main.server.ts.template b/server/files/server-builder/standalone-src/main.server.ts.template
@@ -1,7 +1,7 @@
 import { bootstrapApplication } from '@angular/platform-browser';
-import { AppComponent } from './app/app.component';
+import { App } from './app/app';
 import { config } from './app/app.config.server';
 
-const bootstrap = () => bootstrapApplication(AppComponent, config);
+const bootstrap = () => bootstrapApplication(App, config);
 
 export default bootstrap;
diff --git a/uniqueId b/uniqueId
@@ -1 +1 @@
-Fri Mar 14 2025 17:25:00 GMT+0000 (Coordinated Universal Time)
+Fri Mar 14 2025 18:39:34 GMT+0000 (Coordinated Universal Time)
diff --git a/utility/find-module.js b/utility/find-module.js
@@ -42,7 +42,7 @@ function findModuleFromOptions(host, options) {
         for (const c of candidatesDirs) {
             const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map((x) => (0, core_1.join)(c, x));
             for (const sc of candidateFiles) {
-                if (host.exists(sc)) {
+                if (host.exists(sc) && host.readText(sc).includes('@NgModule')) {
                     return (0, core_1.normalize)(sc);
                 }
             }
diff --git a/utility/latest-versions.js b/utility/latest-versions.js
@@ -16,7 +16,7 @@ exports.latestVersions = {
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^20.0.0-next.0',
     NgPackagr: '^20.0.0-next.0',
-    DevkitBuildAngular: '^20.0.0-next.1+sha-29a58e5',
-    AngularBuild: '^20.0.0-next.1+sha-29a58e5',
-    AngularSSR: '^20.0.0-next.1+sha-29a58e5',
+    DevkitBuildAngular: '^20.0.0-next.1+sha-0173c88',
+    AngularBuild: '^20.0.0-next.1+sha-0173c88',
+    AngularSSR: '^20.0.0-next.1+sha-0173c88',
 };
diff --git a/web-worker/index.js b/web-worker/index.js
@@ -24,7 +24,7 @@ function addSnippet(options) {
             .getDir(options.path)
             .subfiles // Find all files that start with the same name, are ts files,
             // and aren't spec or module files.
-            .filter((f) => fileRegExp.test(f) && !/(module|spec)\.ts$/.test(f))
+            .filter((f) => fileRegExp.test(f) && !/(module|spec|config|routes)\.ts$/.test(f))
             // Sort alphabetically for consistency.
             .sort();
         if (siblingModules.length === 0) {

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ function default_1(options) {`
`36`	`36`	`options.path = (0, workspace_1.buildDefaultPath)(project);`
`37`	`37`	`}`
`38`	`38`	`options.module = (0, find_module_1.findModuleFromOptions)(host, options);`
	`39`	`+ // Schematic templates require a defined type value`
	`40`	`+ options.type ??= '';`
`39`	`41`	`const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);`
`40`	`42`	`options.name = parsedPath.name;`
`41`	`43`	`options.path = parsedPath.path;`