@schematics/angular 20.2.0-next.2 → 20.2.0-rc.0

package/migrations/use-application-builder/stylesheet-updates.js

@@ -0,0 +1,219 @@
+"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.hasLessStylesheets = hasLessStylesheets;
+exports.hasPostcssConfiguration = hasPostcssConfiguration;
+exports.updateStyleImports = updateStyleImports;
+const posix_1 = require("node:path/posix");
+const css_import_lexer_1 = require("./css-import-lexer");
+/** A list of all supported SASS style extensions.
+ * Order of extension is important and matches Sass behavior.
+ */
+const SASS_EXTENSIONS = ['.scss', '.sass', '.css'];
+/** The prefix used to indicate a SASS partial file. */
+const SASS_PARTIAL_PREFIX = '_';
+/**
+ * Searches the schematic tree for files that have a `.less` extension.
+ * This is used to determine if the `less` package should be added as a dependency.
+ *
+ * @param tree A Schematics tree instance to search.
+ * @returns `true` if Less stylesheet files are found; otherwise, `false`.
+ */
+function hasLessStylesheets(tree) {
+    const directories = [tree.getDir('/')];
+    let current;
+    while ((current = directories.pop())) {
+        for (const path of current.subfiles) {
+            if (path.endsWith('.less')) {
+                return true;
+            }
+        }
+        for (const path of current.subdirs) {
+            if (path === 'node_modules' || path.startsWith('.')) {
+                continue;
+            }
+            directories.push(current.dir(path));
+        }
+    }
+    return false;
+}
+/**
+ * Searches for a PostCSS configuration file within the workspace root or any of the project roots.
+ * This is used to determine if the `postcss` package should be added as a dependency.
+ *
+ * @param tree A Schematics tree instance to search.
+ * @param workspace A Workspace to check for projects.
+ * @returns `true` if a PostCSS configuration file is found; otherwise, `false`.
+ */
+function hasPostcssConfiguration(tree, workspace) {
+    const projectRoots = [...workspace.projects.values()].map((p) => p.root).filter(Boolean);
+    const searchDirectories = new Set(['', ...projectRoots]);
+    for (const dir of searchDirectories) {
+        if (tree.exists((0, posix_1.join)(dir, 'postcss.config.json')) ||
+            tree.exists((0, posix_1.join)(dir, '.postcssrc.json'))) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Recursively visits all stylesheet files in a directory and yields their path and content.
+ *
+ * @param directory The directory to visit.
+ */
+function* visitStylesheets(directory) {
+    for (const path of directory.subfiles) {
+        if (path.endsWith('.css') || path.endsWith('.scss') || path.endsWith('.sass')) {
+            const entry = directory.file(path);
+            if (entry) {
+                yield [entry.path, entry.content.toString()];
+            }
+        }
+    }
+    for (const path of directory.subdirs) {
+        if (path === 'node_modules' || path.startsWith('.')) {
+            continue;
+        }
+        yield* visitStylesheets(directory.dir(path));
+    }
+}
+/**
+ * Determines if a Sass import is likely intended to be relative to the workspace root.
+ * This is considered true if the import cannot be resolved relative to the containing file,
+ * but can be resolved relative to the workspace root.
+ *
+ * @param specifier The import specifier to check.
+ * @param filePath The path of the file containing the import.
+ * @param tree A Schematics tree instance.
+ * @param fromImport Whether the specifier is from an `@import` rule.
+ * @returns `true` if the import is likely workspace-relative; otherwise, `false`.
+ */
+function isWorkspaceRelativeSassImport(specifier, filePath, tree, fromImport) {
+    const relativeBase = (0, posix_1.dirname)(filePath);
+    const potentialWorkspacePaths = [...potentialSassImports(specifier, '/', fromImport)];
+    if (potentialWorkspacePaths.some((p) => tree.exists(p))) {
+        const potentialRelativePaths = [...potentialSassImports(specifier, relativeBase, fromImport)];
+        return potentialRelativePaths.every((p) => !tree.exists(p));
+    }
+    return false;
+}
+/**
+ * Analyzes a single stylesheet's content for import patterns that need to be updated.
+ *
+ * @param filePath The path of the stylesheet file.
+ * @param content The content of the stylesheet file.
+ * @param tree A Schematics tree instance.
+ * @returns A `StylesheetAnalysis` object containing the results of the analysis.
+ */
+function analyzeStylesheet(filePath, content, tree) {
+    const isSass = filePath.endsWith('.scss') || filePath.endsWith('.sass');
+    const analysis = {
+        needsWorkspaceIncludePath: false,
+        externalDependencies: new Set(),
+        contentChanges: [],
+    };
+    for (const { start, specifier, fromUse } of (0, css_import_lexer_1.findImports)(content, isSass)) {
+        if (specifier.startsWith('~')) {
+            analysis.contentChanges.push({ start: start + 1, length: 1 });
+        }
+        else if (specifier.startsWith('^')) {
+            analysis.contentChanges.push({ start: start + 1, length: 1 });
+            analysis.externalDependencies.add(specifier.slice(1));
+        }
+        else if (isSass && isWorkspaceRelativeSassImport(specifier, filePath, tree, !fromUse)) {
+            analysis.needsWorkspaceIncludePath = true;
+        }
+    }
+    return analysis;
+}
+/**
+ * The main orchestrator function for updating stylesheets.
+ * It iterates through all stylesheets in a project, analyzes them, and applies the necessary
+ * changes to the files and the build configuration.
+ *
+ * @param tree A Schematics tree instance.
+ * @param projectSourceRoot The source root of the project being updated.
+ * @param buildTarget The build target of the project being updated.
+ */
+function updateStyleImports(tree, projectSourceRoot, buildTarget) {
+    const allExternalDeps = new Set();
+    let projectNeedsIncludePath = false;
+    for (const [path, content] of visitStylesheets(tree.getDir(projectSourceRoot))) {
+        const { needsWorkspaceIncludePath, externalDependencies, contentChanges } = analyzeStylesheet(path, content, tree);
+        if (needsWorkspaceIncludePath) {
+            projectNeedsIncludePath = true;
+        }
+        for (const dep of externalDependencies) {
+            allExternalDeps.add(dep);
+        }
+        if (contentChanges.length > 0) {
+            const updater = tree.beginUpdate(path);
+            // Apply changes in reverse to avoid index shifting
+            for (const change of contentChanges.sort((a, b) => b.start - a.start)) {
+                updater.remove(change.start, change.length);
+            }
+            tree.commitUpdate(updater);
+        }
+    }
+    if (projectNeedsIncludePath) {
+        buildTarget.options ??= {};
+        const styleOptions = (buildTarget.options['stylePreprocessorOptions'] ??= {});
+        const includePaths = (styleOptions['includePaths'] ??= []);
+        if (Array.isArray(includePaths)) {
+            includePaths.push('.');
+        }
+    }
+    if (allExternalDeps.size > 0) {
+        buildTarget.options ??= {};
+        const externalDeps = (buildTarget.options['externalDependencies'] ??=
+            []);
+        if (Array.isArray(externalDeps)) {
+            externalDeps.push(...allExternalDeps);
+        }
+    }
+}
+/**
+ * A helper generator that yields potential Sass import candidates for a given filename and extensions.
+ *
+ * @param directory The directory in which to resolve the candidates.
+ * @param filename The base filename of the import.
+ * @param extensions The file extensions to try.
+ * @param fromImport Whether the specifier is from an `@import` rule.
+ * @returns An iterable of potential import file paths.
+ */
+function* yieldSassImportCandidates(directory, filename, extensions, fromImport) {
+    if (fromImport) {
+        for (const ext of extensions) {
+            yield (0, posix_1.join)(directory, filename + '.import' + ext);
+            yield (0, posix_1.join)(directory, SASS_PARTIAL_PREFIX + filename + '.import' + ext);
+        }
+    }
+    for (const ext of extensions) {
+        yield (0, posix_1.join)(directory, filename + ext);
+        yield (0, posix_1.join)(directory, SASS_PARTIAL_PREFIX + filename + ext);
+    }
+}
+/**
+ * Generates a sequence of potential file paths that the Sass compiler would attempt to resolve
+ * for a given import specifier, following the official Sass resolution algorithm.
+ * Based on https://github.com/sass/dart-sass/blob/44d6bb6ac72fe6b93f5bfec371a1fffb18e6b76d/lib/src/importer/utils.dart
+ *
+ * @param specifier The import specifier to resolve.
+ * @param base The base path from which to resolve the specifier.
+ * @param fromImport Whether the specifier is from an `@import` rule.
+ * @returns An iterable of potential file paths.
+ */
+function* potentialSassImports(specifier, base, fromImport) {
+    const directory = (0, posix_1.join)(base, (0, posix_1.dirname)(specifier));
+    const extension = (0, posix_1.extname)(specifier);
+    const hasStyleExtension = SASS_EXTENSIONS.includes(extension);
+    const filename = (0, posix_1.basename)(specifier, hasStyleExtension ? extension : undefined);
+    const extensionsToTry = hasStyleExtension ? [extension] : SASS_EXTENSIONS;
+    yield* yieldSassImportCandidates(directory, filename, extensionsToTry, fromImport);
+}

package/ng-new/index.js

@@ -46,6 +46,9 @@ function default_1(options) {
         (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.empty)(), [
             (0, schematics_1.schematic)('workspace', workspaceOptions),
             options.createApplication ? (0, schematics_1.schematic)('application', applicationOptions) : schematics_1.noop,
+            (0, schematics_1.schematic)('ai-config', {
+                tool: options.aiConfig?.length ? options.aiConfig : undefined,
+            }),
             (0, schematics_1.move)(options.directory),
         ])),
         (_host, context) => {

package/ng-new/schema.d.ts

@@ -5,6 +5,11 @@
  * the initial project, such as routing, styling, and testing.
  */
 export type Schema = {
+    /**
+     * Specifies which AI tools to generate configuration files for. These file are used to
+     * improve the outputs of AI tools by following the best practices.
+     */
+    aiConfig?: AiConfig[];
     /**
      * Configure the initial Git commit for the new repository.
      */
@@ -111,6 +116,15 @@ export type Schema = {
      */
     zoneless?: boolean;
 };
+export declare enum AiConfig {
+    Claude = "claude",
+    Copilot = "copilot",
+    Cursor = "cursor",
+    Gemini = "gemini",
+    Jetbrains = "jetbrains",
+    None = "none",
+    Windsurf = "windsurf"
+}
 /**
  * Configure the initial Git commit for the new repository.
  */

package/ng-new/schema.js

@@ -2,7 +2,17 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ViewEncapsulation = exports.Style = exports.PackageManager = void 0;
+exports.ViewEncapsulation = exports.Style = exports.PackageManager = exports.AiConfig = void 0;
+var AiConfig;
+(function (AiConfig) {
+    AiConfig["Claude"] = "claude";
+    AiConfig["Copilot"] = "copilot";
+    AiConfig["Cursor"] = "cursor";
+    AiConfig["Gemini"] = "gemini";
+    AiConfig["Jetbrains"] = "jetbrains";
+    AiConfig["None"] = "none";
+    AiConfig["Windsurf"] = "windsurf";
+})(AiConfig || (exports.AiConfig = AiConfig = {}));
 /**
  * The package manager used to install dependencies.
  */

package/ng-new/schema.json

@@ -141,9 +141,16 @@
     },
     "zoneless": {
       "description": "Create an initial application that does not utilize `zone.js`.",
-      "x-prompt": "Do you want to create a 'zoneless' application without zone.js (Developer Preview)?",
-      "type": "boolean",
-      "default": false
+      "type": "boolean"
+    },
+    "aiConfig": {
+      "type": "array",
+      "uniqueItems": true,
+      "description": "Specifies which AI tools to generate configuration files for. These file are used to improve the outputs of AI tools by following the best practices.",
+      "items": {
+        "type": "string",
+        "enum": ["none", "gemini", "copilot", "claude", "cursor", "jetbrains", "windsurf"]
+      }
     }
   },
   "required": ["name", "version"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "20.2.0-next.2",
+  "version": "20.2.0-rc.0",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -22,15 +22,15 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "20.2.0-next.2",
-    "@angular-devkit/schematics": "20.2.0-next.2",
+    "@angular-devkit/core": "20.2.0-rc.0",
+    "@angular-devkit/schematics": "20.2.0-rc.0",
     "jsonc-parser": "3.3.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
-  "packageManager": "pnpm@9.15.9",
+  "packageManager": "pnpm@10.14.0",
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/service-worker/index.js

@@ -47,7 +47,7 @@ const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/
 const utility_1 = require("../utility");
 const ast_utils_1 = require("../utility/ast-utils");
 const change_1 = require("../utility/change");
-const dependencies_1 = require("../utility/dependencies");
+const dependency_1 = require("../utility/dependency");
 const ng_ast_utils_1 = require("../utility/ng-ast-utils");
 const paths_1 = require("../utility/paths");
 const project_targets_1 = require("../utility/project-targets");
@@ -56,7 +56,7 @@ const util_1 = require("../utility/standalone/util");
 const workspace_models_1 = require("../utility/workspace-models");
 function addDependencies() {
     return (host) => {
-        const coreDep = (0, dependencies_1.getPackageJsonDependency)(host, '@angular/core');
+        const coreDep = (0, dependency_1.getDependency)(host, '@angular/core');
         if (!coreDep) {
             throw new schematics_1.SchematicsException('Could not find "@angular/core" version.');
         }

package/third_party/github.com/Microsoft/TypeScript/lib/typescript.js

@@ -2285,7 +2285,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.9";
-var version = "5.9.1-rc";
+var version = "5.9.2";
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";

package/utility/dependency.d.ts

@@ -5,7 +5,7 @@
  * 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
  */
-import { Rule } from '@angular-devkit/schematics';
+import { Rule, Tree } from '@angular-devkit/schematics';
 /**
  * An enum used to specify the type of a dependency found within a package manifest
  * file (`package.json`).
@@ -55,6 +55,32 @@ export declare enum ExistingBehavior {
      */
     Replace = 1
 }
+/**
+ * Represents a dependency found in a package manifest.
+ */
+export interface Dependency {
+    /**
+     * The type of the dependency.
+     */
+    type: DependencyType;
+    /**
+     * The name of the package.
+     */
+    name: string;
+    /**
+     * The version specifier of the package.
+     */
+    version: string;
+}
+/**
+ * Gets information about a dependency from a `package.json` file.
+ *
+ * @param tree The schematic's virtual file system representation.
+ * @param name The name of the package to check.
+ * @param packageJsonPath The path to the `package.json` file. Defaults to `/package.json`.
+ * @returns An object containing the dependency's type and version, or null if not found.
+ */
+export declare function getDependency(tree: Tree, name: string, packageJsonPath?: string): Dependency | null;
 /**
  * Adds a package as a dependency to a `package.json`. By default the `package.json` located
  * at the schematic's root will be used. The `manifestPath` option can be used to explicitly specify
@@ -94,3 +120,23 @@ export declare function addDependency(name: string, specifier: string, options?:
      */
     existing?: ExistingBehavior;
 }): Rule;
+/**
+ * Removes a package from the package.json in the project root.
+ *
+ * @param name The name of the package to remove.
+ * @param options An optional object that can contain a path of a manifest file to modify.
+ * @returns A Schematics {@link Rule}
+ */
+export declare function removeDependency(name: string, options?: {
+    /**
+     * The path of the package manifest file (`package.json`) that will be modified.
+     * Defaults to `/package.json`.
+     */
+    packageJsonPath?: string;
+    /**
+     * The dependency installation behavior to use to determine whether a
+     * {@link NodePackageInstallTask} should be scheduled after removing the dependency.
+     * Defaults to {@link InstallBehavior.Auto}.
+     */
+    install?: InstallBehavior;
+}): Rule;

package/utility/dependency.js

@@ -41,7 +41,9 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExistingBehavior = exports.InstallBehavior = exports.DependencyType = void 0;
+exports.getDependency = getDependency;
 exports.addDependency = addDependency;
+exports.removeDependency = removeDependency;
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const path = __importStar(require("node:path"));
 const installTasks = new WeakMap();
@@ -97,6 +99,28 @@ var ExistingBehavior;
      */
     ExistingBehavior[ExistingBehavior["Replace"] = 1] = "Replace";
 })(ExistingBehavior || (exports.ExistingBehavior = ExistingBehavior = {}));
