@schematics/angular 19.0.0-rc.1 → 19.0.0-rc.3

package/app-shell/index.js

@@ -202,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');
@@ -229,6 +229,16 @@ function addStandaloneServerRoute(options) {
     }\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]);
@@ -279,9 +289,7 @@ function default_1(options) {
             ...(isStandalone
                 ? [addStandaloneServerRoute(options)]
                 : [addRouterModule(browserEntryPoint), addServerRoutes(options)]),
-            options.serverRouting
-                ? addServerRoutingConfig(options)
-                : addAppShellConfigToWorkspace(options),
+            options.serverRouting ? (0, schematics_1.noop)() : addAppShellConfigToWorkspace(options),
             (0, schematics_1.schematic)('component', {
                 name: 'app-shell',
                 module: 'app.module.server.ts',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "19.0.0-rc.1",
+  "version": "19.0.0-rc.3",
   "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.0.0-rc.1",
-    "@angular-devkit/schematics": "19.0.0-rc.1",
+    "@angular-devkit/core": "19.0.0-rc.3",
+    "@angular-devkit/schematics": "19.0.0-rc.3",
     "jsonc-parser": "3.3.1"
   },
   "packageManager": "yarn@4.5.0",

package/ssr/files/server-builder/server.ts.template

@@ -2,7 +2,7 @@ import 'zone.js/node';
 
 import { APP_BASE_HREF } from '@angular/common';
 import { CommonEngine } from '@angular/ssr/node';
-import * as express from 'express';
+import express from 'express';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import <% if (isStandalone) { %>bootstrap<% } else { %>AppServerModule<% } %> from './main.server';

package/ssr/index.d.ts

@@ -7,4 +7,6 @@
  */
 import { Rule } from '@angular-devkit/schematics';
 import { Schema as SSROptions } from './schema';
-export default function (options: SSROptions): Rule;
+export default function (inputOptions: SSROptions): Rule;
+export type Prompt = (message: string, defaultValue: boolean) => Promise<boolean>;
+export declare function setPrompterForTestOnly(prompter?: Prompt): void;

package/ssr/index.js

@@ -6,8 +6,32 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+exports.setPrompterForTestOnly = setPrompterForTestOnly;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const node_path_1 = require("node:path");
@@ -19,6 +43,7 @@ const project_targets_1 = require("../utility/project-targets");
 const util_1 = require("../utility/standalone/util");
 const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
+const tty_1 = require("./tty");
 const SERVE_SSR_TARGET_NAME = 'serve-ssr';
 const PRERENDER_TARGET_NAME = 'prerender';
 const DEFAULT_BROWSER_DIR = 'browser';
@@ -49,7 +74,7 @@ async function getApplicationBuilderOutputPaths(host, projectName) {
     }
     const { outputPath } = architectTarget.options;
     if (outputPath === null || outputPath === undefined) {
-        throw new schematics_1.SchematicsException(`outputPath for ${projectName} ${target} target is undeined or null.`);
+        throw new schematics_1.SchematicsException(`outputPath for ${projectName} ${target} target is undefined or null.`);
     }
     const defaultDirs = {
         server: DEFAULT_SERVER_DIR,
@@ -266,16 +291,18 @@ function addServerFile(projectSourceRoot, options, isStandalone) {
         ]));
     };
 }
-function default_1(options) {
+function default_1(inputOptions) {
     return async (host, context) => {
-        const browserEntryPoint = await (0, util_1.getMainFilePath)(host, options.project);
+        const browserEntryPoint = await (0, util_1.getMainFilePath)(host, inputOptions.project);
         const isStandalone = (0, ng_ast_utils_1.isStandaloneApp)(host, browserEntryPoint);
         const workspace = await (0, workspace_1.getWorkspace)(host);
-        const clientProject = workspace.projects.get(options.project);
+        const clientProject = workspace.projects.get(inputOptions.project);
         if (!clientProject) {
             throw (0, project_targets_1.targetBuildNotFoundError)();
         }
         const isUsingApplicationBuilder = usingApplicationBuilder(clientProject);
+        const serverRouting = await isServerRoutingEnabled(isUsingApplicationBuilder, inputOptions);
+        const options = { ...inputOptions, serverRouting };
         const sourceRoot = clientProject.sourceRoot ?? node_path_1.posix.join(clientProject.root, 'src');
         return (0, schematics_1.chain)([
             (0, schematics_1.schematic)('server', {
@@ -302,3 +329,38 @@ function usingApplicationBuilder(project) {
     const isUsingApplicationBuilder = buildBuilder === workspace_models_1.Builders.Application || buildBuilder === workspace_models_1.Builders.BuildApplication;
     return isUsingApplicationBuilder;
 }
+const defaultPrompter = async (message, defaultValue) => {
+    const { confirm } = await Promise.resolve().then(() => __importStar(require('@inquirer/prompts')));
+    return await confirm({
+        message,
+        default: defaultValue,
+    });
+};
+// Allow the prompt functionality to be overridden to facilitate testing.
+let prompt = defaultPrompter;
+function setPrompterForTestOnly(prompter) {
+    prompt = prompter ?? defaultPrompter;
+}
+/** Returns whether or not server routing is enabled, potentially prompting the user if necessary. */
+async function isServerRoutingEnabled(isUsingApplicationBuilder, options) {
+    if (!isUsingApplicationBuilder) {
+        if (options.serverRouting) {
+            throw new schematics_1.SchematicsException('Server routing APIs can only be added to a project using `application` builder.');
+        }
+        else {
+            return false;
+        }
+    }
+    // Use explicit option if provided.
+    if (options.serverRouting !== undefined) {
+        return options.serverRouting;
+    }
+    const serverRoutingDefault = false;
+    // Use the default if not in an interactive terminal.
+    if (!(0, tty_1.isTTY)()) {
+        return serverRoutingDefault;
+    }
+    // Prompt the user if in an interactive terminal and no option was provided.
+    return await prompt('Would you like to use the Server Routing and App Engine APIs (Developer Preview) for this server application?', 
+    /* defaultValue */ serverRoutingDefault);
+}

package/ssr/schema.json

@@ -18,9 +18,7 @@
     },
     "serverRouting": {
       "description": "Creates a server application using the Server Routing and App Engine APIs (Developer Preview).",
-      "x-prompt": "Would you like to use the Server Routing and App Engine APIs (Developer Preview) for this server application?",
-      "type": "boolean",
-      "default": false
+      "type": "boolean"
     }
   },
   "required": ["project"],

package/ssr/tty.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+export declare function isTTY(): boolean;

package/ssr/tty.js

@@ -0,0 +1,22 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTTY = isTTY;
+function _isTruthy(value) {
+    // Returns true if value is a string that is anything but 0 or false.
+    return value !== undefined && value !== '0' && value.toUpperCase() !== 'FALSE';
+}
+function isTTY() {
+    // If we force TTY, we always return true.
+    const force = process.env['NG_FORCE_TTY'];
+    if (force !== undefined) {
+        return _isTruthy(force);
+    }
+    return !!process.stdout.isTTY && !_isTruthy(process.env['CI']);
+}

package/utility/latest-versions.js

@@ -15,6 +15,6 @@ 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.0.0-rc.1',
-    AngularSSR: '^19.0.0-rc.1',
+    DevkitBuildAngular: '^19.0.0-rc.3',
+    AngularSSR: '^19.0.0-rc.3',
 };