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

package/application/files/common-files/src/app/app.component.html.template

@@ -286,15 +286,15 @@
           rel="noopener"
         >
           <svg
-            width="25"
-            height="20"
-            viewBox="0 0 25 20"
+            width="24"
+            height="24"
+            viewBox="0 0 24 24"
             fill="none"
             xmlns="http://www.w3.org/2000/svg"
             alt="Twitter"
           >
             <path
-              d="M8.04524 20C17.3335 20 22.4138 12.3047 22.4138 5.63144C22.4138 5.41287 22.4138 5.19529 22.399 4.97869C23.3874 4.26381 24.2405 3.37867 24.9185 2.3647C23.9969 2.77329 23.0192 3.04112 22.018 3.15923C23.0723 2.52818 23.8613 1.53552 24.2382 0.366057C23.2469 0.954335 22.1624 1.36889 21.0315 1.59182C20.2701 0.782212 19.2631 0.246107 18.1663 0.0664704C17.0695 -0.113166 15.9441 0.0736804 14.9642 0.598096C13.9843 1.12251 13.2046 1.95526 12.7457 2.96748C12.2868 3.9797 12.1742 5.11495 12.4255 6.19756C10.4178 6.09685 8.45366 5.57507 6.66064 4.66609C4.86763 3.75712 3.28579 2.48127 2.01781 0.921344C1.37203 2.03306 1.17424 3.34911 1.46472 4.60154C1.75519 5.85397 2.51208 6.9486 3.58128 7.66257C2.77759 7.63903 1.9914 7.42221 1.28924 7.03049V7.09449C1.28956 8.26041 1.69316 9.39034 2.4316 10.2926C3.17003 11.1949 4.19783 11.8139 5.34067 12.0448C4.59721 12.2476 3.81715 12.2772 3.06045 12.1315C3.38327 13.1348 4.01156 14.0122 4.85746 14.641C5.70337 15.2698 6.72461 15.6185 7.77842 15.6384C6.73139 16.4614 5.53237 17.0699 4.24995 17.4291C2.96753 17.7882 1.62687 17.891 0.304688 17.7316C2.61411 19.2136 5.30121 19.9997 8.04524 19.9961"
+              d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"
             />
           </svg>
         </a>

package/application/index.js

@@ -77,6 +77,7 @@ function default_1(options) {
             options.ssr
                 ? (0, schematics_1.schematic)('ssr', {
                     project: options.name,
+                    skipInstall: true,
                 })
                 : (0, schematics_1.noop)(),
             options.skipPackageJson ? (0, schematics_1.noop)() : addDependenciesToPackageJson(options),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "17.1.0-next.3",
+  "version": "17.1.0-rc.1",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -23,8 +23,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "17.1.0-next.3",
-    "@angular-devkit/schematics": "17.1.0-next.3",
+    "@angular-devkit/core": "17.1.0-rc.1",
+    "@angular-devkit/schematics": "17.1.0-rc.1",
     "jsonc-parser": "3.2.0"
   },
   "repository": {

package/server/index.js

@@ -9,7 +9,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const node_path_1 = require("node:path");
 const utility_1 = require("../utility");
 const dependencies_1 = require("../utility/dependencies");
@@ -103,22 +102,23 @@ function updateTsConfigFile(tsConfigPath) {
         json.modify(typePath, [...types]);
     };
 }
