@angular/cli 17.1.0-next.3 → 17.1.0-rc.1

package/lib/config/schema.json

@@ -400,10 +400,13 @@
                       "@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:web-test-runner",
                       "@angular-devkit/build-angular:protractor",
                       "@angular-devkit/build-angular:server",
-                      "@angular-devkit/build-angular:ng-packagr"
+                      "@angular-devkit/build-angular:ssr-dev-server"
                     ]
                   }
                 },
@@ -603,6 +606,28 @@
                 }
               }
             },
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "builder": {
+                  "const": "@angular-devkit/build-angular:web-test-runner"
+                },
+                "defaultConfiguration": {
+                  "type": "string",
+                  "description": "A default named configuration to use when a target configuration is not provided."
+                },
+                "options": {
+                  "$ref": "#/definitions/AngularDevkitBuildAngularBuildersWebTestRunnerSchema"
+                },
+                "configurations": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "$ref": "#/definitions/AngularDevkitBuildAngularBuildersWebTestRunnerSchema"
+                  }
+                }
+              }
+            },
             {
               "type": "object",
               "additionalProperties": false,
@@ -625,6 +650,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,
@@ -2085,7 +2154,7 @@
                 "preloadInitial": {
                   "type": "boolean",
                   "default": true,
-                  "description": "Generates 'preload', `modulepreload', and 'preconnect' link elements for initial application files and resources."
+                  "description": "Generates 'preload', 'modulepreload', and 'preconnect' link elements for initial application files and resources."
                 }
               }
             },
@@ -3969,6 +4038,297 @@
       },
       "additionalProperties": false
     },
