@schematics/angular 19.1.3 → 19.1.5

package/app-shell/index.js

@@ -106,17 +106,6 @@ function validateProject(mainPath) {
         }
     };
 }
-function addRouterModule(mainPath) {
-    return (host) => {
-        const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, mainPath);
-        const moduleSource = getSourceFile(host, modulePath);
-        const changes = (0, ast_utils_1.addImportToModule)(moduleSource, modulePath, 'RouterModule', '@angular/router');
-        const recorder = host.beginUpdate(modulePath);
-        (0, change_1.applyToUpdateRecorder)(recorder, changes);
-        host.commitUpdate(recorder);
-        return host;
-    };
-}
 function getMetadataProperty(metadata, propertyName) {
     const properties = metadata.properties;
     const property = properties.filter(typescript_1.default.isPropertyAssignment).filter((prop) => {
@@ -202,7 +191,7 @@ function addStandaloneServerRoute(options) {
         if (!host.exists(configFilePath)) {
             throw new schematics_1.SchematicsException(`Cannot find "${configFilePath}".`);
         }
-        let recorder = host.beginUpdate(configFilePath);
+        const recorder = host.beginUpdate(configFilePath);
         let configSourceFile = getSourceFile(host, configFilePath);
         if (!(0, ast_utils_1.isImported)(configSourceFile, 'ROUTES', '@angular/router')) {
             const routesChange = (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'ROUTES', '@angular/router');
@@ -220,62 +209,48 @@ function addStandaloneServerRoute(options) {
         const updatedProvidersString = [
             ...providersLiteral.elements.map((element) => '    ' + element.getText()),
             `    {
-      provide: ROUTES,
-      multi: true,
-      useValue: [{
-        path: '${APP_SHELL_ROUTE}',
-        component: AppShellComponent
-      }]
-    }\n  `,
+        provide: ROUTES,
+        multi: true,
+        useValue: [{
+          path: '${APP_SHELL_ROUTE}',
+          component: AppShellComponent
+        }]
+      }\n  `,
         ];
         recorder.insertRight(providersLiteral.getStart(), `[\n${updatedProvidersString.join(',\n')}]`);
-        if (options.serverRouting) {
-            host.commitUpdate(recorder);
-            configSourceFile = getSourceFile(host, configFilePath);
-            const functionCall = (0, ast_utils_1.findNodes)(configSourceFile, typescript_1.default.isCallExpression).find((n) => typescript_1.default.isIdentifier(n.expression) && n.expression.getText() === 'provideServerRoutesConfig');
-            if (!functionCall) {
-                throw new schematics_1.SchematicsException(`Cannot find the "provideServerRoutesConfig" function call in "${configFilePath}".`);
-            }
-            recorder = host.beginUpdate(configFilePath);
-            recorder.insertLeft(functionCall.end - 1, `, { appShellRoute: '${APP_SHELL_ROUTE}' }`);
-        }
-        // Add AppShellComponent import
-        const appShellImportChange = (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'AppShellComponent', './app-shell/app-shell.component');
-        (0, change_1.applyToUpdateRecorder)(recorder, [appShellImportChange]);
+        (0, change_1.applyToUpdateRecorder)(recorder, [
+            (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'AppShellComponent', './app-shell/app-shell.component'),
+        ]);
         host.commitUpdate(recorder);
     };
 }
-function addServerRoutingConfig(options) {
+function addServerRoutingConfig(options, isStandalone) {
     return async (host) => {
         const workspace = await (0, workspace_1.getWorkspace)(host);
         const project = workspace.projects.get(options.project);
         if (!project) {
             throw new schematics_1.SchematicsException(`Project name "${options.project}" doesn't not exist.`);
         }
-        const configFilePath = (0, posix_1.join)(project.sourceRoot ?? 'src', 'app/app.routes.server.ts');
-        if (!host.exists(configFilePath)) {
+        const configFilePath = isStandalone
+            ? (0, posix_1.join)(project.sourceRoot ?? 'src', 'app/app.config.server.ts')
+            : getServerModulePath(host, project.sourceRoot || 'src', 'main.server.ts');
+        if (!configFilePath || !host.exists(configFilePath)) {
             throw new schematics_1.SchematicsException(`Cannot find "${configFilePath}".`);
         }
-        const sourceFile = getSourceFile(host, configFilePath);
-        const nodes = (0, ast_utils_1.getSourceNodes)(sourceFile);
-        // Find the serverRoutes variable declaration
-        const serverRoutesNode = nodes.find((node) => typescript_1.default.isVariableDeclaration(node) &&
-            node.initializer &&
-            typescript_1.default.isArrayLiteralExpression(node.initializer) &&
-            node.type &&
-            typescript_1.default.isArrayTypeNode(node.type) &&
-            node.type.getText().includes('ServerRoute'));
-        if (!serverRoutesNode) {
-            throw new schematics_1.SchematicsException(`Cannot find the "ServerRoute" configuration in "${configFilePath}".`);
+        let recorder = host.beginUpdate(configFilePath);
+        const configSourceFile = getSourceFile(host, configFilePath);
+        const functionCall = (0, ast_utils_1.findNodes)(configSourceFile, typescript_1.default.isCallExpression, 
+        /** max */ undefined, 
+        /** recursive */ true).find((n) => typescript_1.default.isIdentifier(n.expression) && n.expression.getText() === 'provideServerRouting');
+        if (!functionCall) {
+            throw new schematics_1.SchematicsException(`Cannot find the "provideServerRouting" function call in "${configFilePath}".`);
         }
-        const recorder = host.beginUpdate(configFilePath);
-        const arrayLiteral = serverRoutesNode.initializer;
-        const firstElementPosition = arrayLiteral.elements[0]?.getStart() ?? arrayLiteral.getStart() + 1;
-        const newRouteString = `{
-    path: '${APP_SHELL_ROUTE}',
-    renderMode: RenderMode.AppShell
-  },\n`;
-        recorder.insertLeft(firstElementPosition, newRouteString);
+        recorder = host.beginUpdate(configFilePath);
+        recorder.insertLeft(functionCall.end - 1, `, withAppShell(AppShellComponent)`);
+        (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'),
+        ]);
         host.commitUpdate(recorder);
     };
 }
@@ -286,10 +261,14 @@ function default_1(options) {
         return (0, schematics_1.chain)([
             validateProject(browserEntryPoint),
             (0, schematics_1.schematic)('server', options),
-            ...(isStandalone
-                ? [addStandaloneServerRoute(options)]
-                : [addRouterModule(browserEntryPoint), addServerRoutes(options)]),
-            options.serverRouting ? (0, schematics_1.noop)() : addAppShellConfigToWorkspace(options),
+            ...(options.serverRouting
+                ? [(0, schematics_1.noop)()]
+                : isStandalone
+                    ? [addStandaloneServerRoute(options)]
+                    : [addServerRoutes(options)]),
+            options.serverRouting
+                ? addServerRoutingConfig(options, isStandalone)
+                : addAppShellConfigToWorkspace(options),
             (0, schematics_1.schematic)('component', {
                 name: 'app-shell',
                 module: 'app.module.server.ts',

package/app-shell/schema.d.ts

@@ -1,7 +1,7 @@
 /**
  * Configures your project to generate an app-shell during build time.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name of the project where the app-shell should be generated.
      */
@@ -11,4 +11,4 @@ export interface Schema {
      * Preview).
      */
     serverRouting?: boolean;
-}
+};

package/application/schema.d.ts

@@ -4,7 +4,7 @@
  * configuration files. You can customize various aspects of the application, such as
  * routing, styling, and testing.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Generate an application that does not use `zone.js`.
      */
@@ -90,7 +90,7 @@ export interface Schema {
      * component styles are scoped and applied.
      */
     viewEncapsulation?: ViewEncapsulation;
-}
+};
 /**
  * The type of stylesheet files to be created for components in the application.
  */

package/class/schema.d.ts

@@ -4,7 +4,7 @@
  * with properties and methods. This schematic helps you generate a new class with the basic
  * structure and optional test files.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name for the new class. This will be used to create the class file (e.g.,
      * `my-class.ts`) and, if enabled, the corresponding test file `my-class.spec.ts`.
@@ -29,4 +29,4 @@ export interface Schema {
      * For example, if you set the type to `helper`, the filename will be `my-class.helper.ts`.
      */
     type?: string;
-}
+};

package/component/schema.d.ts

@@ -3,7 +3,7 @@
  * applications. Each component consists of a TypeScript class, an HTML template, and an
  * optional CSS stylesheet. Use this schematic to generate a new component in your project.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Configures the change detection strategy for the component.
      */
@@ -103,7 +103,7 @@ export interface Schema {
      * styles are scoped and applied.
      */
     viewEncapsulation?: ViewEncapsulation;
-}
+};
 /**
  * Configures the change detection strategy for the component.
  */

package/config/schema.d.ts

@@ -3,7 +3,7 @@
  * your project's build process, testing, and browser compatibility. This schematic helps
  * you create or update essential configuration files with ease.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name of the project where the configuration file should be created or updated.
      */
@@ -12,7 +12,7 @@ export interface Schema {
      * Specifies the type of configuration file to generate.
      */
     type: Type;
-}
+};
 /**
  * Specifies the type of configuration file to generate.
  */

package/directive/schema.d.ts

@@ -4,7 +4,7 @@
  * custom attributes, and respond to events. This schematic generates the necessary files
  * and boilerplate code for a new directive.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Automatically export the directive from the specified NgModule, making it accessible to
      * other modules in the application.
@@ -59,4 +59,4 @@ export interface Schema {
      * other standalone components or directives.
      */
     standalone?: boolean;
-}
+};

package/e2e/schema.d.ts

@@ -1,7 +1,7 @@
 /**
  * Generates a new, generic end-to-end test definition in the given project.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name of the application being tested.
      */
@@ -10,4 +10,4 @@ export interface Schema {
      * The HTML selector for the root component of the test app.
      */
     rootSelector?: string;
-}
+};

package/enum/schema.d.ts

@@ -3,7 +3,7 @@
  * named constants, making your code more readable and maintainable. This schematic
  * generates a new enum with the specified name and type.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name for the new enum. This will be used to create the enum file (e.g.,
      * `my-enum.enum.ts`).
@@ -24,4 +24,4 @@ export interface Schema {
      * For example, if you set the type to `status`, the filename will be `my-enum.status.ts`.
      */
     type?: string;
-}
+};

