@angular-eslint/schematics 14.0.0-alpha.2 → 14.0.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.0.0](https://github.com/angular-eslint/angular-eslint/compare/v13.5.0...v14.0.0) (2022-06-23)
+
+### Features
+
+- update dependency eslint to v8.18.0 ([#1061](https://github.com/angular-eslint/angular-eslint/issues/1061)) ([6130377](https://github.com/angular-eslint/angular-eslint/commit/6130377ca9363a5a510093609031d9943755c63e))
+- update typescript-eslint packages to v5.28.0 ([#1045](https://github.com/angular-eslint/angular-eslint/issues/1045)) ([9e8c340](https://github.com/angular-eslint/angular-eslint/commit/9e8c3406de716d1d5e7f45e06b06700af3861f65))
+- update typescript-eslint packages to v5.29.0 ([#1063](https://github.com/angular-eslint/angular-eslint/issues/1063)) ([02856cb](https://github.com/angular-eslint/angular-eslint/commit/02856cbc6116491eaa634a3cbdcd38d6bffda64c))
+
 # [13.5.0](https://github.com/angular-eslint/angular-eslint/compare/v13.4.0...v13.5.0) (2022-06-12)
 
 **Note:** Version bump only for package @angular-eslint/schematics

package/dist/convert-tslint-to-eslint/index.js

@@ -58,14 +58,10 @@ E.g. npx ng g @angular-eslint/schematics:convert-tslint-to-eslint {{YOUR_PROJECT
                     tree.delete((0, core_1.join)((0, core_1.normalize)(tree.root.path), 'tslint.json'));
                     return (0, schematics_1.chain)([
                         /**
-                         * Update the default schematics collection to @angular-eslint so that future projects within
+                         * Update the schematicCollections to prefer @angular-eslint so that future projects within
                          * the same workspace will also use ESLint
                          */
-                        (0, utils_1.updateJsonInTree)((0, utils_1.getWorkspacePath)(tree), (json) => {
-                            json.cli = json.cli || {};
-                            json.cli.defaultCollection = '@angular-eslint/schematics';
-                            return json;
-                        }),
+                        (0, utils_1.updateJsonInTree)((0, utils_1.getWorkspacePath)(tree), (json) => (0, utils_1.updateSchematicCollections)(json)),
                         (0, utils_2.uninstallTSLintAndCodelyzer)(),
                     ]);
                 }

package/dist/migrations/update-14-0-0/update-14-0-0.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular-devkit/schematics");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const utils_1 = require("../../utils");
+const dependencies_1 = require("../utils/dependencies");
+const updatedTypeScriptESLintVersion = '5.29.0';
+const updatedESLintVersion = '8.18.0';
+function migration() {
+    return (0, schematics_1.chain)([
+        (0, dependencies_1.updateDependencies)([
+            {
+                packageName: '@typescript-eslint/eslint-plugin',
+                version: `^${updatedTypeScriptESLintVersion}`,
+            },
+            {
+                packageName: '@typescript-eslint/experimental-utils',
+                version: `^${updatedTypeScriptESLintVersion}`,
+            },
+            {
+                packageName: '@typescript-eslint/parser',
+                version: `^${updatedTypeScriptESLintVersion}`,
+            },
+            {
+                packageName: 'eslint',
+                version: `^${updatedESLintVersion}`,
+            },
+        ]),
+        (0, utils_1.updateJsonInTree)('angular.json', (json) => {
+            var _a;
+            // Migrate any workspaces which use the original defaultCollection (but only if set to `@angular-eslint/schematics`)
+            if (((_a = json.cli) === null || _a === void 0 ? void 0 : _a.defaultCollection) !== '@angular-eslint/schematics') {
+                return json;
+            }
+            return (0, utils_1.updateSchematicCollections)(json);
+        }),
+        // Migrate from @typescript-eslint/experimental-utils package name to @typescript-eslint/utils
+        (host, context) => (0, utils_1.updateJsonInTree)('package.json', (json) => {
+            var _a;
+            const devDep = (_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@typescript-eslint/experimental-utils'];
+            if (!devDep) {
+                return json;
+            }
+            json.devDependencies['@typescript-eslint/utils'] = devDep;
+            delete json.devDependencies['@typescript-eslint/experimental-utils'];
+            json.devDependencies = (0, utils_1.sortObjectByKeys)(json.devDependencies);
+            host.overwrite('package.json', JSON.stringify(json, null, 2));
+            context.addTask(new tasks_1.NodePackageInstallTask());
+            return json;
+        }),
+    ]);
+}
+exports.default = migration;

package/dist/migrations.json

@@ -25,6 +25,11 @@
       "version": "13.0.0-alpha.0",
       "description": "Updates @angular-eslint to v13",
       "factory": "./migrations/update-13-0-0/update-13-0-0"
+    },
+    "update-14-0-0": {
+      "version": "14.0.0-alpha.0",
+      "description": "Updates @angular-eslint to v14",
+      "factory": "./migrations/update-14-0-0/update-14-0-0"
     }
   }
 }

package/dist/ng-add/index.js

@@ -41,7 +41,7 @@ function addAngularESLintPackages() {
         /**
          * @typescript-eslint packages
          */
-        const typescriptESLintVersion = packageJSON.devDependencies['@typescript-eslint/experimental-utils'];
+        const typescriptESLintVersion = packageJSON.devDependencies['@typescript-eslint/utils'];
         json.devDependencies['@typescript-eslint/eslint-plugin'] =
             typescriptESLintVersion;
         json.devDependencies['@typescript-eslint/parser'] = typescriptESLintVersion;
@@ -67,18 +67,14 @@ function applyESLintConfigIfSingleProjectWithNoExistingTSLint() {
          * then there will be an angular.json file with a projects object, but no projects
          * within it.
          *
-         * In this case we should still configure the root eslint config and set the default
-         * collection to use in angular.json.
+         * In this case we should still configure the root eslint config and set the
+         * schematicCollections to use in angular.json.
          */
         const projectNames = Object.keys(angularJson.projects);
         if (projectNames.length === 0) {
             return (0, schematics_1.chain)([
                 (0, utils_1.updateJsonInTree)('.eslintrc.json', () => (0, utils_1.createRootESLintConfig)(null, false)),
-                (0, utils_1.updateJsonInTree)('angular.json', (json) => {
-                    json.cli = json.cli || {};
-                    json.cli.defaultCollection = '@angular-eslint/schematics';
-                    return json;
-                }),
+                (0, utils_1.updateJsonInTree)('angular.json', (json) => (0, utils_1.updateSchematicCollections)(json)),
             ]);
         }
         /**
@@ -106,11 +102,7 @@ Please see https://github.com/angular-eslint/angular-eslint for more information
 `.trimStart());
         return (0, schematics_1.chain)([
             (0, schematics_1.schematic)('add-eslint-to-project', {}),
-            (0, utils_1.updateJsonInTree)('angular.json', (json) => {
-                json.cli = json.cli || {};
-                json.cli.defaultCollection = '@angular-eslint/schematics';
-                return json;
-            }),
+            (0, utils_1.updateJsonInTree)('angular.json', (json) => (0, utils_1.updateSchematicCollections)(json)),
         ]);
     };
 }

package/dist/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.determineTargetProjectHasE2E = exports.determineTargetProjectName = exports.sortObjectByKeys = exports.removeTSLintJSONForProject = exports.createESLintConfigForProject = exports.createRootESLintConfig = exports.setESLintProjectBasedOnProjectType = exports.visitNotIgnoredFiles = exports.addESLintTargetToProject = exports.updateWorkspaceInTree = exports.offsetFromRoot = exports.getProjectConfig = exports.isTSLintUsedInWorkspace = exports.getTargetsConfigFromProject = exports.getWorkspacePath = exports.updateJsonInTree = exports.readJsonInTree = void 0;
+exports.updateSchematicCollections = exports.determineTargetProjectHasE2E = exports.determineTargetProjectName = exports.sortObjectByKeys = exports.removeTSLintJSONForProject = exports.createESLintConfigForProject = exports.createRootESLintConfig = exports.setESLintProjectBasedOnProjectType = exports.visitNotIgnoredFiles = exports.addESLintTargetToProject = exports.updateWorkspaceInTree = exports.offsetFromRoot = exports.getProjectConfig = exports.isTSLintUsedInWorkspace = exports.getTargetsConfigFromProject = exports.getWorkspacePath = exports.updateJsonInTree = exports.readJsonInTree = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ignore_1 = __importDefault(require("ignore"));
@@ -357,3 +357,18 @@ angularJSON, projectName) {
     return !!((_a = getTargetsConfigFromProject(angularJSON.projects[projectName])) === null || _a === void 0 ? void 0 : _a.e2e);
 }
 exports.determineTargetProjectHasE2E = determineTargetProjectHasE2E;
+/**
+ * See `schematicCollections` docs here:
+ * https://github.com/angular/angular-cli/blob/8431b3f0769b5f95b9e13807a09293d820c4b017/docs/specifications/schematic-collections-config.md
+ */
+function updateSchematicCollections(angularJson) {
+    angularJson.cli = angularJson.cli || {};
+    angularJson.cli.schematicCollections =
+        angularJson.cli.schematicCollections || [];
+    // The first matching schematic will be used, so we unshift rather than push
+    angularJson.cli.schematicCollections.unshift('@angular-eslint/schematics');
+    // Delete old defaultCollection property if applicable
+    delete angularJson.cli.defaultCollection;
+    return angularJson;
+}
+exports.updateSchematicCollections = updateSchematicCollections;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "14.0.0-alpha.2",
+  "version": "14.0.0",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -33,20 +33,20 @@
     "save": "devDependencies"
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "14.0.0-alpha.2",
-    "@angular-eslint/eslint-plugin-template": "14.0.0-alpha.2",
+    "@angular-eslint/eslint-plugin": "14.0.0",
+    "@angular-eslint/eslint-plugin-template": "14.0.0",
     "ignore": "5.2.0",
     "strip-json-comments": "3.1.1",
     "tmp": "0.2.1"
   },
   "devDependencies": {
     "@types/tmp": "0.2.3",
-    "@typescript-eslint/experimental-utils": "5.27.1",
-    "eslint": "8.17.0",
+    "@typescript-eslint/utils": "5.29.0",
+    "eslint": "8.18.0",
     "tslint-to-eslint-config": "2.4.0"
   },
   "peerDependencies": {
     "@angular/cli": ">= 14.0.0 < 15.0.0"
   },
-  "gitHead": "67044dd79280a779a0d5614350f5fa0308399148"
+  "gitHead": "676699f28a4ecaf41f8c65418d0bdc9c973714aa"
 }