@nrwl/nx-plugin 14.2.0-beta.5 → 14.2.0-rc.2

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [14.2.0-beta.5](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-beta.5) (2022-06-02)
+# [14.2.0-rc.2](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-rc.2) (2022-06-03)
 
 **Note:** Version bump only for package @nrwl/nx-plugin

package/generators.json

@@ -28,6 +28,11 @@
       "factory": "./src/generators/executor/executor",
       "schema": "./src/generators/executor/schema.json",
       "description": "Create a executor for an Nx Plugin."
+    },
+    "plugin-lint-checks": {
+      "factory": "./src/generators/lint-checks/generator",
+      "schema": "./src/generators/lint-checks/schema.json",
+      "description": "Adds linting configuration to validate common json files for nx plugins."
     }
   },
   "schematics": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/nx-plugin",
-  "version": "14.2.0-beta.5",
+  "version": "14.2.0-rc.2",
   "description": "Plugin for creating plugins for Nx :)",
   "repository": {
     "type": "git",
@@ -27,14 +27,15 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/devkit": "14.2.0-beta.5",
-    "@nrwl/jest": "14.2.0-beta.5",
-    "@nrwl/js": "14.2.0-beta.5",
-    "@nrwl/linter": "14.2.0-beta.5",
+    "@nrwl/devkit": "14.2.0-rc.2",
+    "@nrwl/jest": "14.2.0-rc.2",
+    "@nrwl/js": "14.2.0-rc.2",
+    "@nrwl/linter": "14.2.0-rc.2",
     "fs-extra": "^10.1.0",
     "rxjs": "^6.5.4",
+    "semver": "7.3.4",
     "tslib": "^2.3.0"
   },
   "typings": "./index.d.ts",
-  "gitHead": "914f0ce707740743d2ca4ff08685bd5c574405da"
+  "gitHead": "26177d15af643cb85d6c94530b02c7b3c29bbf98"
 }

package/src/generators/lint-checks/generator.d.ts