-function addDependencies() {
+function addDependencies(skipInstall) {
     return (host) => {
         const coreDep = (0, dependencies_1.getPackageJsonDependency)(host, '@angular/core');
         if (coreDep === null) {
             throw new schematics_1.SchematicsException('Could not find version.');
         }
-        const platformServerDep = {
-            ...coreDep,
-            name: '@angular/platform-server',
-        };
-        (0, dependencies_1.addPackageJsonDependency)(host, platformServerDep);
-        (0, dependencies_1.addPackageJsonDependency)(host, {
-            type: dependencies_1.NodeDependencyType.Dev,
-            name: '@types/node',
-            version: latest_versions_1.latestVersions['@types/node'],
-        });
+        const install = skipInstall ? utility_1.InstallBehavior.None : utility_1.InstallBehavior.Auto;
+        return (0, schematics_1.chain)([
+            (0, utility_1.addDependency)('@angular/platform-server', coreDep.version, {
+                type: utility_1.DependencyType.Default,
+                install,
+            }),
+            (0, utility_1.addDependency)('@types/node', latest_versions_1.latestVersions['@types/node'], {
+                type: utility_1.DependencyType.Dev,
+                install,
+            }),
+        ]);
     };
 }
 function default_1(options) {
@@ -138,9 +138,6 @@ function default_1(options) {
             // Server has already been added.
             return;
         }
-        if (!options.skipInstall) {
-            context.addTask(new tasks_1.NodePackageInstallTask());
-        }
         const clientBuildOptions = clientBuildTarget.options;
         const browserEntryPoint = await (0, util_1.getMainFilePath)(host, options.project);
         const isStandalone = (0, ng_ast_utils_1.isStandaloneApp)(host, browserEntryPoint);
@@ -175,7 +172,7 @@ function default_1(options) {
                     ])),
                     updateConfigFileBrowserBuilder(options, tsConfigDirectory),
                 ]),
-            addDependencies(),
+            addDependencies(options.skipInstall),
             (0, utility_1.addRootProvider)(options.project, ({ code, external }) => code `${external('provideClientHydration', '@angular/platform-browser')}()`),
         ]);
     };

package/ssr/index.js

@@ -221,21 +221,26 @@ function updateWebpackBuilderServerTsConfigRule(options) {
         }
     };
 }
-function addDependencies(isUsingApplicationBuilder) {
+function addDependencies({ skipInstall }, isUsingApplicationBuilder) {
+    const install = skipInstall ? utility_1.InstallBehavior.None : utility_1.InstallBehavior.Auto;
     const rules = [
         (0, utility_1.addDependency)('@angular/ssr', latest_versions_1.latestVersions.AngularSSR, {
             type: utility_1.DependencyType.Default,
+            install,
         }),
         (0, utility_1.addDependency)('express', latest_versions_1.latestVersions['express'], {
             type: utility_1.DependencyType.Default,
+            install,
         }),
         (0, utility_1.addDependency)('@types/express', latest_versions_1.latestVersions['@types/express'], {
             type: utility_1.DependencyType.Dev,
+            install,
         }),
     ];
     if (!isUsingApplicationBuilder) {
         rules.push((0, utility_1.addDependency)('browser-sync', latest_versions_1.latestVersions['browser-sync'], {
             type: utility_1.DependencyType.Dev,
+            install,
         }));
     }
     return (0, schematics_1.chain)(rules);
@@ -289,7 +294,7 @@ function default_1(options) {
                 ]),
             addServerFile(options, isStandalone),
             addScriptsRule(options, isUsingApplicationBuilder),
-            addDependencies(isUsingApplicationBuilder),
+            addDependencies(options, isUsingApplicationBuilder),
         ]);
     };
 }

package/utility/ast-utils.js

@@ -34,6 +34,7 @@ exports.hasTopLevelIdentifier = exports.addRouteDeclarationToModule = exports.ge
 const core_1 = require("@angular-devkit/core");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const change_1 = require("./change");
