@schematics/angular 19.2.0 → 20.0.0-next.0

package/application/index.js

@@ -96,8 +96,8 @@ function addDependenciesToPackageJson(options) {
             },
             {
                 type: dependencies_1.NodeDependencyType.Dev,
-                name: '@angular-devkit/build-angular',
-                version: latest_versions_1.latestVersions.DevkitBuildAngular,
+                name: '@angular/build',
+                version: latest_versions_1.latestVersions.AngularBuild,
             },
             {
                 type: dependencies_1.NodeDependencyType.Dev,
@@ -193,7 +193,7 @@ function addAppToWorkspaceFile(options, appDir, folderName) {
         schematics,
         targets: {
             build: {
-                builder: workspace_models_1.Builders.Application,
+                builder: workspace_models_1.Builders.BuildApplication,
                 defaultConfiguration: 'production',
                 options: {
                     outputPath: `dist/${folderName}`,
@@ -219,7 +219,7 @@ function addAppToWorkspaceFile(options, appDir, folderName) {
                 },
             },
             serve: {
-                builder: workspace_models_1.Builders.DevServer,
+                builder: workspace_models_1.Builders.BuildDevServer,
                 defaultConfiguration: 'development',
                 options: {},
                 configurations: {
@@ -232,12 +232,12 @@ function addAppToWorkspaceFile(options, appDir, folderName) {
                 },
             },
             'extract-i18n': {
-                builder: workspace_models_1.Builders.ExtractI18n,
+                builder: workspace_models_1.Builders.BuildExtractI18n,
             },
             test: options.minimal
                 ? undefined
                 : {
-                    builder: workspace_models_1.Builders.Karma,
+                    builder: workspace_models_1.Builders.BuildKarma,
                     options: {
                         polyfills: options.experimentalZoneless ? [] : ['zone.js', 'zone.js/testing'],
                         tsConfig: `${projectRoot}tsconfig.spec.json`,

package/config/index.js

@@ -9,9 +9,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
-const utility_1 = require("@schematics/angular/utility");
 const node_path_1 = require("node:path");
 const paths_1 = require("../utility/paths");
+const workspace_1 = require("../utility/workspace");
+const workspace_models_1 = require("../utility/workspace-models");
 const schema_1 = require("./schema");
 function default_1(options) {
     switch (options.type) {
@@ -25,7 +26,7 @@ function default_1(options) {
 }
 function addBrowserslistConfig(options) {
     return async (host) => {
-        const workspace = await (0, utility_1.readWorkspace)(host);
+        const workspace = await (0, workspace_1.getWorkspace)(host);
         const project = workspace.projects.get(options.project);
         if (!project) {
             throw new schematics_1.SchematicsException(`Project name "${options.project}" doesn't not exist.`);
@@ -38,7 +39,7 @@ function addBrowserslistConfig(options) {
     };
 }
 function addKarmaConfig(options) {
-    return (0, utility_1.updateWorkspace)((workspace) => {
+    return (0, workspace_1.updateWorkspace)((workspace) => {
         const project = workspace.projects.get(options.project);
         if (!project) {
             throw new schematics_1.SchematicsException(`Project name "${options.project}" doesn't not exist.`);
@@ -48,10 +49,10 @@ function addKarmaConfig(options) {
             throw new schematics_1.SchematicsException(`No "test" target found for project "${options.project}".` +
                 ' A "test" target is required to generate a karma configuration.');
         }
-        if (testTarget.builder !== utility_1.AngularBuilder.Karma &&
-            testTarget.builder !== utility_1.AngularBuilder.BuildKarma) {
+        if (testTarget.builder !== workspace_models_1.Builders.Karma &&
+            testTarget.builder !== workspace_models_1.Builders.BuildKarma) {
             throw new schematics_1.SchematicsException(`Cannot add a karma configuration as builder for "test" target in project does not` +
-                ` use "${utility_1.AngularBuilder.Karma}" or "${utility_1.AngularBuilder.BuildKarma}".`);
+                ` use "${workspace_models_1.Builders.Karma}" or "${workspace_models_1.Builders.BuildKarma}".`);
         }
         testTarget.options ??= {};
         testTarget.options.karmaConfig = node_path_1.posix.join(project.root, 'karma.conf.js');
@@ -65,7 +66,7 @@ function addKarmaConfig(options) {
             (0, schematics_1.applyTemplates)({
                 relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(project.root),
                 folderName,
-                needDevkitPlugin: testTarget.builder === utility_1.AngularBuilder.Karma,
+                needDevkitPlugin: testTarget.builder === workspace_models_1.Builders.Karma,
             }),
             (0, schematics_1.move)(project.root),
         ]));

package/e2e/index.js

@@ -9,10 +9,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
-const utility_1 = require("@schematics/angular/utility");
 const node_path_1 = require("node:path");
+const dependency_1 = require("../utility/dependency");
 const json_file_1 = require("../utility/json-file");
 const latest_versions_1 = require("../utility/latest-versions");
+const standalone_1 = require("../utility/standalone");
+const workspace_1 = require("../utility/workspace");
+const workspace_models_1 = require("../utility/workspace-models");
 /**
  * The list of development dependencies used by the E2E protractor-based builder.
  * The versions are sourced from the latest versions `../utility/latest-versions/package.json`
@@ -35,7 +38,7 @@ function addScriptsToPackageJson() {
 }
 function default_1(options) {
     const { relatedAppName } = options;
-    return (0, utility_1.updateWorkspace)((workspace) => {
+    return (0, workspace_1.updateWorkspace)((workspace) => {
         const project = workspace.projects.get(relatedAppName);
         if (!project) {
             throw new schematics_1.SchematicsException(`Project name "${relatedAppName}" doesn't not exist.`);
@@ -43,7 +46,7 @@ function default_1(options) {
         const e2eRootPath = node_path_1.posix.join(project.root, 'e2e');
         project.targets.add({
             name: 'e2e',
-            builder: utility_1.AngularBuilder.Protractor,
+            builder: workspace_models_1.Builders.Protractor,
             defaultConfiguration: 'development',
             options: {
                 protractorConfig: node_path_1.posix.join(e2eRootPath, 'protractor.conf.js'),
@@ -66,10 +69,10 @@ function default_1(options) {
                 }),
                 (0, schematics_1.move)(e2eRootPath),
             ])),
-            (0, utility_1.addRootProvider)(relatedAppName, ({ code, external }) => code `${external('provideProtractorTestingSupport', '@angular/platform-browser')}()`),
-            ...E2E_DEV_DEPENDENCIES.map((name) => (0, utility_1.addDependency)(name, latest_versions_1.latestVersions[name], {
-                type: utility_1.DependencyType.Dev,
-                existing: utility_1.ExistingBehavior.Skip,
+            (0, standalone_1.addRootProvider)(relatedAppName, ({ code, external }) => code `${external('provideProtractorTestingSupport', '@angular/platform-browser')}()`),
+            ...E2E_DEV_DEPENDENCIES.map((name) => (0, dependency_1.addDependency)(name, latest_versions_1.latestVersions[name], {
+                type: dependency_1.DependencyType.Dev,
+                existing: dependency_1.ExistingBehavior.Skip,
             })),
             addScriptsToPackageJson(),
         ]);

package/environments/index.js

@@ -9,12 +9,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
-const utility_1 = require("@schematics/angular/utility");
 const node_path_1 = require("node:path");
+const workspace_1 = require("../utility/workspace");
+const workspace_models_1 = require("../utility/workspace-models");
 const ENVIRONMENTS_DIRECTORY = 'environments';
 const ENVIRONMENT_FILE_CONTENT = 'export const environment = {};\n';
 function default_1(options) {
-    return (0, utility_1.updateWorkspace)((workspace) => {
+    return (0, workspace_1.updateWorkspace)((workspace) => {
         const project = workspace.projects.get(options.project);
         if (!project) {
             throw new schematics_1.SchematicsException(`Project name "${options.project}" doesn't not exist.`);
@@ -53,14 +54,14 @@ function log(type, text) {
     return (_, context) => context.logger[type](text);
 }
 function* generateConfigurationEnvironments(buildTarget, serverTarget, sourceRoot, projectName) {
-    if (buildTarget.builder !== utility_1.AngularBuilder.Browser &&
-        buildTarget.builder !== utility_1.AngularBuilder.BrowserEsbuild &&
-        buildTarget.builder !== utility_1.AngularBuilder.Application &&
-        buildTarget.builder !== utility_1.AngularBuilder.BuildApplication) {
+    if (buildTarget.builder !== workspace_models_1.Builders.Browser &&
+        buildTarget.builder !== workspace_models_1.Builders.BrowserEsbuild &&
+        buildTarget.builder !== workspace_models_1.Builders.Application &&
+        buildTarget.builder !== workspace_models_1.Builders.BuildApplication) {
         yield log('warn', `"build" target found for project "${projectName}" has a third-party builder "${buildTarget.builder}".` +
             ' The generated project options may not be compatible with this builder.');
     }
-    if (serverTarget && serverTarget.builder !== utility_1.AngularBuilder.Server) {
+    if (serverTarget && serverTarget.builder !== workspace_models_1.Builders.Server) {
         yield log('warn', `"server" target found for project "${projectName}" has a third-party builder "${buildTarget.builder}".` +
             ' The generated project options may not be compatible with this builder.');
     }

package/library/index.js

@@ -38,8 +38,8 @@ function addDependenciesToPackageJson() {
             },
             {
                 type: dependencies_1.NodeDependencyType.Dev,
-                name: '@angular-devkit/build-angular',
-                version: latest_versions_1.latestVersions.DevkitBuildAngular,
+                name: '@angular/build',
+                version: latest_versions_1.latestVersions.AngularBuild,
             },
             {
                 type: dependencies_1.NodeDependencyType.Dev,
@@ -70,7 +70,7 @@ function addLibToWorkspaceFile(options, projectRoot, projectName) {
             prefix: options.prefix,
             targets: {
                 build: {
-                    builder: workspace_models_1.Builders.NgPackagr,
+                    builder: workspace_models_1.Builders.BuildNgPackagr,
                     defaultConfiguration: 'production',
                     options: {
                         project: `${projectRoot}/ng-package.json`,
@@ -85,7 +85,7 @@ function addLibToWorkspaceFile(options, projectRoot, projectName) {
                     },
                 },
                 test: {
-                    builder: workspace_models_1.Builders.Karma,
+                    builder: workspace_models_1.Builders.BuildKarma,
                     options: {
                         tsConfig: `${projectRoot}/tsconfig.spec.json`,
                         polyfills: ['zone.js', 'zone.js/testing'],

package/migrations/use-application-builder/migration.js

@@ -99,7 +99,10 @@ function* updateBuildTarget(projectName, buildTarget, serverTarget, tree, contex
     // Update server file
     const ssrMainFile = serverTarget?.options?.['main'];
     if (typeof ssrMainFile === 'string') {
-        yield deleteFile(ssrMainFile);
+        // Do not delete the server main file if it's the same as the browser file.
+        if (buildTarget.options?.browser !== ssrMainFile) {
+            yield deleteFile(ssrMainFile);
+        }
         yield (0, schematics_1.externalSchematic)('@schematics/angular', 'ssr', {
             project: projectName,
             skipInstall: true,
@@ -346,8 +349,13 @@ function deleteFile(path) {
     };
 }
 function updateJsonFile(path, updater) {
-    return (tree) => {
-        updater(new json_file_1.JSONFile(tree, path));
+    return (tree, ctx) => {
+        if (tree.exists(path)) {
+            updater(new json_file_1.JSONFile(tree, path));
+        }
+        else {
+            ctx.logger.info(`Skipping updating '${path}' as it does not exist.`);
+        }
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "19.2.0",
+  "version": "20.0.0-next.0",
   "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.2.0",
-    "@angular-devkit/schematics": "19.2.0",
+    "@angular-devkit/core": "20.0.0-next.0",
+    "@angular-devkit/schematics": "20.0.0-next.0",
     "jsonc-parser": "3.3.1"
   },
   "repository": {
@@ -31,7 +31,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+    "node": "^20.11.1 || >=22.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts

@@ -1486,10 +1486,6 @@ declare namespace ts {
                 command: CommandTypes.Quickinfo;
                 arguments: FileLocationRequestArgs;
             }
-            export interface QuickInfoRequestArgs extends FileLocationRequestArgs {
-                /** TODO */
-                verbosityLevel?: number;
-            }
             /**
              * Body of QuickInfoResponse.
              */
@@ -1523,10 +1519,6 @@ declare namespace ts {
                  * JSDoc tags associated with symbol.
                  */
                 tags: JSDocTagInfo[];
-                /**
-                 * TODO
-                 */
-                canIncreaseVerbosityLevel?: boolean;
             }
             /**
              * Quickinfo response message.
@@ -10765,7 +10757,6 @@ declare namespace ts {
         displayParts?: SymbolDisplayPart[];
         documentation?: SymbolDisplayPart[];
         tags?: JSDocTagInfo[];
-        canIncreaseVerbosityLevel?: boolean;
     }
     type RenameInfo = RenameInfoSuccess | RenameInfoFailure;
     interface RenameInfoSuccess {