@schematics/angular 15.0.0-next.0 → 15.0.0-next.1

package/migrations/migration-collection.json

@@ -1,34 +1,9 @@
 {
   "schematics": {
-    "update-angular-packages-version-prefix": {
-      "version": "14.0.0",
-      "factory": "./update-14/angular-packages-version-prefix",
-      "description": "Update Angular packages 'dependencies' and 'devDependencies' version prefix to '^' instead of '~'."
-    },
-    "update-tsconfig-target": {
-      "version": "14.0.0",
-      "factory": "./update-14/update-tsconfig-target",
-      "description": "Update TypeScript compilation target to 'ES2020'."
-    },
-    "remove-show-circular-dependencies-option": {
-      "version": "14.0.0",
-      "factory": "./update-14/remove-show-circular-dependencies-option",
-      "description": "Remove 'showCircularDependencies' option from browser and server builders."
-    },
-    "remove-default-project-option": {
-      "version": "14.0.0",
-      "factory": "./update-14/remove-default-project-option",
-      "description": "Remove 'defaultProject' option from workspace configuration. The project to use will be determined from the current working directory."
-    },
-    "replace-default-collection-option": {
-      "version": "14.0.0",
-      "factory": "./update-14/replace-default-collection-option",
-      "description": "Replace 'defaultCollection' option in workspace configuration with 'schematicCollections'."
-    },
-    "update-libraries-secondary-entrypoints": {
-      "version": "14.0.0",
-      "factory": "./update-14/update-libraries-secondary-entrypoints",
-      "description": "Remove 'package.json' files from library projects secondary entrypoints."
+    "remove-browserslist-config": {
+      "version": "15.0.0",
+      "factory": "./update-15/remove-browserslist-config",
+      "description": "Remove Browserslist configuration files that matches the Angular CLI default configuration."
     }
   }
 }

package/migrations/{update-14/remove-default-project-option.d.ts → update-15/remove-browserslist-config.d.ts}

@@ -6,5 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Rule } from '@angular-devkit/schematics';
-/** Migration to remove 'defaultProject' option from angular.json. */
+export declare const DEFAULT_BROWSERS: string[];
 export default function (): Rule;

package/migrations/update-15/remove-browserslist-config.js