+    "AngularDevkitBuildAngularBuildersWebTestRunnerSchema": {
+      "title": "Web Test Runner Target",
+      "description": "Web Test Runner target options for Build Facade.",
+      "type": "object",
+      "properties": {
+        "main": {
+          "type": "string",
+          "description": "The name of the main entry-point file."
+        },
+        "tsConfig": {
+          "type": "string",
+          "description": "The name of the TypeScript configuration file."
+        },
+        "polyfills": {
+          "description": "Polyfills to be included in the build.",
+          "oneOf": [
+            {
+              "type": "array",
+              "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
+              "items": {
+                "type": "string",
+                "uniqueItems": true
+              },
+              "default": []
+            },
+            {
+              "type": "string",
+              "description": "The full path for the polyfills file, relative to the current workspace or a module specifier. Example: 'zone.js'."
+            }
+          ]
+        },
+        "assets": {
+          "type": "array",
+          "description": "List of static application assets.",
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/AngularDevkitBuildAngularBuildersWebTestRunnerSchema/definitions/assetPattern"
+          }
+        },
+        "scripts": {
+          "description": "Global scripts to be included in the build.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "oneOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "input": {
+                    "type": "string",
+                    "description": "The file to include.",
+                    "pattern": "\\.[cm]?jsx?$"
+                  },
+                  "bundleName": {
+                    "type": "string",
+                    "pattern": "^[\\w\\-.]*$",
+                    "description": "The bundle name for this extra entry point."
+                  },
+                  "inject": {
+                    "type": "boolean",
+                    "description": "If the bundle will be referenced in the HTML file.",
+                    "default": true
+                  }
+                },
+                "additionalProperties": false
+              },
+              {
+                "type": "string",
+                "description": "The file to include.",
+                "pattern": "\\.[cm]?jsx?$"
+              }
+            ]
+          }
+        },
+        "styles": {
+          "description": "Global styles to be included in the build.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "oneOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "input": {
+                    "type": "string",
+                    "description": "The file to include.",
+                    "pattern": "\\.(?:css|scss|sass|less)$"
+                  },
+                  "bundleName": {
+                    "type": "string",
+                    "pattern": "^[\\w\\-.]*$",
+                    "description": "The bundle name for this extra entry point."
+                  },
+                  "inject": {
+                    "type": "boolean",
+                    "description": "If the bundle will be referenced in the HTML file.",
+                    "default": true
+                  }
+                },
+                "additionalProperties": false
+              },
+              {
+                "type": "string",
+                "description": "The file to include.",
+                "pattern": "\\.(?:css|scss|sass|less)$"
+              }
+            ]
+          }
+        },
+        "inlineStyleLanguage": {
+          "description": "The stylesheet language to use for the application's inline component styles.",
+          "type": "string",
+          "default": "css",
+          "enum": [
+            "css",
+            "less",
+            "sass",
+            "scss"
+          ]
+        },
+        "stylePreprocessorOptions": {
+          "description": "Options to pass to style preprocessors",
+          "type": "object",
+          "properties": {
+            "includePaths": {
+              "description": "Paths to include. Paths will be resolved to workspace root.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "default": []
+            }
+          },
+          "additionalProperties": false
+        },
+        "include": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [
+            "**/*.spec.ts"
+          ],
+          "description": "Globs of files to include, relative to project root. \nThere are 2 special cases:\n - when a path to directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists it will be included instead."
+        },
+        "exclude": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [],
+          "description": "Globs of files to exclude, relative to the project root."
+        },
+        "sourceMap": {
+          "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
+          "default": true,
+          "oneOf": [
+            {
+              "type": "object",
+              "properties": {
+                "scripts": {
+                  "type": "boolean",
+                  "description": "Output source maps for all scripts.",
+                  "default": true
+                },
+                "styles": {
+                  "type": "boolean",
+                  "description": "Output source maps for all styles.",
+                  "default": true
+                },
+                "vendor": {
+                  "type": "boolean",
+                  "description": "Resolve vendor packages source maps.",
+                  "default": false
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
+        "progress": {
+          "type": "boolean",
+          "description": "Log progress to the console while building.",
+          "default": true
+        },
+        "watch": {
+          "type": "boolean",
+          "description": "Run build when files change."
+        },
+        "poll": {
+          "type": "number",
+          "description": "Enable and define the file watching poll time period in milliseconds."
+        },
+        "preserveSymlinks": {
+          "type": "boolean",
+          "description": "Do not use the real path when resolving modules. If unset then will default to `true` if NodeJS option --preserve-symlinks is set."
+        },
+        "browsers": {
+          "type": "string",
+          "description": "Override which browsers tests are run against."
+        },
+        "codeCoverage": {
+          "type": "boolean",
+          "description": "Output a code coverage report.",
+          "default": false
+        },
+        "codeCoverageExclude": {
+          "type": "array",
+          "description": "Globs to exclude from code coverage.",
+          "items": {
+            "type": "string"
+          },
+          "default": []
+        },
+        "fileReplacements": {
+          "description": "Replace compilation source files with other compilation source files in the build.",
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "src": {
+                    "type": "string"
+                  },
+                  "replaceWith": {
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "replace": {
+                    "type": "string"
+                  },
+                  "with": {
+                    "type": "string"
+                  }
+                },
+                "additionalProperties": false
+              }
+            ]
+          },
+          "default": []
+        },
+        "webWorkerTsConfig": {
+          "type": "string",
+          "description": "TypeScript configuration for Web Worker modules."
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "assetPattern": {
+          "oneOf": [
+            {
+              "type": "object",
+              "properties": {
+                "glob": {
+                  "type": "string",
+                  "description": "The pattern to match."
+                },
+                "input": {
+                  "type": "string",
+                  "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
+                },
+                "output": {
+                  "type": "string",
+                  "description": "Absolute path within the output."
+                },
+                "ignore": {
+                  "description": "An array of globs to ignore.",
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      }
+    },
     "AngularDevkitBuildAngularBuildersProtractorSchema": {
       "title": "Protractor Target",
       "description": "Protractor target options for Build Facade.",
@@ -4025,6 +4385,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.1.0-next.3",
+  "version": "17.1.0-rc.1",
   "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.1701.0-next.3",
-    "@angular-devkit/core": "17.1.0-next.3",
-    "@angular-devkit/schematics": "17.1.0-next.3",
-    "@schematics/angular": "17.1.0-next.3",
+    "@angular-devkit/architect": "0.1701.0-rc.1",
+    "@angular-devkit/core": "17.1.0-rc.1",
+    "@angular-devkit/schematics": "17.1.0-rc.1",
+    "@schematics/angular": "17.1.0-rc.1",
     "@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.1.0-next.3",
-      "@angular/ssr": "17.1.0-next.3",
-      "@angular-devkit/architect": "0.1701.0-next.3",
-      "@angular-devkit/build-angular": "17.1.0-next.3",
-      "@angular-devkit/build-webpack": "0.1701.0-next.3",
-      "@angular-devkit/core": "17.1.0-next.3",
-      "@angular-devkit/schematics": "17.1.0-next.3"
+      "@angular/cli": "17.1.0-rc.1",
+      "@angular/ssr": "17.1.0-rc.1",
+      "@angular-devkit/architect": "0.1701.0-rc.1",
+      "@angular-devkit/build-angular": "17.1.0-rc.1",
+      "@angular-devkit/build-webpack": "0.1701.0-rc.1",
+      "@angular-devkit/core": "17.1.0-rc.1",
+      "@angular-devkit/schematics": "17.1.0-rc.1"
     }
   },
   "engines": {

package/src/utilities/eol.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.io/license
+ */
+export declare function getEOL(content: string): string;

package/src/utilities/eol.js

@@ -0,0 +1,23 @@
+"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.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEOL = void 0;
+const node_os_1 = require("node:os");
+const CRLF = '\r\n';
+const LF = '\n';
+function getEOL(content) {
+    const newlines = content.match(/(?:\r?\n)/g);
+    if (newlines?.length) {
+        const crlf = newlines.filter((l) => l === CRLF).length;
+        const lf = newlines.length - crlf;
+        return crlf > lf ? CRLF : LF;
+    }
+    return node_os_1.EOL;
+}
+exports.getEOL = getEOL;

package/src/utilities/json-file.js

@@ -10,10 +10,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJson = exports.readAndParseJson = exports.JSONFile = void 0;
 const fs_1 = require("fs");
 const jsonc_parser_1 = require("jsonc-parser");
+const eol_1 = require("./eol");
 /** @internal */
 class JSONFile {
     path;
     content;
+    eol;
     constructor(path) {
         this.path = path;
         const buffer = (0, fs_1.readFileSync)(this.path);
@@ -23,6 +25,7 @@ class JSONFile {
         else {
             throw new Error(`Could not read '${path}'.`);
         }
+        this.eol = (0, eol_1.getEOL)(this.content);
     }
     _jsonAst;
     get JsonAst() {
@@ -66,6 +69,7 @@ class JSONFile {
             formattingOptions: {
                 insertSpaces: true,
                 tabSize: 2,
+                eol: this.eol,
             },
         });
         if (edits.length === 0) {

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.1.0-next.3');
+// export const VERSION = new Version('17.1.0-rc.1');
 exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version);