@nx/plugin 23.0.0-beta.16 → 23.0.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "23.0.0-beta.16",
+  "version": "23.0.0-beta.17",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-beta.16",
-    "@nx/jest": "23.0.0-beta.16",
-    "@nx/js": "23.0.0-beta.16",
-    "@nx/eslint": "23.0.0-beta.16"
+    "@nx/devkit": "23.0.0-beta.17",
+    "@nx/jest": "23.0.0-beta.17",
+    "@nx/js": "23.0.0-beta.17",
+    "@nx/eslint": "23.0.0-beta.17"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.16"
+    "nx": "23.0.0-beta.17"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,5 +1,5 @@
 import { ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
-import type { Schema as EsLintExecutorOptions } from '@nx/eslint/src/executors/lint/schema';
+import type { Schema as EsLintExecutorOptions } from '@nx/eslint/internal';
 import { PluginLintChecksGeneratorSchema } from './schema';
 import { PackageJson } from 'nx/src/utils/package-json';
 export default function pluginLintCheckGenerator(host: Tree, options: PluginLintChecksGeneratorSchema): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/lint-checks/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,oBAAoB,EAGpB,mBAAmB,EACnB,IAAI,EAIL,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAE5F,OAAO,EAAE,+BAA+B,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAuB,MAAM,2BAA2B,CAAC;AAU7E,wBAA8B,wBAAwB,CACpD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,+BAA+B,iBA2BzC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,+BAA+B,EACxC,WAAW,EAAE,WAAW,QAyDzB;AAmLD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,oBAAoB,GAC5B,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAO7E"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/lint-checks/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,oBAAoB,EAGpB,mBAAmB,EACnB,IAAI,EAIL,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE3E,OAAO,EAAE,+BAA+B,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAuB,MAAM,2BAA2B,CAAC;AAU7E,wBAA8B,wBAAwB,CACpD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,+BAA+B,iBA2BzC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,+BAA+B,EACxC,WAAW,EAAE,WAAW,QAyDzB;AAmLD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,oBAAoB,GAC5B,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAO7E"}

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

@@ -6,8 +6,7 @@ exports.getEsLintOptions = getEsLintOptions;
 const devkit_1 = require("@nx/devkit");
 const logger_1 = require("nx/src/utils/logger");
 const package_json_1 = require("nx/src/utils/package-json");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
+const internal_1 = require("@nx/eslint/internal");
 async function pluginLintCheckGenerator(host, options) {
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
@@ -49,7 +48,7 @@ function addMigrationJsonChecks(host, options, packageJson) {
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
     }
     // Update project level eslintrc
-    (0, eslint_file_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => Object.keys(o.rules ?? {})?.includes('@nx/nx-plugin-checks') ||
+    (0, internal_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => Object.keys(o.rules ?? {})?.includes('@nx/nx-plugin-checks') ||
         Object.keys(o.rules ?? {})?.includes('@nrwl/nx/nx-plugin-checks'), (o) => {
         const fileSet = new Set(Array.isArray(o.files) ? o.files : [o.files]);
         fileSet.add(relativeMigrationsJsonPath);
@@ -60,7 +59,7 @@ function addMigrationJsonChecks(host, options, packageJson) {
     });
 }
 function formatFilesEntries(tree, files) {
-    if (!(0, flat_config_1.useFlatConfig)(tree)) {
+    if (!(0, internal_1.useFlatConfig)(tree)) {
         return files;
     }
     const filesAfter = files.map((f) => {
@@ -102,7 +101,7 @@ function updateProjectTarget(host, options, packageJson) {
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
 }
 function updateProjectEslintConfig(host, options, packageJson) {
-    if ((0, eslint_file_1.isEslintConfigSupported)(host, options.root)) {
+    if ((0, internal_1.isEslintConfigSupported)(host, options.root)) {
         const lookup = (o) => Object.keys(o.rules ?? {}).includes('@nx/nx-plugin-checks') ||
             Object.keys(o.rules ?? {}).includes('@nrwl/nx/nx-plugin-checks');
         const files = [
@@ -113,12 +112,12 @@ function updateProjectEslintConfig(host, options, packageJson) {
             packageJson.builders,
             (0, package_json_1.readNxMigrateConfig)(packageJson).migrations,
         ].filter((f) => !!f);
-        const parser = (0, flat_config_1.useFlatConfig)(host)
+        const parser = (0, internal_1.useFlatConfig)(host)
             ? { languageOptions: { parser: 'jsonc-eslint-parser' } }
             : { parser: 'jsonc-eslint-parser' };
-        if ((0, eslint_file_1.lintConfigHasOverride)(host, options.root, lookup)) {
+        if ((0, internal_1.lintConfigHasOverride)(host, options.root, lookup)) {
             // update it
-            (0, eslint_file_1.updateOverrideInLintConfig)(host, options.root, lookup, (o) => ({
+            (0, internal_1.updateOverrideInLintConfig)(host, options.root, lookup, (o) => ({
                 ...o,
                 files: formatFilesEntries(host, [
                     ...new Set([
@@ -135,7 +134,7 @@ function updateProjectEslintConfig(host, options, packageJson) {
         }
         else {
             // add it
-            (0, eslint_file_1.addOverrideToLintConfig)(host, options.root, {
+            (0, internal_1.addOverrideToLintConfig)(host, options.root, {
                 files: formatFilesEntries(host, files),
                 ...parser,
                 rules: {
@@ -149,11 +148,11 @@ function updateProjectEslintConfig(host, options, packageJson) {
 // This is required, otherwise every json file that is not overriden
 // will display false errors in the IDE
 function updateRootEslintConfig(host) {
-    if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-        if (!(0, eslint_file_1.lintConfigHasOverride)(host, '', (o) => Array.isArray(o.files)
+    if ((0, internal_1.isEslintConfigSupported)(host)) {
+        if (!(0, internal_1.lintConfigHasOverride)(host, '', (o) => Array.isArray(o.files)
             ? o.files.some((f) => f.match(/\.json$/))
             : !!o.files?.match(/\.json$/), true)) {
-            (0, eslint_file_1.addOverrideToLintConfig)(host, '', {
+            (0, internal_1.addOverrideToLintConfig)(host, '', {
                 files: '*.json',
                 parser: 'jsonc-eslint-parser',
                 rules: {},
@@ -187,7 +186,7 @@ function setupVsCodeLintingForJsonFiles(host) {
     (0, devkit_1.writeJson)(host, '.vscode/settings.json', existing);
 }
 function projectIsEsLintEnabled(tree, project) {
-    return !!(0, eslint_file_1.findEslintFile)(tree, project.root);
+    return !!(0, internal_1.findEslintFile)(tree, project.root);
 }
 function getEsLintOptions(project) {
     return Object.entries(project.targets || {}).find(([, x]) => x.executor === '@nx/eslint:lint' ||