@schematics/angular 19.1.5 → 19.2.0-next.0

package/app-shell/index.js

@@ -106,6 +106,17 @@ 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) => {
@@ -191,7 +202,7 @@ function addStandaloneServerRoute(options) {
         if (!host.exists(configFilePath)) {
             throw new schematics_1.SchematicsException(`Cannot find "${configFilePath}".`);
         }
-        const recorder = host.beginUpdate(configFilePath);
+        let 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');
@@ -209,48 +220,62 @@ 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')}]`);
-        (0, change_1.applyToUpdateRecorder)(recorder, [
-            (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'AppShellComponent', './app-shell/app-shell.component'),
-        ]);
+        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]);
         host.commitUpdate(recorder);
     };
 }
-function addServerRoutingConfig(options, isStandalone) {
+function addServerRoutingConfig(options) {
     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 = 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)) {
+        const configFilePath = (0, posix_1.join)(project.sourceRoot ?? 'src', 'app/app.routes.server.ts');
+        if (!host.exists(configFilePath)) {
             throw new schematics_1.SchematicsException(`Cannot find "${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 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}".`);
         }
-        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'),
-        ]);
+        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);
         host.commitUpdate(recorder);
     };
 }
@@ -261,14 +286,10 @@ function default_1(options) {
         return (0, schematics_1.chain)([
             validateProject(browserEntryPoint),
             (0, schematics_1.schematic)('server', options),
-            ...(options.serverRouting
-                ? [(0, schematics_1.noop)()]
-                : isStandalone
-                    ? [addStandaloneServerRoute(options)]
-                    : [addServerRoutes(options)]),
-            options.serverRouting
-                ? addServerRoutingConfig(options, isStandalone)
-                : addAppShellConfigToWorkspace(options),
+            ...(isStandalone
+                ? [addStandaloneServerRoute(options)]
+                : [addRouterModule(browserEntryPoint), addServerRoutes(options)]),
+            options.serverRouting ? (0, schematics_1.noop)() : addAppShellConfigToWorkspace(options),
             (0, schematics_1.schematic)('component', {
                 name: 'app-shell',
                 module: 'app.module.server.ts',

package/library/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "19.1.5",
+  "version": "19.2.0-next.0",
   "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.5",
-    "@angular-devkit/schematics": "19.1.5",
+    "@angular-devkit/core": "19.2.0-next.0",
+    "@angular-devkit/schematics": "19.2.0-next.0",
     "jsonc-parser": "3.3.1"
   },
   "repository": {

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 { provideServerRouting } from '@angular/ssr';<% } %>
+import { provideServerRoutesConfig } 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: [provideServerRouting(serverRoutes)],<% } %>
+  providers: [provideServerRoutesConfig(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 { provideServerRouting } from '@angular/ssr';<% } %>
+import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
 import { appConfig } from './app.config';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 const serverConfig: ApplicationConfig = {
   providers: [
     provideServerRendering(),<% if(serverRouting) { %>
-    provideServerRouting(serverRoutes)<% } %>
+    provideServerRoutesConfig(serverRoutes)<% } %>
   ]
 };
 

package/utility/latest-versions/package.json

@@ -3,7 +3,6 @@
   "comment": "This file is needed so that dependencies are synced by Renovate.",
   "private": true,
   "dependencies": {
-    "@angular/core": "^19.1.0",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^18.18.0",
@@ -17,7 +16,6 @@
     "karma-jasmine": "~5.1.0",
     "karma": "~6.4.0",
     "less": "^4.2.0",
-    "ng-packagr": "^19.1.0",
     "postcss": "^8.4.38",
     "protractor": "~7.0.0",
     "rxjs": "~7.8.0",

package/utility/latest-versions.d.ts

@@ -10,4 +10,5 @@ export declare const latestVersions: Record<string, string> & {
     DevkitBuildAngular: string;
     AngularBuild: string;
     AngularSSR: string;
+    NgPackagr: string;
 };

package/utility/latest-versions.js

@@ -14,8 +14,9 @@ const dependencies = require('./latest-versions/package.json')['dependencies'];
 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.5',
-    AngularBuild: '^19.1.5',
-    AngularSSR: '^19.1.5',
+    Angular: '^19.2.0-next.0',
+    NgPackagr: '^19.1.0-next.0',
+    DevkitBuildAngular: '^19.2.0-next.0',
+    AngularBuild: '^19.2.0-next.0',
+    AngularSSR: '^19.2.0-next.0',
 };