feat(@schematics/angular): remove --server-routing option

Server-side rendering (SSR) will always enable server routing when using the application builder.

BREAKING CHANGE: `--server-routing` option has been removed from several schematics. Server routing will be used when using the application builder.

Author: alan-agius4

packages/angular/ssr/schematics/ng-add/index_spec.ts

@@ -14,7 +14,6 @@ import { join } from 'node:path';
 describe('@angular/ssr ng-add schematic', () => {
   const defaultOptions = {
     project: 'test-app',
-    serverRouting: false,
   };
 
   const schematicRunner = new SchematicTestRunner(

packages/angular/ssr/schematics/ng-add/schema.json

@@ -16,10 +16,6 @@
       "description": "Skip the automatic installation of packages. You will need to manually install the dependencies later.",
       "type": "boolean",
       "default": false
-    },
-    "serverRouting": {
-      "description": "Configure the server application to use the Angular Server Routing API and App Engine APIs (currently in Developer Preview).",
-      "type": "boolean"
     }
   },
   "required": ["project"],

packages/schematics/angular/app-shell/index.ts

@@ -27,9 +27,9 @@ import {
 } from '../utility/ast-utils';
 import { applyToUpdateRecorder } from '../utility/change';
 import { getAppModulePath, isStandaloneApp } from '../utility/ng-ast-utils';
+import { isUsingApplicationBuilder, targetBuildNotFoundError } from '../utility/project-targets';
 import { findBootstrapApplicationCall, getMainFilePath } from '../utility/standalone/util';
-import { getWorkspace, updateWorkspace } from '../utility/workspace';
-import { Builders } from '../utility/workspace-models';
+import { getWorkspace } from '../utility/workspace';
 import { Schema as AppShellOptions } from './schema';
 
 const APP_SHELL_ROUTE = 'shell';
@@ -156,29 +156,6 @@ function getMetadataProperty(metadata: ts.Node, propertyName: string): ts.Proper
   return property;
 }
 