package/environments/schema.d.ts

@@ -4,9 +4,9 @@
  * development, testing, and production. This schematic helps you create and manage these
  * files, making it easier to customize your application's behavior for each environment.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name of the project where the environment files should be created or updated.
      */
     project: string;
-}
+};

package/guard/schema.d.ts

@@ -3,7 +3,7 @@
  * parts of your application by checking certain conditions before a route is activated.
  * This schematic generates a new guard with the specified name, type, and options.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Creates the new guard files at the top level of the current project. If set to false, a
      * new folder with the guard's name will be created to contain the files.
@@ -40,7 +40,7 @@ export interface Schema {
      * Skip the generation of a unit test file `spec.ts` for the new guard.
      */
     skipTests?: boolean;
-}
+};
 export declare enum Implement {
     CanActivate = "CanActivate",
     CanActivateChild = "CanActivateChild",

package/interceptor/schema.d.ts

@@ -4,7 +4,7 @@
  * perform tasks like adding authentication headers, handling errors, or logging requests.
  * This schematic generates the necessary files and boilerplate code for a new interceptor.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Creates the new interceptor files at the top level of the current project. If set to
      * false, a new folder with the interceptor's name will be created to contain the files.
@@ -35,4 +35,4 @@ export interface Schema {
      * Skip the generation of a unit test file `spec.ts` for the new interceptor.
      */
     skipTests?: boolean;
-}
+};