@@ -0,0 +1,7 @@
+import { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
+import { Schema as EsLintExecutorOptions } from '@nrwl/linter/src/executors/eslint/schema';
+import { PluginLintChecksGeneratorSchema } from './schema';
+import { PackageJson } from 'nx/src/utils/package-json';
+export default function pluginLintCheckGenerator(host: Tree, options: PluginLintChecksGeneratorSchema): Promise<() => import("@nrwl/devkit").GeneratorCallback>;
+export declare function addMigrationJsonChecks(host: Tree, options: PluginLintChecksGeneratorSchema, packageJson: PackageJson): void;
+export declare function getEsLintOptions(project: ProjectConfiguration): [target: string, configuration: TargetConfiguration<EsLintExecutorOptions>];

package/src/generators/lint-checks/generator.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEsLintOptions = exports.addMigrationJsonChecks = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../utils/versions");
+const logger_1 = require("nx/src/utils/logger");
+const package_json_1 = require("nx/src/utils/package-json");
+function pluginLintCheckGenerator(host, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+        const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
+        // This rule is eslint **only**
+        if (projectIsEsLintEnabled(project)) {
+            updateRootEslintConfig(host);
+            updateProjectEslintConfig(host, project, packageJson);
+            updateProjectTarget(host, options, packageJson);
+            // Project is setup for vscode
+            if (host.exists('.vscode')) {
+                setupVsCodeLintingForJsonFiles(host);
+            }
+            // Project contains migrations.json
+            const migrationsPath = (0, package_json_1.readNxMigrateConfig)(packageJson).migrations;
+            if (migrationsPath &&
+                host.exists((0, devkit_1.joinPathFragments)(project.root, migrationsPath))) {
+                addMigrationJsonChecks(host, options, packageJson);
+            }
+        }
+        else {
+            devkit_1.logger.error(`${logger_1.NX_PREFIX} plugin lint checks can only be added to plugins which use eslint for linting`);
+        }
+        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, { 'jsonc-eslint-parser': versions_1.jsoncEslintParserVersion });
+        return () => installTask;
+    });
+}
+exports.default = pluginLintCheckGenerator;
+function addMigrationJsonChecks(host, options, packageJson) {
+    var _a, _b;
+    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+    const [eslintTarget, eslintTargetConfiguration] = getEsLintOptions(projectConfiguration);
+    const relativeMigrationsJsonPath = (0, package_json_1.readNxMigrateConfig)(packageJson).migrations;
+    if (!relativeMigrationsJsonPath) {
+        return;
+    }
+    const migrationsJsonPath = (0, devkit_1.joinPathFragments)(projectConfiguration.root, relativeMigrationsJsonPath);
+    if (eslintTarget &&
+        !((_b = (_a = eslintTargetConfiguration.options) === null || _a === void 0 ? void 0 : _a.lintFilePatterns) === null || _b === void 0 ? void 0 : _b.includes(migrationsJsonPath))) {
+        // Add to lintFilePatterns
+        eslintTargetConfiguration.options.lintFilePatterns.push(migrationsJsonPath);
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
+        // Update project level eslintrc
+        (0, devkit_1.updateJson)(host, `${projectConfiguration.root}/.eslintrc.json`, (c) => {
+            const override = c.overrides.find((o) => { var _a, _b; return (_b = Object.keys((_a = o.rules) !== null && _a !== void 0 ? _a : {})) === null || _b === void 0 ? void 0 : _b.includes('@nrwl/nx/nx-plugin-checks'); });
+            if (Array.isArray(override === null || override === void 0 ? void 0 : override.files) &&
+                !override.files.includes(relativeMigrationsJsonPath)) {
+                override.files.push(relativeMigrationsJsonPath);
+            }
+            return c;
+        });
+    }
+}
+exports.addMigrationJsonChecks = addMigrationJsonChecks;
+function updateProjectTarget(host, options, packageJson) {
+    var _a, _b;
+    const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
+    if (!project.targets) {
+        return;
+    }
+    for (const [target, configuration] of Object.entries(project.targets)) {
+        if (configuration.executor === '@nrwl/linter:eslint') {
+            const opts = (_a = configuration.options) !== null && _a !== void 0 ? _a : {};
+            (_b = opts.lintFilePatterns) !== null && _b !== void 0 ? _b : (opts.lintFilePatterns = []);
+            if (packageJson.generators) {
+                opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.generators));
+            }
+            if (packageJson.schematics &&
+                packageJson.schematics !== packageJson.generators) {
+                opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.schematics));
+            }
+            if (packageJson.executors) {
+                opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.executors));
+            }
+            if (packageJson.builders &&
+                packageJson.builders !== packageJson.executors) {
+                opts.lintFilePatterns.push((0, devkit_1.joinPathFragments)(project.root, packageJson.builders));
+            }
+            opts.lintFilePatterns.push(`${project.root}/package.json`);
+            opts.lintFilePatterns = [...new Set(opts.lintFilePatterns)];
+            project.targets[target].options = opts;
+        }
+    }
+    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
+}
+function updateProjectEslintConfig(host, options, packageJson) {
+    var _a;
+    // Update the project level lint configuration to specify
+    // the plugin schema rule for generated files
+    const eslintPath = `${options.root}/.eslintrc.json`;
+    const eslintConfig = (0, devkit_1.readJson)(host, eslintPath);
+    (_a = eslintConfig.overrides) !== null && _a !== void 0 ? _a : (eslintConfig.overrides = []);
+    if (!eslintConfig.overrides.some((x) => { var _a; return Object.keys((_a = x.rules) !== null && _a !== void 0 ? _a : {}).includes('@nrwl/nx/nx-plugin-checks'); })) {
+        eslintConfig.overrides.push({
+            files: [
+                './package.json',
+                packageJson.generators,
+                packageJson.executors,
+                packageJson.schematics,
+                packageJson.builders,
+            ].filter((f) => !!f),
+            parser: 'jsonc-eslint-parser',
+            rules: {
+                '@nrwl/nx/nx-plugin-checks': 'error',
+            },
+        });
+    }
+    (0, devkit_1.writeJson)(host, eslintPath, eslintConfig);
+}
+// Update the root eslint to specify a parser for json files
+// This is required, otherwise every json file that is not overriden
+// will display false errors in the IDE
+function updateRootEslintConfig(host) {
+    var _a;
+    const rootESLint = (0, devkit_1.readJson)(host, '.eslintrc.json');
+    (_a = rootESLint.overrides) !== null && _a !== void 0 ? _a : (rootESLint.overrides = []);
+    if (!eslintConfigContainsJsonOverride(rootESLint)) {
+        rootESLint.overrides.push({
+            files: '*.json',
+            parser: 'jsonc-eslint-parser',
+            rules: {},
+        });
+        (0, devkit_1.writeJson)(host, '.eslintrc.json', rootESLint);
+    }
+}
+function setupVsCodeLintingForJsonFiles(host) {
+    var _a;
+    let existing = {};
+    if (host.exists('.vscode/settings.json')) {
+        existing = (0, devkit_1.readJson)(host, '.vscode/settings.json');
+    }
+    else {
+        devkit_1.logger.info(`${logger_1.NX_PREFIX} We've updated the vscode settings for this repository to ensure that plugin lint checks show up inside your IDE. This created .vscode/settings.json. To read more about this file, check vscode's documentation. It is frequently not commited, so other developers may need to add similar settings if they'd like to see the lint checks in the IDE rather than only during linting.`);
+    }
+    // setup eslint validation for json files
+    const eslintValidate = (_a = existing['eslint.validate']) !== null && _a !== void 0 ? _a : [];
+    if (!eslintValidate.includes('json')) {
+        existing['eslint.validate'] = [...eslintValidate, 'json'];
+    }
+    (0, devkit_1.writeJson)(host, '.vscode/settings.json', existing);
+}
+function eslintConfigContainsJsonOverride(eslintConfig) {
+    return eslintConfig.overrides.some((x) => {
+        if (typeof x.files === 'string' && x.files.includes('.json')) {
+            return true;
+        }
+        return Array.isArray(x.files) && x.files.some((f) => f.includes('.json'));
+    });
+}
+function projectIsEsLintEnabled(project) {
+    return !!getEsLintOptions(project);
+}
+function getEsLintOptions(project) {
+    return Object.entries(project.targets || {}).find(([, x]) => x.executor === '@nrwl/linter:eslint');
+}
+exports.getEsLintOptions = getEsLintOptions;
+//# sourceMappingURL=generator.js.map

