@schematics/angular 19.2.0-next.0 → 19.2.0-next.2

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/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template

@@ -3,8 +3,7 @@ import { <% if(changeDetection !== 'Default') { %>ChangeDetectionStrategy, <% }%
 @Component({<% if(!skipSelector) {%>
   selector: '<%= selector %>',<%}%><% if(standalone) {%>
   imports: [],<%} else { %>
-  standalone: false,
-  <% }%><% if(inlineTemplate) { %>
+  standalone: false,<% }%><% if(inlineTemplate) { %>
   template: `
     <p>
       <%= dasherize(name) %> works!

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/migrations/update-ssr-imports/migration.js

@@ -42,6 +42,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const ts = __importStar(require("../../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const dependencies_1 = require("../../utility/dependencies");
 function* visit(directory) {
     for (const path of directory.subfiles) {
         if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
@@ -70,6 +71,9 @@ function* visit(directory) {
  */
 function default_1() {
     return (tree) => {
+        if (!(0, dependencies_1.getPackageJsonDependency)(tree, '@angular/ssr')) {
+            return;
+        }
         for (const sourceFile of visit(tree.root)) {
             let recorder;
             const allImportDeclarations = sourceFile.statements.filter((n) => ts.isImportDeclaration(n));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "19.2.0-next.0",
+  "version": "19.2.0-next.2",
   "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.2.0-next.0",
-    "@angular-devkit/schematics": "19.2.0-next.0",
+    "@angular-devkit/core": "19.2.0-next.2",
+    "@angular-devkit/schematics": "19.2.0-next.2",
     "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 { 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/ssr/files/application-builder/server.ts.template

@@ -61,6 +61,6 @@ if (isMainModule(import.meta.url)) {
 }
 
 /**
- * The request handler used by the Angular CLI (dev-server and during build).
+ * Request handler used by the Angular CLI (for dev-server and during build) or Firebase Cloud Functions.
  */
 export const reqHandler = createNodeRequestHandler(app);

package/ssr/files/application-builder-common-engine/server.ts.template

@@ -63,3 +63,5 @@ if (isMainModule(import.meta.url)) {
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }
+
+export default app;

package/utility/latest-versions/package.json

@@ -8,7 +8,7 @@
     "@types/node": "^18.18.0",
     "browser-sync": "^3.0.0",
     "express": "^4.18.2",
-    "jasmine-core": "~5.5.0",
+    "jasmine-core": "~5.6.0",
     "jasmine-spec-reporter": "~7.0.0",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",

package/utility/latest-versions.js

@@ -15,8 +15,8 @@ exports.latestVersions = {
     ...dependencies,
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     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',
+    NgPackagr: '^19.2.0-next.0',
+    DevkitBuildAngular: '^19.2.0-next.2',
+    AngularBuild: '^19.2.0-next.2',
+    AngularSSR: '^19.2.0-next.2',
 };