package/interface/schema.d.ts

@@ -3,7 +3,7 @@
  * TypeScript, ensuring type safety and code clarity. This schematic generates a new
  * interface with the specified name and type.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name for the new interface. This will be used to create the interface file (e.g.,
      * `my-interface.interface.ts`).
@@ -30,4 +30,4 @@ export interface Schema {
      * `my-interface.data.ts`.
      */
     type?: string;
-}
+};

package/library/index.js

@@ -38,8 +38,8 @@ function addDependenciesToPackageJson() {
             },
             {
                 type: dependencies_1.NodeDependencyType.Dev,
-                name: '@angular/build',
-                version: latest_versions_1.latestVersions.AngularBuild,
+                name: '@angular-devkit/build-angular',
+                version: latest_versions_1.latestVersions.DevkitBuildAngular,
             },
             {
                 type: dependencies_1.NodeDependencyType.Dev,
@@ -70,7 +70,7 @@ function addLibToWorkspaceFile(options, projectRoot, projectName) {
             prefix: options.prefix,
             targets: {
                 build: {
-                    builder: workspace_models_1.Builders.BuildNgPackagr,
+                    builder: workspace_models_1.Builders.NgPackagr,
                     defaultConfiguration: 'production',
                     options: {
                         project: `${projectRoot}/ng-package.json`,

package/library/schema.d.ts

@@ -4,7 +4,7 @@
  * across multiple applications. This schematic simplifies the process of generating a new
  * library with the necessary files and configurations.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The path to the library's public API file, relative to the workspace root. This file
      * defines what parts of the library are accessible to applications that import it.
@@ -47,4 +47,4 @@ export interface Schema {
      * This can simplify the structure of your library and its usage in applications.
      */
     standalone?: boolean;
-}
+};

package/module/schema.d.ts

@@ -1,7 +1,7 @@
 /**
  * Creates a new, generic NgModule definition in the given project.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The new NgModule imports "CommonModule".
      */
@@ -40,7 +40,7 @@ export interface Schema {
      * The scope for the new routing module.
      */
     routingScope?: RoutingScope;
-}
+};
 /**
  * The scope for the new routing module.
  */

package/ng-new/schema.d.ts

@@ -4,7 +4,7 @@
  * an optional starter application. You can customize various aspects of the workspace and
  * the initial project, such as routing, styling, and testing.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Configure the initial Git commit for the new repository.
      */
@@ -115,17 +115,17 @@ export interface Schema {
      * encapsulated using Shadow DOM).
      */
     viewEncapsulation?: ViewEncapsulation;
-}
+};
 /**
  * Configure the initial Git commit for the new repository.
  */
 export type CommitUnion = boolean | CommitObject;
-export interface CommitObject {
+export type CommitObject = {
     email: string;
     message?: string;
     name: string;
     [property: string]: any;
-}
+};
 /**
  * The package manager used to install dependencies.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "19.1.3",
+  "version": "19.1.5",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -22,8 +22,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "19.1.3",
-    "@angular-devkit/schematics": "19.1.3",
+    "@angular-devkit/core": "19.1.5",
+    "@angular-devkit/schematics": "19.1.5",
     "jsonc-parser": "3.3.1"
   },
   "repository": {

package/pipe/schema.d.ts

@@ -4,7 +4,7 @@
  * dates, currency, or filtering arrays. This schematic generates the necessary files and
  * boilerplate code for a new pipe.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Automatically export the pipe from the specified NgModule, making it accessible to other
      * modules in the application.
@@ -49,4 +49,4 @@ export interface Schema {
      * standalone components, directives, or pipes.
      */
     standalone?: boolean;
-}
+};