package/src/generators/lint-checks/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/lint-checks/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/lint-checks/schema.d.ts

@@ -0,0 +1,3 @@
+export interface PluginLintChecksGeneratorSchema {
+  projectName: string;
+}

package/src/generators/lint-checks/schema.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "PluginLint",
+  "title": "",
+  "type": "object",
+  "description": "Adds linting configuration to validate common json files for nx plugins.",
+  "properties": {
+    "projectName": {
+      "type": "string",
+      "description": "Which project should be the configuration be added to?",
+      "$default": {
+        "$source": "projectName"
+      }
+    }
+  },
+  "required": ["projectName"]
+}

package/src/generators/migration/migration.js

@@ -4,6 +4,7 @@ exports.migrationSchematic = exports.migrationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const path = require("path");
+const generator_1 = require("../lint-checks/generator");
 function normalizeOptions(host, options) {
     var _a;
     let name;
@@ -94,6 +95,10 @@ function migrationGenerator(host, schema) {
         updateWorkspaceJson(host, options);
         updateMigrationsJson(host, options);
         updatePackageJson(host, options);
+        if (!host.exists('migrations.json')) {
+            const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
+            (0, generator_1.addMigrationJsonChecks)(host, { projectName: schema.project }, (0, devkit_1.readJson)(host, packageJsonPath));
+        }
     });
 }
 exports.migrationGenerator = migrationGenerator;

package/src/generators/migration/migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/migration/migration.ts"],"names":[],"mappings":"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"}

package/src/generators/plugin/plugin.js

@@ -4,6 +4,7 @@ exports.pluginSchematic = exports.pluginGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const js_1 = require("@nrwl/js");
+const linter_1 = require("@nrwl/linter");
 const add_swc_dependencies_1 = require("@nrwl/js/src/utils/swc/add-swc-dependencies");
 const versions_1 = require("nx/src/utils/versions");
 const path = require("path");
@@ -11,26 +12,8 @@ const versions_2 = require("../../utils/versions");
 const e2e_1 = require("../e2e-project/e2e");
 const executor_1 = require("../executor/executor");
 const generator_1 = require("../generator/generator");
