@angular/cli 17.0.7 → 17.0.9

package/lib/config/schema.json

@@ -400,10 +400,12 @@
                       "@angular-devkit/build-angular:dev-server",
                       "@angular-devkit/build-angular:extract-i18n",
                       "@angular-devkit/build-angular:karma",
+                      "@angular-devkit/build-angular:ng-packagr",
+                      "@angular-devkit/build-angular:prerender",
                       "@angular-devkit/build-angular:jest",
                       "@angular-devkit/build-angular:protractor",
                       "@angular-devkit/build-angular:server",
-                      "@angular-devkit/build-angular:ng-packagr"
+                      "@angular-devkit/build-angular:ssr-dev-server"
                     ]
                   }
                 },
@@ -625,6 +627,50 @@
                 }
               }
             },
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "builder": {
+                  "const": "@angular-devkit/build-angular:prerender"
+                },
+                "defaultConfiguration": {
+                  "type": "string",
+                  "description": "A default named configuration to use when a target configuration is not provided."
+                },
+                "options": {
+                  "$ref": "#/definitions/AngularDevkitBuildAngularBuildersPrerenderSchema"
+                },
+                "configurations": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "$ref": "#/definitions/AngularDevkitBuildAngularBuildersPrerenderSchema"
+                  }
+                }
+              }
+            },
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "builder": {
+                  "const": "@angular-devkit/build-angular:ssr-dev-server"
+                },
+                "defaultConfiguration": {
+                  "type": "string",
+                  "description": "A default named configuration to use when a target configuration is not provided."
+                },
+                "options": {
+                  "$ref": "#/definitions/AngularDevkitBuildAngularBuildersSsrDevServerSchema"
+                },
+                "configurations": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "$ref": "#/definitions/AngularDevkitBuildAngularBuildersSsrDevServerSchema"
+                  }
+                }
+              }
+            },
             {
               "type": "object",
               "additionalProperties": false,
@@ -3959,6 +4005,119 @@
       },
       "additionalProperties": false
     },