@@ -0,0 +1,94 @@
+"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
+ */
+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.DEFAULT_BROWSERS = void 0;
+const core_1 = require("@angular-devkit/core");
+const validBrowserslistConfigFilenames = new Set(['browserslist', '.browserslistrc']);
+exports.DEFAULT_BROWSERS = [
+    'last 1 Chrome version',
+    'last 1 Firefox version',
+    'last 2 Edge major versions',
+    'last 2 Safari major versions',
+    'last 2 iOS major versions',
+    'Firefox ESR',
+];
+function* visit(directory) {
+    for (const path of directory.subfiles) {
+        if (validBrowserslistConfigFilenames.has(path)) {
+            yield (0, core_1.join)(directory.path, path);
+        }
+    }
+    for (const path of directory.subdirs) {
+        if (path === 'node_modules') {
+            continue;
+        }
+        yield* visit(directory.dir(path));
+    }
+}
+function default_1() {
+    return async (tree, { logger }) => {
+        let browserslist;
+        try {
+            browserslist = (await Promise.resolve().then(() => __importStar(require('browserslist')))).default;
+        }
+        catch {
+            logger.warn('Skipping migration because the "browserslist" package could not be loaded.');
+            return;
+        }
+        // Set the defaults to match the defaults in build-angular.
+        browserslist.defaults = exports.DEFAULT_BROWSERS;
+        const defaultSupportedBrowsers = new Set(browserslist(exports.DEFAULT_BROWSERS));
+        const es5Browsers = new Set(browserslist(['supports es6-module']));
+        for (const path of visit(tree.root)) {
+            const { defaults: browsersListConfig, ...otherConfigs } = browserslist.parseConfig(tree.readText(path));
+            if (Object.keys(otherConfigs).length) {
+                // The config contains additional sections.
+                continue;
+            }
+            const browserslistInProject = browserslist(
+            // Exclude from the list ES5 browsers which are not supported.
+            browsersListConfig.map((s) => `${s} and supports es6-module`), {
+                ignoreUnknownVersions: true,
+            });
+            if (defaultSupportedBrowsers.size !== browserslistInProject.length) {
+                continue;
+            }
+            const shouldDelete = browserslistInProject.every((browser) => defaultSupportedBrowsers.has(browser));
+            if (shouldDelete) {
+                // All browsers are the same as the default config.
+                // Delete file as it's redundant.
+                tree.delete(path);
+            }
+        }
+    };
+}
+exports.default = default_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "15.0.0-next.0",
+  "version": "15.0.0-next.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": "15.0.0-next.0",
-    "@angular-devkit/schematics": "15.0.0-next.0",
+    "@angular-devkit/core": "15.0.0-next.1",
+    "@angular-devkit/schematics": "15.0.0-next.1",
     "jsonc-parser": "3.2.0"
   },
   "repository": {

package/application/files/.browserslistrc.template

@@ -1,16 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# For the full list of supported browsers by the Angular framework, please see:
-# https://angular.io/guide/browser-support
-
-# You can see what browsers were selected by your queries by running:
-#   npx browserslist
-
-last 1 Chrome version
-last 1 Firefox version
-last 2 Edge major versions
-last 2 Safari major versions
-last 2 iOS major versions
-Firefox ESR

package/migrations/update-14/angular-packages-version-prefix.d.ts

@@ -1,29 +0,0 @@
-/**
- * @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
- */
-import { Rule } from '@angular-devkit/schematics';
-/**
- * This migrations updates Angular packages 'dependencies' and 'devDependencies' version prefix to '^' instead of '~'.
- *
- * @example
- * **Before**
- * ```json
- * dependencies: {
- *   "@angular/animations": "~13.1.0",
- *   "@angular/common": "~13.1.0"
- * }
- * ```
- *
- * **After**
- * ```json
- * dependencies: {
- *   "@angular/animations": "^13.1.0",
- *   "@angular/common": "^13.1.0"
- * }
- * ```
- */
-export default function (): Rule;

package/migrations/update-14/angular-packages-version-prefix.js

@@ -1,61 +0,0 @@
-"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 });
-const tasks_1 = require("@angular-devkit/schematics/tasks");
-const dependencies_1 = require("../../utility/dependencies");
-const json_file_1 = require("../../utility/json-file");
-const PACKAGES_REGEXP = /^@(?:angular|nguniversal|schematics|angular-devkit)\/|^ng-packagr$/;
-/**
- * This migrations updates Angular packages 'dependencies' and 'devDependencies' version prefix to '^' instead of '~'.
- *
- * @example
- * **Before**
- * ```json
- * dependencies: {
- *   "@angular/animations": "~13.1.0",
- *   "@angular/common": "~13.1.0"
- * }
- * ```
- *
- * **After**
- * ```json
- * dependencies: {
- *   "@angular/animations": "^13.1.0",
- *   "@angular/common": "^13.1.0"
- * }
- * ```
- */
-function default_1() {
-    return (tree, context) => {
-        const json = new json_file_1.JSONFile(tree, '/package.json');
-        updateVersionPrefixToTilde(json, dependencies_1.NodeDependencyType.Default);
-        updateVersionPrefixToTilde(json, dependencies_1.NodeDependencyType.Dev);
-        context.addTask(new tasks_1.NodePackageInstallTask());
-    };
-}
-exports.default = default_1;
-function updateVersionPrefixToTilde(json, dependencyType) {
-    const dependencyTypePath = [dependencyType];
-    const dependencies = json.get(dependencyTypePath);
-    if (!dependencies || typeof dependencies !== 'object') {
-        return;
-    }
-    const updatedDependencies = new Map();
-    for (const [name, version] of Object.entries(dependencies)) {
-        if (typeof version === 'string' && version.charAt(0) === '~' && PACKAGES_REGEXP.test(name)) {
-            updatedDependencies.set(name, `^${version.substring(1)}`);
-        }
-    }
-    if (updatedDependencies.size) {
-        json.modify(dependencyTypePath, {
-            ...dependencies,
-            ...Object.fromEntries(updatedDependencies),
-        });
-    }
-}

package/migrations/update-14/remove-default-project-option.js

@@ -1,17 +0,0 @@
-"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 });
-const workspace_1 = require("../../utility/workspace");
-/** Migration to remove 'defaultProject' option from angular.json. */
-function default_1() {
-    return (0, workspace_1.updateWorkspace)((workspace) => {
-        delete workspace.extensions['defaultProject'];
-    });
-}
-exports.default = default_1;

package/migrations/update-14/remove-show-circular-dependencies-option.d.ts

@@ -1,10 +0,0 @@
-/**
- * @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
- */
-import { Rule } from '@angular-devkit/schematics';
-/** Migration to remove 'showCircularDependencies' option from browser and server builders. */
-export default function (): Rule;

package/migrations/update-14/remove-show-circular-dependencies-option.js

@@ -1,26 +0,0 @@
-"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 });
-const workspace_1 = require("../../utility/workspace");
-/** Migration to remove 'showCircularDependencies' option from browser and server builders. */
-function default_1() {
-    return (0, workspace_1.updateWorkspace)((workspace) => {
-        for (const project of workspace.projects.values()) {
-            for (const target of project.targets.values()) {
-                if (target.builder === '@angular-devkit/build-angular:server' ||
-                    target.builder === '@angular-devkit/build-angular:browser') {
-                    for (const [, options] of (0, workspace_1.allTargetOptions)(target)) {
-                        delete options.showCircularDependencies;
-                    }
-                }
-            }
-        }
-    });
-}
-exports.default = default_1;

package/migrations/update-14/replace-default-collection-option.d.ts

@@ -1,10 +0,0 @@
-/**
- * @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
- */
-import { Rule } from '@angular-devkit/schematics';
-/** Migration to replace 'defaultCollection' option in angular.json. */
-export default function (): Rule;

package/migrations/update-14/replace-default-collection-option.js

@@ -1,32 +0,0 @@
-"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 });
-const core_1 = require("@angular-devkit/core");
-const workspace_1 = require("../../utility/workspace");
-/** Migration to replace 'defaultCollection' option in angular.json. */
-function default_1() {
-    return (0, workspace_1.updateWorkspace)((workspace) => {
-        // workspace level
-        replaceDefaultCollection(workspace.extensions['cli']);
-        // Project level
-        for (const project of workspace.projects.values()) {
-            replaceDefaultCollection(project.extensions['cli']);
-        }
-    });
-}
-exports.default = default_1;
-function replaceDefaultCollection(cliExtension) {
-    if (cliExtension && (0, core_1.isJsonObject)(cliExtension) && cliExtension['defaultCollection']) {
-        // If `schematicsCollection` defined `defaultCollection` is ignored hence no need to warn.
-        if (!cliExtension['schematicCollections']) {
-            cliExtension['schematicCollections'] = [cliExtension['defaultCollection']];
-        }
-        delete cliExtension['defaultCollection'];
-    }
-}

package/migrations/update-14/update-libraries-secondary-entrypoints.d.ts

@@ -1,10 +0,0 @@
-/**
- * @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
- */
-import { Rule } from '@angular-devkit/schematics';
-/** Migration to remove secondary entrypoints 'package.json' files and migrate ng-packagr configurations. */
-export default function (): Rule;

package/migrations/update-14/update-libraries-secondary-entrypoints.js

@@ -1,51 +0,0 @@
-"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 });
-const core_1 = require("@angular-devkit/core");
-const workspace_1 = require("../../utility/workspace");
-function* visitPackageJsonFiles(directory, includedInLookup = false) {
-    if (includedInLookup) {
-        for (const path of directory.subfiles) {
-            if (path !== 'package.json') {
-                continue;
-            }
-            yield (0, core_1.join)(directory.path, path);
-        }
-    }
-    for (const path of directory.subdirs) {
-        if (path === 'node_modules' || path.startsWith('.')) {
-            continue;
-        }
-        yield* visitPackageJsonFiles(directory.dir(path), true);
-    }
-}
-/** Migration to remove secondary entrypoints 'package.json' files and migrate ng-packagr configurations. */
-function default_1() {
-    return async (tree) => {
-        const workspace = await (0, workspace_1.getWorkspace)(tree);
-        for (const project of workspace.projects.values()) {
-            if (project.extensions['projectType'] !== 'library' ||
-                ![...project.targets.values()].some(({ builder }) => builder === '@angular-devkit/build-angular:ng-packagr')) {
-                // Project is not a library or doesn't use ng-packagr, skip.
-                continue;
-            }
-            for (const path of visitPackageJsonFiles(tree.getDir(project.root))) {
-                const json = tree.readJson(path);
-                if ((0, core_1.isJsonObject)(json) && json['ngPackage']) {
-                    // Migrate ng-packagr config to an ng-packagr config file.
-                    const configFilePath = (0, core_1.join)((0, core_1.dirname)((0, core_1.normalize)(path)), 'ng-package.json');
-                    tree.create(configFilePath, JSON.stringify(json['ngPackage'], undefined, 2));
-                }
-                // Delete package.json as it is no longer needed in APF 14.
-                tree.delete(path);
-            }
-        }
-    };
-}
-exports.default = default_1;

package/migrations/update-14/update-tsconfig-target.d.ts

@@ -1,10 +0,0 @@
-/**
- * @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
- */
-import { Rule } from '@angular-devkit/schematics';
-/** Migration to update tsconfig compilation target option to es2020. */
-export default function (): Rule;

package/migrations/update-14/update-tsconfig-target.js

@@ -1,51 +0,0 @@
-"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 });
-const json_file_1 = require("../../utility/json-file");
-const workspace_1 = require("../../utility/workspace");
-const workspace_models_1 = require("../../utility/workspace-models");
-/** Migration to update tsconfig compilation target option to es2020. */
-function default_1() {
-    return async (host) => {
-        var _a, _b;
-        /** Builders for which the migration will run. */
-        const supportedBuilders = [workspace_models_1.Builders.Karma, workspace_models_1.Builders.NgPackagr, workspace_models_1.Builders.Browser];
-        /** Compilation targets values that should not be amended. */
-        const skipTargets = ['es2020', 'es2021', 'es2022', 'esnext'];
-        const uniqueTsConfigs = new Set(['/tsconfig.json']);
-        // Find all tsconfig files which are refereced by the builders.
-        const workspace = await (0, workspace_1.getWorkspace)(host);
-        for (const project of workspace.projects.values()) {
-            for (const target of project.targets.values()) {
-                if (!supportedBuilders.includes(target.builder)) {
-                    // Unknown builder.
-                    continue;
-                }
-                // Update all other known CLI builders that use a tsconfig.
-                const allOptions = [(_a = target.options) !== null && _a !== void 0 ? _a : {}, ...Object.values((_b = target.configurations) !== null && _b !== void 0 ? _b : {})];
-                for (const opt of allOptions) {
-                    if (typeof (opt === null || opt === void 0 ? void 0 : opt.tsConfig) === 'string') {
-                        uniqueTsConfigs.add(opt.tsConfig);
-                    }
-                }
-            }
-        }
-        // Modify tsconfig files
-        const targetJsonPath = ['compilerOptions', 'target'];
-        for (const tsConfigPath of uniqueTsConfigs) {
-            const json = new json_file_1.JSONFile(host, tsConfigPath);
-            const target = json.get(targetJsonPath);
-            // Update compilation target when it's current set lower than es2020.
-            if (typeof target === 'string' && !skipTargets.includes(target.toLowerCase())) {
-                json.modify(targetJsonPath, 'es2020');
-            }
-        }
-    };
-}
-exports.default = default_1;