-function normalizeOptions(host, options) {
-    const { npmScope, libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const projectDirectory = options.directory
-        ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
-        : name;
-    const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
-    const fileName = projectName;
-    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const npmPackageName = options.importPath || resolvePackageName(npmScope, name);
-    return Object.assign(Object.assign({}, options), { fileName,
-        npmScope,
-        libsDir, name: projectName, projectRoot,
-        projectDirectory,
-        parsedTags,
-        npmPackageName });
-}
+const generator_2 = require("../lint-checks/generator");
+const normalize_schema_1 = require("./utils/normalize-schema");
 function addFiles(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         host.delete((0, devkit_1.normalizePath)(`${options.projectRoot}/src/lib`));
@@ -83,8 +66,8 @@ function updateWorkspaceJson(host, options) {
 function pluginGenerator(host, schema) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(host, schema);
-        const libraryTask = yield (0, js_1.libraryGenerator)(host, Object.assign(Object.assign({}, schema), { config: options.standaloneConfig !== false ? 'project' : 'workspace', buildable: true, importPath: options.npmPackageName }));
+        const options = (0, normalize_schema_1.normalizeOptions)(host, schema);
+        yield (0, js_1.libraryGenerator)(host, Object.assign(Object.assign({}, schema), { config: options.standaloneConfig !== false ? 'project' : 'workspace', buildable: true, importPath: options.npmPackageName }));
         (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
             '@nrwl/devkit': versions_2.nxVersion,
             '@nrwl/jest': versions_2.nxVersion,
@@ -104,19 +87,14 @@ function pluginGenerator(host, schema) {
             npmPackageName: options.npmPackageName,
             standaloneConfig: (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : true,
         });
+        if (options.linter === linter_1.Linter.EsLint && !options.skipLintChecks) {
+            yield (0, generator_2.default)(host, { projectName: options.name });
+        }
         yield (0, devkit_1.formatFiles)(host);
         return () => (0, devkit_1.installPackagesTask)(host);
     });
 }
 exports.pluginGenerator = pluginGenerator;
-function resolvePackageName(npmScope, name) {
-    if (npmScope && npmScope !== '') {
-        return `@${npmScope}/${name}`;
-    }
-    else {
-        return name;
-    }
-}
 exports.default = pluginGenerator;
 exports.pluginSchematic = (0, devkit_1.convertNxGenerator)(pluginGenerator);
 //# sourceMappingURL=plugin.js.map

package/src/generators/plugin/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":"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"}

package/src/generators/plugin/schema.d.ts

@@ -6,6 +6,7 @@ export interface Schema {
   importPath?: string;
   skipTsConfig: boolean;
   skipFormat: boolean;
+  skipLintChecks: boolean;
   tags?: string;
   unitTestRunner: 'jest' | 'none';
   linter: Linter;

package/src/generators/plugin/schema.json

@@ -34,7 +34,8 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "tslint"],
-      "default": "eslint"
+      "default": "eslint",
+      "x-deprecated": "TSLint support is deprecated and will be removed"
     },
     "unitTestRunner": {
       "type": "string",
@@ -57,6 +58,11 @@
       "default": false,
       "description": "Do not update tsconfig.json for development experience."
     },
+    "skipLintChecks": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not eslint configuration for plugin json files."
+    },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
       "type": "boolean"

package/src/generators/plugin/utils/normalize-schema.d.ts

@@ -0,0 +1,13 @@
+import { Tree } from '@nrwl/devkit';
+import { Schema } from '../schema';
+export interface NormalizedSchema extends Schema {
+    name: string;
+    fileName: string;
+    libsDir: string;
+    projectRoot: string;
+    projectDirectory: string;
+    parsedTags: string[];
+    npmScope: string;
+    npmPackageName: string;
+}
+export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;

package/src/generators/plugin/utils/normalize-schema.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function normalizeOptions(host, options) {
+    const { npmScope, libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
+    const name = (0, devkit_1.names)(options.name).fileName;
+    const projectDirectory = options.directory
+        ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
+        : name;
+    const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
+    const fileName = projectName;
+    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    const npmPackageName = options.importPath || resolvePackageName(npmScope, name);
+    return Object.assign(Object.assign({}, options), { fileName,
+        npmScope,
+        libsDir, name: projectName, projectRoot,
+        projectDirectory,
+        parsedTags,
+        npmPackageName });
+}
+exports.normalizeOptions = normalizeOptions;
+function resolvePackageName(npmScope, name) {
+    if (npmScope && npmScope !== '') {
+        return `@${npmScope}/${name}`;
+    }
+    else {
+        return name;
+    }
+}
+//# sourceMappingURL=normalize-schema.js.map

package/src/generators/plugin/utils/normalize-schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAatB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;IAEf,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,WAAW,CAAC;IAC7B,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,cAAc,GAClB,OAAO,CAAC,UAAU,IAAI,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAE3D,uCACK,OAAO,KACV,QAAQ;QACR,QAAQ;QACR,OAAO,EACP,IAAI,EAAE,WAAW,EACjB,WAAW;QACX,gBAAgB;QAChB,UAAU;QACV,cAAc,IACd;AACJ,CAAC;AAhCD,4CAgCC;AAED,SAAS,kBAAkB,CAAC,QAAgB,EAAE,IAAY;IACxD,IAAI,QAAQ,IAAI,QAAQ,KAAK,EAAE,EAAE;QAC/B,OAAO,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;KAC/B;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC"}

package/src/utils/versions.d.ts

@@ -1 +1,2 @@
 export declare const nxVersion: any;
+export declare const jsoncEslintParserVersion = "^2.1.0";

package/src/utils/versions.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
+exports.jsoncEslintParserVersion = '^2.1.0';
 //# sourceMappingURL=versions.js.map

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAClD,QAAA,wBAAwB,GAAG,QAAQ,CAAC"}