package/resolver/schema.d.ts

@@ -4,7 +4,7 @@
  * displayed. This can improve the user experience by preventing delays and loading states.
  * This schematic generates a new resolver with the specified name and options.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Creates the new resolver files at the top level of the current project. If set to false,
      * a new folder with the resolver's name will be created to contain the files.
@@ -34,4 +34,4 @@ export interface Schema {
      * Skip the generation of a unit test file `spec.ts` for the new resolver.
      */
     skipTests?: boolean;
-}
+};

package/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';<% if(serverRouting) { %>
-import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { provideServerRouting } from '@angular/ssr';<% } %>
 import { AppComponent } from './app.component';
 import { AppModule } from './app.module';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 @NgModule({
   imports: [AppModule, ServerModule],<% if(serverRouting) { %>
-  providers: [provideServerRoutesConfig(serverRoutes)],<% } %>
+  providers: [provideServerRouting(serverRoutes)],<% } %>
   bootstrap: [AppComponent],
 })
 export class AppServerModule {}

package/server/files/application-builder/standalone-src/app/app.config.server.ts.template

@@ -1,13 +1,13 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
 import { provideServerRendering } from '@angular/platform-server';<% if(serverRouting) { %>
-import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { provideServerRouting } from '@angular/ssr';<% } %>
 import { appConfig } from './app.config';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 const serverConfig: ApplicationConfig = {
   providers: [
     provideServerRendering(),<% if(serverRouting) { %>
-    provideServerRoutesConfig(serverRoutes)<% } %>
+    provideServerRouting(serverRoutes)<% } %>
   ]
 };
 