+/**
+ * Gets information about a dependency from a `package.json` file.
+ *
+ * @param tree The schematic's virtual file system representation.
+ * @param name The name of the package to check.
+ * @param packageJsonPath The path to the `package.json` file. Defaults to `/package.json`.
+ * @returns An object containing the dependency's type and version, or null if not found.
+ */
+function getDependency(tree, name, packageJsonPath = '/package.json') {
+    const manifest = tree.readJson(packageJsonPath);
+    for (const type of [DependencyType.Default, DependencyType.Dev, DependencyType.Peer]) {
+        const section = manifest[type];
+        if (section?.[name]) {
+            return {
+                type,
+                name,
+                version: section[name],
+            };
+        }
+    }
+    return null;
+}
 /**
  * Adds a package as a dependency to a `package.json`. By default the `package.json` located
  * at the schematic's root will be used. The `manifestPath` option can be used to explicitly specify
@@ -153,3 +177,34 @@ function addDependency(name, specifier, options = {}) {
         }
     };
 }
+/**
+ * Removes a package from the package.json in the project root.
+ *
+ * @param name The name of the package to remove.
+ * @param options An optional object that can contain a path of a manifest file to modify.
+ * @returns A Schematics {@link Rule}
+ */
+function removeDependency(name, options = {}) {
+    const { packageJsonPath = '/package.json', install = InstallBehavior.Auto } = options;
+    return (tree, context) => {
+        const manifest = tree.readJson(packageJsonPath);
+        let wasRemoved = false;
+        for (const type of [DependencyType.Default, DependencyType.Dev, DependencyType.Peer]) {
+            const dependencySection = manifest[type];
+            if (dependencySection?.[name]) {
+                delete dependencySection[name];
+                wasRemoved = true;
+            }
+        }
+        if (wasRemoved) {
+            tree.overwrite(packageJsonPath, JSON.stringify(manifest, null, 2));
+            const installPaths = installTasks.get(context) ?? new Set();
+            if (install === InstallBehavior.Always ||
+                (install === InstallBehavior.Auto && !installPaths.has(packageJsonPath))) {
+                context.addTask(new tasks_1.NodePackageInstallTask({ workingDirectory: path.dirname(packageJsonPath) }));
+                installPaths.add(packageJsonPath);
+                installTasks.set(context, installPaths);
+            }
+        }
+    };
+}

package/utility/latest-versions/package.json

@@ -21,7 +21,7 @@
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "ts-node": "~10.9.0",
-    "typescript": "~5.8.2",
+    "typescript": "~5.9.2",
     "zone.js": "~0.15.0"
   }
 }

package/utility/latest-versions.js

@@ -16,7 +16,7 @@ exports.latestVersions = {
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^20.2.0-next.0',
     NgPackagr: '^20.2.0-next.0',
-    DevkitBuildAngular: '^20.2.0-next.2',
-    AngularBuild: '^20.2.0-next.2',
-    AngularSSR: '^20.2.0-next.2',
+    DevkitBuildAngular: '^20.2.0-rc.0',
+    AngularBuild: '^20.2.0-rc.0',
+    AngularSSR: '^20.2.0-rc.0',
 };

package/workspace/files/package.json.template

@@ -9,6 +9,8 @@
     "test": "ng test"<% } %>
   },
   "prettier": {
+    "printWidth": 100,
+    "singleQuote": true,
     "overrides": [
       {
         "files": "*.html",