-function addAppShellConfigToWorkspace(options: AppShellOptions): Rule {
-  return updateWorkspace((workspace) => {
-    const project = workspace.projects.get(options.project);
-    if (!project) {
-      return;
-    }
-    const buildTarget = project.targets.get('build');
-    if (
-      buildTarget?.builder === Builders.Application ||
-      buildTarget?.builder === Builders.BuildApplication
-    ) {
-      // Application builder configuration.
-      const prodConfig = buildTarget.configurations?.production;
-      if (!prodConfig) {
-        throw new SchematicsException(
-          `A "production" configuration is not defined for the "build" builder.`,
-        );
-      }
-      prodConfig.appShell = true;
-    }
-  });
-}
-
 function addServerRoutes(options: AppShellOptions): Rule {
   return async (host: Tree) => {
     // The workspace gets updated so this needs to be reloaded
@@ -359,17 +336,21 @@ export default function (options: AppShellOptions): Rule {
     const browserEntryPoint = await getMainFilePath(tree, options.project);
     const isStandalone = isStandaloneApp(tree, browserEntryPoint);
 
+    const workspace = await getWorkspace(tree);
+    const project = workspace.projects.get(options.project);
+    if (!project) {
+      throw targetBuildNotFoundError();
+    }
+
     return chain([
       validateProject(browserEntryPoint),
       schematic('server', options),
-      ...(options.serverRouting
+      ...(isUsingApplicationBuilder(project)
         ? [noop()]
         : isStandalone
           ? [addStandaloneServerRoute(options)]
           : [addServerRoutes(options)]),
-      options.serverRouting
-        ? addServerRoutingConfig(options, isStandalone)
-        : addAppShellConfigToWorkspace(options),
+      addServerRoutingConfig(options, isStandalone),
       schematic('component', {
         name: 'app-shell',
         module: 'app.module.server.ts',

packages/schematics/angular/app-shell/index_spec.ts

@@ -19,7 +19,6 @@ describe('App Shell Schematic', () => {
   );
   const defaultOptions: AppShellOptions = {
     project: 'bar',
-    serverRouting: true,
   };
 
   const workspaceOptions: WorkspaceOptions = {

packages/schematics/angular/app-shell/schema.json

@@ -12,11 +12,6 @@
       "$default": {
         "$source": "projectName"
       }
-    },
-    "serverRouting": {
-      "description": "Set up a server application using the Server Routing and App Engine APIs (Developer Preview).",
-      "type": "boolean",
-      "default": false
     }
   },
   "required": ["project"]

packages/schematics/angular/application/index.ts

@@ -101,7 +101,6 @@ export default function (options: ApplicationOptions): Rule {
       options.ssr
         ? schematic('ssr', {
             project: options.name,
-            serverRouting: options.serverRouting,
             skipInstall: true,
           })
         : noop(),

packages/schematics/angular/application/index_spec.ts

@@ -32,7 +32,6 @@ describe('Application Schematic', () => {
   const defaultOptions: ApplicationOptions = {
     name: 'foo',
     skipPackageJson: false,
-    serverRouting: false,
   };
 
   let workspaceTree: UnitTestTree;

packages/schematics/angular/application/schema.json

@@ -118,10 +118,6 @@
       "default": false,
       "x-user-analytics": "ep.ng_ssr"
     },
-    "serverRouting": {
-      "description": "Set up a server application using the Server Routing and App Engine APIs (Developer Preview).",
-      "type": "boolean"
-    },
     "experimentalZoneless": {
       "description": "Generate an application that does not use `zone.js`.",
       "type": "boolean",

packages/schematics/angular/ng-new/index.ts

@@ -57,7 +57,6 @@ export default function (options: NgNewOptions): Rule {
     minimal: options.minimal,
     standalone: options.standalone,
     ssr: options.ssr,
-    serverRouting: options.serverRouting,
     experimentalZoneless: options.experimentalZoneless,
   };
 

packages/schematics/angular/ng-new/schema.json

@@ -139,10 +139,6 @@
       "type": "boolean",
       "x-user-analytics": "ep.ng_ssr"
     },
-    "serverRouting": {
-      "description": "Create a server application in the initial project using the Server Routing and App Engine APIs (Developer Preview).",
-      "type": "boolean"
-    },
     "experimentalZoneless": {
       "description": "Create an initial application that does not utilize `zone.js`.",
       "type": "boolean",

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

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

packages/schematics/angular/server/index.ts

@@ -28,7 +28,7 @@ import { JSONFile } from '../utility/json-file';
 import { latestVersions } from '../utility/latest-versions';
 import { isStandaloneApp } from '../utility/ng-ast-utils';
 import { relativePathToWorkspaceRoot } from '../utility/paths';
-import { targetBuildNotFoundError } from '../utility/project-targets';
+import { isUsingApplicationBuilder, targetBuildNotFoundError } from '../utility/project-targets';
 import { getMainFilePath } from '../utility/standalone/util';
 import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders } from '../utility/workspace-models';
@@ -113,9 +113,7 @@ function updateConfigFileApplicationBuilder(options: ServerOptions): Rule {
       serverMainEntryName,
     );
 
-    if (options.serverRouting) {
-      buildTarget.options['outputMode'] = 'static';
-    }
+    buildTarget.options['outputMode'] = 'static';
   });
 }
 
@@ -173,13 +171,11 @@ export default function (options: ServerOptions): Rule {
       throw targetBuildNotFoundError();
     }
 
-    const isUsingApplicationBuilder =
-      clientBuildTarget.builder === Builders.Application ||
-      clientBuildTarget.builder === Builders.BuildApplication;
+    const usingApplicationBuilder = isUsingApplicationBuilder(clientProject);
 
     if (
       clientProject.targets.has('server') ||
-      (isUsingApplicationBuilder && clientBuildTarget.options?.server !== undefined)
+      (usingApplicationBuilder && clientBuildTarget.options?.server !== undefined)
     ) {
       // Server has already been added.
       return;
@@ -190,13 +186,10 @@ export default function (options: ServerOptions): Rule {
     const isStandalone = isStandaloneApp(host, browserEntryPoint);
     const sourceRoot = clientProject.sourceRoot ?? join(normalize(clientProject.root), 'src');
 
-    let filesUrl = `./files/${isUsingApplicationBuilder ? 'application-builder/' : 'server-builder/'}`;
+    let filesUrl = `./files/${usingApplicationBuilder ? 'application-builder/' : 'server-builder/'}`;
     filesUrl += isStandalone ? 'standalone-src' : 'ngmodule-src';
 
     const templateSource = apply(url(filesUrl), [
-      options.serverRouting
-        ? noop()
-        : filter((path) => !path.endsWith('app.routes.server.ts.template')),
       applyTemplates({
         ...strings,
         ...options,
@@ -210,7 +203,7 @@ export default function (options: ServerOptions): Rule {
 
     return chain([
       mergeWith(templateSource),
-      ...(isUsingApplicationBuilder
+      ...(usingApplicationBuilder
         ? [
             updateConfigFileApplicationBuilder(options),
             updateTsConfigFile(clientBuildOptions.tsConfig),

packages/schematics/angular/server/schema.json

@@ -17,10 +17,6 @@
       "description": "Skip the automatic installation of packages. You will need to manually install the dependencies later.",
       "type": "boolean",
       "default": false
-    },
-    "serverRouting": {
-      "description": "Configure the server application to use the Server Routing and App Engine APIs (Developer Preview).",
-      "type": "boolean"
     }
   },
   "required": ["project"]