+const eol_1 = require("./eol");
 /**
  * Add Import `import { symbolName } from fileName` if the import doesn't exit
  * already. Assumes fileToEdit can be resolved and accessed.
@@ -81,11 +82,12 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
     }
     const open = isDefault ? '' : '{ ';
     const close = isDefault ? '' : ' }';
+    const eol = (0, eol_1.getEOL)(rootNode.getText());
     // if there are no imports or 'use strict' statement, insert import at beginning of file
     const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;
-    const separator = insertAtBeginning ? '' : ';\n';
+    const separator = insertAtBeginning ? '' : `;${eol}`;
     const toInsert = `${separator}import ${open}${importExpression}${close}` +
-        ` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
+        ` from '${fileName}'${insertAtBeginning ? `;${eol}` : ''}`;
     return insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
 }
 exports.insertImport = insertImport;
@@ -324,7 +326,7 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
         !ts.isArrayLiteralExpression(assignment.initializer)) {
         return [];
     }
-    let expresssion;
+    let expression;
     const assignmentInit = assignment.initializer;
     const elements = assignmentInit.elements;
     if (elements.length) {
@@ -332,21 +334,21 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
         if (symbolsArray.includes(core_1.tags.oneLine `${symbolName}`)) {
             return [];
         }
-        expresssion = elements[elements.length - 1];
+        expression = elements[elements.length - 1];
     }
     else {
-        expresssion = assignmentInit;
+        expression = assignmentInit;
     }
     let toInsert;
-    let position = expresssion.getEnd();
-    if (ts.isArrayLiteralExpression(expresssion)) {
+    let position = expression.getEnd();
+    if (ts.isArrayLiteralExpression(expression)) {
         // We found the field but it's empty. Insert it just before the `]`.
         position--;
         toInsert = `\n${core_1.tags.indentBy(4) `${symbolName}`}\n  `;
     }
     else {
         // Get the indentation of the last element, if any.
-        const text = expresssion.getFullText(source);
+        const text = expression.getFullText(source);
         const matches = text.match(/^(\r?\n)(\s*)/);
         if (matches) {
             toInsert = `,${matches[1]}${core_1.tags.indentBy(matches[2].length) `${symbolName}`}`;

package/utility/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/utility/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/utility/json-file.d.ts

@@ -14,6 +14,7 @@ export declare class JSONFile {
     private readonly host;
     private readonly path;
     content: string;
+    private eol;
     constructor(host: Tree, path: string);
     private _jsonAst;
     private get JsonAst();

package/utility/json-file.js

@@ -9,15 +9,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JSONFile = void 0;
 const jsonc_parser_1 = require("jsonc-parser");
+const eol_1 = require("./eol");
 /** @private */
 class JSONFile {
     host;
     path;
     content;
+    eol;
     constructor(host, path) {
         this.host = host;
         this.path = path;
         this.content = this.host.readText(this.path);
+        this.eol = (0, eol_1.getEOL)(this.content);
     }
     _jsonAst;
     get JsonAst() {
@@ -55,6 +58,7 @@ class JSONFile {
         const edits = (0, jsonc_parser_1.modify)(this.content, jsonPath, value, {
             getInsertionIndex,
             formattingOptions: {
+                eol: this.eol,
                 insertSpaces: true,
                 tabSize: 2,
             },

package/utility/latest-versions/package.json

@@ -6,7 +6,7 @@
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^18.18.0",
-    "browser-sync": "^2.29.3",
+    "browser-sync": "^3.0.0",
     "express": "^4.18.2",
     "jasmine-core": "~5.1.0",
     "jasmine-spec-reporter": "~7.0.0",
@@ -21,6 +21,6 @@
     "tslib": "^2.3.0",
     "ts-node": "~10.9.0",
     "typescript": "~5.3.2",
-    "zone.js": "~0.14.2"
+    "zone.js": "~0.14.3"
   }
 }

package/utility/latest-versions.js

@@ -14,6 +14,6 @@ exports.latestVersions = {
     ...require('./latest-versions/package.json')['dependencies'],
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^17.1.0-next.0',
-    DevkitBuildAngular: '^17.1.0-next.3',
-    AngularSSR: '^17.1.0-next.3',
+    DevkitBuildAngular: '^17.1.0-rc.1',
+    AngularSSR: '^17.1.0-rc.1',
 };