+    "AngularDevkitBuildAngularBuildersPrerenderSchema": {
+      "title": "Prerender Target",
+      "type": "object",
+      "properties": {
+        "browserTarget": {
+          "type": "string",
+          "description": "Target to build.",
+          "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+        },
+        "serverTarget": {
+          "type": "string",
+          "description": "Server target to use for prerendering the app.",
+          "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+        },
+        "routesFile": {
+          "type": "string",
+          "description": "The path to a file that contains a list of all routes to prerender, separated by newlines. This option is useful if you want to prerender routes with parameterized URLs."
+        },
+        "routes": {
+          "type": "array",
+          "description": "The routes to render.",
+          "items": {
+            "minItems": 1,
+            "type": "string",
+            "uniqueItems": true
+          },
+          "default": []
+        },
+        "discoverRoutes": {
+          "type": "boolean",
+          "description": "Whether the builder should process the Angular Router configuration to find all unparameterized routes and prerender them.",
+          "default": true
+        }
+      },
+      "anyOf": [
+        {},
+        {}
+      ],
+      "additionalProperties": false
+    },
+    "AngularDevkitBuildAngularBuildersSsrDevServerSchema": {
+      "title": "SSR Dev Server Target",
+      "description": "SSR Dev Server target options for Build Facade.",
+      "type": "object",
+      "properties": {
+        "browserTarget": {
+          "type": "string",
+          "description": "Browser target to build.",
+          "pattern": ".+:.+(:.+)?"
+        },
+        "serverTarget": {
+          "type": "string",
+          "description": "Server target to build.",
+          "pattern": ".+:.+(:.+)?"
+        },
+        "host": {
+          "type": "string",
+          "description": "Host to listen on.",
+          "default": "localhost"
+        },
+        "port": {
+          "type": "number",
+          "default": 4200,
+          "description": "Port to start the development server at. Default is 4200. Pass 0 to get a dynamically assigned port."
+        },
+        "watch": {
+          "type": "boolean",
+          "description": "Rebuild on change.",
+          "default": true
+        },
+        "publicHost": {
+          "type": "string",
+          "description": "The URL that the browser client should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies."
+        },
+        "open": {
+          "type": "boolean",
+          "description": "Opens the url in default browser.",
+          "default": false,
+          "alias": "o"
+        },
+        "progress": {
+          "type": "boolean",
+          "description": "Log progress to the console while building."
+        },
+        "inspect": {
+          "type": "boolean",
+          "description": "Launch the development server in inspector mode and listen on address and port '127.0.0.1:9229'.",
+          "default": false
+        },
+        "ssl": {
+          "type": "boolean",
+          "description": "Serve using HTTPS.",
+          "default": false
+        },
+        "sslKey": {
+          "type": "string",
+          "description": "SSL key to use for serving HTTPS."
+        },
+        "sslCert": {
+          "type": "string",
+          "description": "SSL certificate to use for serving HTTPS."
+        },
+        "proxyConfig": {
+          "type": "string",
+          "description": "Proxy configuration file."
+        },
+        "verbose": {
+          "type": "boolean",
+          "description": "Adds more details to output logging."
+        }
+      },
+      "additionalProperties": false
+    },
     "AngularDevkitBuildAngularBuildersServerSchema": {
       "title": "Universal Target",
       "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "17.0.7",
+  "version": "17.0.9",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,10 +25,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1700.7",
-    "@angular-devkit/core": "17.0.7",
-    "@angular-devkit/schematics": "17.0.7",
-    "@schematics/angular": "17.0.7",
+    "@angular-devkit/architect": "0.1700.9",
+    "@angular-devkit/core": "17.0.9",
+    "@angular-devkit/schematics": "17.0.9",
+    "@schematics/angular": "17.0.9",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
     "ini": "4.1.1",
@@ -47,13 +47,13 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "17.0.7",
-      "@angular/ssr": "17.0.7",
-      "@angular-devkit/architect": "0.1700.7",
-      "@angular-devkit/build-angular": "17.0.7",
-      "@angular-devkit/build-webpack": "0.1700.7",
-      "@angular-devkit/core": "17.0.7",
-      "@angular-devkit/schematics": "17.0.7"
+      "@angular/cli": "17.0.9",
+      "@angular/ssr": "17.0.9",
+      "@angular-devkit/architect": "0.1700.9",
+      "@angular-devkit/build-angular": "17.0.9",
+      "@angular-devkit/build-webpack": "0.1700.9",
+      "@angular-devkit/core": "17.0.9",
+      "@angular-devkit/schematics": "17.0.9"
     }
   },
   "engines": {

package/src/command-builder/architect-base-command-module.js

@@ -6,14 +6,36 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/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.ArchitectBaseCommandModule = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const node_1 = require("@angular-devkit/architect/node");
 const core_1 = require("@angular-devkit/core");
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const path_1 = require("path");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const analytics_1 = require("../analytics/analytics");
 const analytics_parameters_1 = require("../analytics/analytics-parameters");
 const error_1 = require("../utilities/error");
@@ -140,13 +162,13 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
             return;
         }
         // Check for a `node_modules` directory (npm, yarn non-PnP, etc.)
-        if ((0, fs_1.existsSync)((0, path_1.resolve)(basePath, 'node_modules'))) {
+        if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(basePath, 'node_modules'))) {
             return;
         }
         // Check for yarn PnP files