package/server/schema.d.ts

@@ -3,7 +3,7 @@
  * be rendered on the server, improving initial load performance and SEO. This schematic
  * configures your project for SSR and generates the necessary files.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name of the project to enable server-side rendering for.
      */
@@ -18,4 +18,4 @@ export interface Schema {
      * dependencies later.
      */
     skipInstall?: boolean;
-}
+};

package/service/schema.d.ts

@@ -3,7 +3,7 @@
  * such as data access, API calls, or utility functions. This schematic simplifies the
  * process of generating a new service with the necessary files and boilerplate code.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Creates files at the top level of the project or the given path. If set to false, a new
      * folder with the service's name will be created to contain the files.
@@ -28,4 +28,4 @@ export interface Schema {
      * Skip the generation of a unit test file `spec.ts` for the service.
      */
     skipTests?: boolean;
-}
+};

package/service-worker/schema.d.ts

@@ -3,7 +3,7 @@
  * offline or on low-quality networks by caching assets and intercepting network requests.
  * This schematic configures your project to use a service worker.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name of the project to add the service worker to. If not specified, the CLI will
      * determine the project from the current directory.
@@ -14,4 +14,4 @@ export interface Schema {
      * that the service worker should be generated during the standard build process.
      */
     target?: string;
-}
+};

package/ssr/schema.d.ts

@@ -5,7 +5,7 @@
  * generating the necessary files and making the required modifications to your project's
  * structure.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name of the project you want to enable SSR for.
      */
@@ -20,4 +20,4 @@ export interface Schema {
      * dependencies later.
      */
     skipInstall?: boolean;
-}
+};

package/utility/latest-versions.js

@@ -15,7 +15,7 @@ exports.latestVersions = {
     ...dependencies,
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: dependencies['@angular/core'],
-    DevkitBuildAngular: '^19.1.3',
-    AngularBuild: '^19.1.3',
-    AngularSSR: '^19.1.3',
+    DevkitBuildAngular: '^19.1.5',
+    AngularBuild: '^19.1.5',
+    AngularSSR: '^19.1.5',
 };

package/web-worker/schema.d.ts

@@ -4,7 +4,7 @@
  * offloading computationally intensive tasks. This schematic generates the necessary files
  * for a new web worker and provides an optional code snippet to demonstrate its usage.
  */
-export interface Schema {
+export type Schema = {
     /**
      * The name for the new web worker. This will be used to create the worker file (e.g.,
      * `my-worker.worker.ts`).
@@ -24,4 +24,4 @@ export interface Schema {
      * Generate a code snippet that demonstrates how to create and use the new web worker.
      */
     snippet?: boolean;
-}
+};

package/workspace/schema.d.ts

@@ -4,7 +4,7 @@
  * build processes for a collection of applications and libraries. This schematic sets up
  * the basic structure of the workspace and installs the necessary Angular dependencies.
  */
-export interface Schema {
+export type Schema = {
     /**
      * Create a workspace without any testing frameworks. This is intended for learning purposes
      * and simple experimentation, not for production applications.
@@ -34,7 +34,7 @@ export interface Schema {
      * The version of the Angular CLI to use.
      */
     version: string;
-}
+};
 /**
  * The package manager to use for installing dependencies.
  */