@skyux-sdk/eslint-config 8.2.2 → 8.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux-sdk/eslint-config",
-  "version": "8.2.2",
+  "version": "8.2.4",
   "author": "Blackbaud, Inc.",
   "description": "Angular CLI schematics to implement recommended ESLint configuration",
   "keywords": [
@@ -31,7 +31,9 @@
     "eslint-plugin-deprecation": "^1.4.1"
   },
   "dependencies": {
-    "comment-json": "4.2.3"
+    "comment-json": "4.2.3",
+    "fs-extra": "10.1.0",
+    "package-json": "8.1.0"
   },
   "main": "./src/index.js",
   "types": "./src/index.d.ts"

package/recommended.json

@@ -1,5 +1,10 @@
 {
   "reportUnusedDisableDirectives": true,
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": ["tsconfig.json"],
+    "tsconfigRootDir": "."
+  },
   "extends": [
     "eslint:recommended",
     "plugin:@angular-eslint/recommended",

package/src/schematics/migrations/migration-collection.json

@@ -1,7 +1,7 @@
 {
   "schematics": {
     "noop": {
-      "version": "8.2.2",
+      "version": "8.2.4",
       "factory": "./noop/noop.schematic",
       "description": "Update ESLint dependencies"
     }

package/src/schematics/ng-add/ng-add.schematic.js

@@ -1,18 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
 const install_dependencies_1 = require("../shared/rules/install-dependencies");
 const modify_eslint_config_1 = require("../shared/rules/modify-eslint-config");
 const tree_1 = require("../shared/utility/tree");
+function getPackageJson(tree) {
+    return JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
+}
+function hardenPackageVersion() {
+    return async (tree) => {
+        const thisPackageJson = await (0, fs_extra_1.readJson)((0, path_1.resolve)(__dirname, '../../../package.json'));
+        const packageJson = getPackageJson(tree);
+        packageJson.devDependencies ||= {};
+        packageJson.devDependencies[thisPackageJson.name] = thisPackageJson.version;
+        tree.overwrite('/package.json', JSON.stringify(packageJson, undefined, 2));
+    };
+}
 function ngAdd() {
     return (tree) => {
-        const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
+        const packageJson = getPackageJson(tree);
         if (!packageJson.devDependencies?.['@angular-eslint/schematics']) {
             throw new Error("The package '@angular-eslint/schematics' is not installed. " +
                 "Run 'ng add @angular-eslint/schematics' and try this command again.\n" +
                 'See: https://github.com/angular-eslint/angular-eslint#quick-start');
         }
-        return (0, schematics_1.chain)([(0, install_dependencies_1.installDependencies)(), (0, modify_eslint_config_1.modifyEsLintConfig)()]);
+        return (0, schematics_1.chain)([
+            (0, install_dependencies_1.installDependencies)(),
+            (0, modify_eslint_config_1.modifyEsLintConfig)(),
+            hardenPackageVersion(),
+        ]);
     };
 }
 exports.default = ngAdd;

package/src/schematics/ng-add/ng-add.schematic.js.map

@@ -1 +1 @@
-{"version":3,"file":"ng-add.schematic.js","sourceRoot":"","sources":["../../../../../../../libs/sdk/eslint-config/src/schematics/ng-add/ng-add.schematic.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AAEzD,+EAA2E;AAC3E,+EAA0E;AAE1E,iDAA0D;AAE1D,SAAwB,KAAK;IAC3B,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CACzB,CAAC;QAEjB,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,4BAA4B,CAAC,EAAE;YAChE,MAAM,IAAI,KAAK,CACb,6DAA6D;gBAC3D,uEAAuE;gBACvE,mEAAmE,CACtE,CAAC;SACH;QAED,OAAO,IAAA,kBAAK,EAAC,CAAC,IAAA,0CAAmB,GAAE,EAAE,IAAA,yCAAkB,GAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC;AACJ,CAAC;AAhBD,wBAgBC"}
+{"version":3,"file":"ng-add.schematic.js","sourceRoot":"","sources":["../../../../../../../libs/sdk/eslint-config/src/schematics/ng-add/ng-add.schematic.ts"],"names":[],"mappings":";;AAAA,2DAA+D;AAE/D,uCAAoC;AACpC,+BAA+B;AAE/B,+EAA2E;AAC3E,+EAA0E;AAE1E,iDAA0D;AAE1D,SAAS,cAAc,CAAC,IAAU;IAChC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAgB,CAAC;AAC5E,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,eAAe,GAAG,MAAM,IAAA,mBAAQ,EACpC,IAAA,cAAO,EAAC,SAAS,EAAE,uBAAuB,CAAC,CAC5C,CAAC;QAEF,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACzC,WAAW,CAAC,eAAe,KAAK,EAAE,CAAC;QACnC,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC;QAE5E,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC;AACJ,CAAC;AAED,SAAwB,KAAK;IAC3B,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,4BAA4B,CAAC,EAAE;YAChE,MAAM,IAAI,KAAK,CACb,6DAA6D;gBAC3D,uEAAuE;gBACvE,mEAAmE,CACtE,CAAC;SACH;QAED,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,0CAAmB,GAAE;YACrB,IAAA,yCAAkB,GAAE;YACpB,oBAAoB,EAAE;SACvB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAlBD,wBAkBC"}

package/src/schematics/shared/rules/install-dependencies.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.installDependencies = void 0;
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const get_latest_version_1 = require("../utility/get-latest-version");
 function installDependencies() {
-    return (tree, context) => {
+    return async (tree, context) => {
         context.addTask(new tasks_1.NodePackageInstallTask());
         const packages = {
-            'eslint-plugin-deprecation': '^1.4.1',
+            'eslint-plugin-deprecation': await (0, get_latest_version_1.getLatestVersion)('eslint-plugin-deprecation', '^1.4.1'),
         };
         for (const [packageName, version] of Object.entries(packages)) {
             (0, dependencies_1.addPackageJsonDependency)(tree, {

package/src/schematics/shared/rules/install-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"install-dependencies.js","sourceRoot":"","sources":["../../../../../../../../libs/sdk/eslint-config/src/schematics/shared/rules/install-dependencies.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAC1E,2EAGkD;AAElD,SAAgB,mBAAmB;IACjC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAE9C,MAAM,QAAQ,GAA2B;YACvC,2BAA2B,EAAE,QAAQ;SACtC,CAAC;QAEF,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC7D,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,iCAAkB,CAAC,GAAG;gBAC5B,OAAO;gBACP,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAjBD,kDAiBC"}
+{"version":3,"file":"install-dependencies.js","sourceRoot":"","sources":["../../../../../../../../libs/sdk/eslint-config/src/schematics/shared/rules/install-dependencies.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAC1E,2EAGkD;AAElD,sEAAiE;AAEjE,SAAgB,mBAAmB;IACjC,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAE9C,MAAM,QAAQ,GAA2B;YACvC,2BAA2B,EAAE,MAAM,IAAA,qCAAgB,EACjD,2BAA2B,EAC3B,QAAQ,CACT;SACF,CAAC;QAEF,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC7D,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,iCAAkB,CAAC,GAAG;gBAC5B,OAAO;gBACP,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AApBD,kDAoBC"}

package/src/schematics/shared/rules/modify-eslint-config.js

@@ -9,12 +9,6 @@ function modifyEsLintConfig() {
     return async (tree) => {
         const esLintConfig = (0, tree_1.readJsonFile)(tree, ESLINT_CONFIG_PATH);
         if (Array.isArray(esLintConfig.overrides)) {
-            // Setup type-checking for ESLint.
-            esLintConfig.parser = '@typescript-eslint/parser';
-            esLintConfig.parserOptions = {
-                project: ['tsconfig.json'],
-                tsconfigRootDir: '.',
-            };
             // Overwrite the 'extends' array with our configuration.
             for (const override of esLintConfig.overrides) {
                 if (override.files.find((f) => f.endsWith('.ts'))) {

package/src/schematics/shared/rules/modify-eslint-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"modify-eslint-config.js","sourceRoot":"","sources":["../../../../../../../../libs/sdk/eslint-config/src/schematics/shared/rules/modify-eslint-config.ts"],"names":[],"mappings":";;;AAGA,0CAA+C;AAC/C,0CAAgD;AAEhD,MAAM,kBAAkB,GAAG,sCAAsC,CAAC;AAClE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAE5C,SAAgB,kBAAkB;IAChC,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,YAAY,GAAG,IAAA,mBAAY,EAAe,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAE1E,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;YACzC,kCAAkC;YAClC,YAAY,CAAC,MAAM,GAAG,2BAA2B,CAAC;YAClD,YAAY,CAAC,aAAa,GAAG;gBAC3B,OAAO,EAAE,CAAC,eAAe,CAAC;gBAC1B,eAAe,EAAE,GAAG;aACrB,CAAC;YAEF,wDAAwD;YACxD,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,SAAS,EAAE;gBAC7C,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;oBACjD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAE3D,QAAQ,CAAC,OAAO,GAAG,CAAC,kBAAkB,CAAC,CAAC;oBAExC,IAAI,WAAW,EAAE;wBACf,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;qBACnC;iBACF;aACF;SACF;QAED,IAAA,oBAAa,EAAC,IAAI,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;IACxD,CAAC,CAAC;AACJ,CAAC;AA5BD,gDA4BC"}
+{"version":3,"file":"modify-eslint-config.js","sourceRoot":"","sources":["../../../../../../../../libs/sdk/eslint-config/src/schematics/shared/rules/modify-eslint-config.ts"],"names":[],"mappings":";;;AAGA,0CAA+C;AAC/C,0CAAgD;AAEhD,MAAM,kBAAkB,GAAG,sCAAsC,CAAC;AAClE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAE5C,SAAgB,kBAAkB;IAChC,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,YAAY,GAAG,IAAA,mBAAY,EAAe,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAE1E,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;YACzC,wDAAwD;YACxD,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,SAAS,EAAE;gBAC7C,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;oBACjD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAE3D,QAAQ,CAAC,OAAO,GAAG,CAAC,kBAAkB,CAAC,CAAC;oBAExC,IAAI,WAAW,EAAE;wBACf,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;qBACnC;iBACF;aACF;SACF;QAED,IAAA,oBAAa,EAAC,IAAI,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;IACxD,CAAC,CAAC;AACJ,CAAC;AArBD,gDAqBC"}

package/src/schematics/shared/types/eslint-config.d.ts

@@ -1,14 +1,14 @@
 export interface EsLintConfig {
     extends?: string | string[];
-    parser?: string;
-    parserOptions?: {
-        project: string[];
-        tsconfigRootDir: string;
-    };
     overrides?: [
         {
             extends?: string | string[];
             files: string[];
+            parser?: string;
+            parserOptions?: {
+                project: string[];
+                tsconfigRootDir: string;
+            };
         }
     ];
 }

package/src/schematics/shared/utility/get-latest-version.d.ts

@@ -0,0 +1 @@
+export declare function getLatestVersion(packageName: string, versionRange: string): Promise<string>;

package/src/schematics/shared/utility/get-latest-version.js

@@ -0,0 +1,35 @@
+"use strict";
+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.getLatestVersion = void 0;
+async function getLatestVersion(packageName, versionRange) {
+    const packageJson = (await Promise.resolve().then(() => __importStar(require('package-json')))).default;
+    const result = (await packageJson(packageName, {
+        version: versionRange,
+    }));
+    return result.version;
+}
+exports.getLatestVersion = getLatestVersion;
+//# sourceMappingURL=get-latest-version.js.map

package/src/schematics/shared/utility/get-latest-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-latest-version.js","sourceRoot":"","sources":["../../../../../../../../libs/sdk/eslint-config/src/schematics/shared/utility/get-latest-version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAO,KAAK,UAAU,gBAAgB,CACpC,WAAmB,EACnB,YAAoB;IAEpB,MAAM,WAAW,GAAG,CAAC,wDAAa,cAAc,GAAC,CAAC,CAAC,OAAO,CAAC;IAE3D,MAAM,MAAM,GAAG,CAAC,MAAM,WAAW,CAAC,WAAW,EAAE;QAC7C,OAAO,EAAE,YAAY;KACtB,CAAC,CAAmC,CAAC;IAEtC,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC;AAXD,4CAWC"}