-        if ((0, fs_1.existsSync)((0, path_1.resolve)(basePath, '.pnp.js')) ||
-            (0, fs_1.existsSync)((0, path_1.resolve)(basePath, '.pnp.cjs')) ||
-            (0, fs_1.existsSync)((0, path_1.resolve)(basePath, '.pnp.mjs'))) {
+        if ((0, node_fs_1.existsSync)((0, node_path_1.resolve)(basePath, '.pnp.js')) ||
+            (0, node_fs_1.existsSync)((0, node_path_1.resolve)(basePath, '.pnp.cjs')) ||
+            (0, node_fs_1.existsSync)((0, node_path_1.resolve)(basePath, '.pnp.mjs'))) {
             return;
         }
         this.context.logger.warn(`Node packages may not be installed. Try installing with '${this.context.packageManager.name} install'.`);
@@ -172,13 +194,14 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
             const packageToInstall = await this.getMissingTargetPackageToInstall(choices);
             if (packageToInstall) {
                 // Example run: `ng add @angular-eslint/schematics`.
-                const binPath = (0, path_1.resolve)(__dirname, '../../bin/ng.js');
-                const { error } = (0, child_process_1.spawnSync)(process.execPath, [binPath, 'add', packageToInstall], {
-                    stdio: 'inherit',
+                const AddCommandModule = (await Promise.resolve().then(() => __importStar(require('../commands/add/cli')))).default;
+                await new AddCommandModule(this.context).run({
+                    interactive: true,
+                    force: false,
+                    dryRun: false,
+                    defaults: false,
+                    collection: packageToInstall,
                 });
-                if (error) {
-                    throw error;
-                }
             }
         }
         else {

package/src/command-builder/schematics-command-module.js

@@ -46,6 +46,7 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             .option('dry-run', {
             describe: 'Run through and reports activity without writing out results.',
             type: 'boolean',
+            alias: ['d'],
             default: false,
         })
             .option('defaults', {

package/src/commands/add/cli.d.ts

@@ -14,7 +14,7 @@ interface AddCommandArgs extends SchematicsCommandArgs {
     registry?: string;
     'skip-confirmation'?: boolean;
 }
-export default class AddCommadModule extends SchematicsCommandModule implements CommandModuleImplementation<AddCommandArgs> {
+export default class AddCommandModule extends SchematicsCommandModule implements CommandModuleImplementation<AddCommandArgs> {
     command: string;
     describe: string;
     longDescriptionPath: string;

package/src/commands/add/cli.js

@@ -36,7 +36,7 @@ const packageVersionExclusions = {
     // @angular/material@7.x versions have unbounded peer dependency ranges (>=7.0.0).
     '@angular/material': '7.x',
 };
-class AddCommadModule extends schematics_command_module_1.SchematicsCommandModule {
+class AddCommandModule extends schematics_command_module_1.SchematicsCommandModule {
     command = 'add <collection>';
     describe = 'Adds support for an external library to your project.';
     longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
@@ -362,4 +362,4 @@ class AddCommadModule extends schematics_command_module_1.SchematicsCommandModul
         return false;
     }
 }
-exports.default = AddCommadModule;
+exports.default = AddCommandModule;

package/src/commands/version/cli.js

@@ -10,8 +10,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const module_1 = __importDefault(require("module"));
-const path_1 = require("path");
+const node_module_1 = __importDefault(require("node:module"));
+const node_path_1 = require("node:path");
 const command_module_1 = require("../../command-builder/command-module");
 const color_1 = require("../../utilities/color");
 const command_config_1 = require("../command-config");
@@ -22,9 +22,7 @@ const SUPPORTED_NODE_MAJORS = [18, 20];
 const PACKAGE_PATTERNS = [
     /^@angular\/.*/,
     /^@angular-devkit\/.*/,
-    /^@bazel\/.*/,
     /^@ngtools\/.*/,
-    /^@nguniversal\/.*/,
     /^@schematics\/.*/,
     /^rxjs$/,
     /^typescript$/,
@@ -42,9 +40,9 @@ class VersionCommandModule extends command_module_1.CommandModule {
     }
     async run() {
         const { packageManager, logger, root } = this.context;
-        const localRequire = module_1.default.createRequire((0, path_1.resolve)(__filename, '../../../'));
+        const localRequire = node_module_1.default.createRequire((0, node_path_1.resolve)(__filename, '../../../'));
         // Trailing slash is used to allow the path to be treated as a directory
-        const workspaceRequire = module_1.default.createRequire(root + '/');
+        const workspaceRequire = node_module_1.default.createRequire(root + '/');
         const cliPackage = localRequire('./package.json');
         let workspacePackage;
         try {

package/src/utilities/version.js

@@ -25,5 +25,5 @@ class Version {
     }
 }
 // TODO(bazel): Convert this to use build-time version stamping after flipping the build script to use bazel
-// export const VERSION = new Version('17.0.7');
+// export const VERSION = new Version('17.0.9');
 exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version);