@nx/plugin 23.2.0-beta.6 → 23.2.0-beta.7

package/dist/src/generators/create-package/create-package.js

@@ -52,7 +52,9 @@ async function addPresetGenerator(host, schema) {
             path: (0, path_1.join)(projectRoot, 'src/generators/preset/generator'),
             unitTestRunner: schema.unitTestRunner,
             skipFormat: true,
-            skipLintChecks: schema.linter === 'none',
+            // Lint checks are an ESLint-only feature; asking for them under any other
+            // linter makes `pluginLintCheckGenerator` log an error and do nothing.
+            skipLintChecks: schema.linter !== 'eslint',
         });
     }
     return (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))?.name;

package/dist/src/generators/create-package/schema.d.ts

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface CreatePackageSchema {
   name: string;
@@ -9,7 +9,7 @@ export interface CreatePackageSchema {
   skipFormat?: boolean;
   tags?: string;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   compiler?: 'swc' | 'tsc';
 
   // options to create e2e project, passed to e2e project generator

package/dist/src/generators/create-package/schema.json

@@ -37,9 +37,9 @@
       "description": "Test runner to use for unit tests."
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["none", "eslint"]
+      "enum": ["none", "eslint", "oxlint"]
     },
     "tags": {
       "type": "string",

package/dist/src/generators/create-package/utils/normalize-schema.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
-import type { LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import { CreatePackageSchema } from '../schema';
 export interface NormalizedSchema extends CreatePackageSchema {
     bundler: 'swc' | 'tsc';

package/dist/src/generators/e2e-project/e2e.js

@@ -4,7 +4,6 @@ exports.e2eProjectGenerator = e2eProjectGenerator;
 exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
 const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
 const internal_2 = require("@nx/js/internal");
@@ -219,18 +218,16 @@ export { default as teardown } from './stop-local-registry';
     return vitestTask;
 }
 async function addLintingToApplication(tree, options) {
-    const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
+    return (0, internal_2.addLintingToProject)(tree, {
         linter: options.linter,
         project: options.projectName,
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
         ],
         unitTestRunner: options.testRunner ?? 'jest',
-        skipFormat: true,
         enableTypedLinting: false,
         addPlugin: options.addPlugin,
     });
-    return lintTask;
 }
 function updatePluginPackageJson(tree, options) {
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.pluginName);

package/dist/src/generators/e2e-project/schema.d.ts

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface Schema {
   pluginName: string;
@@ -7,7 +7,7 @@ export interface Schema {
   pluginOutputPath?: string;
   jestConfig?: string;
   testRunner?: 'jest' | 'vitest';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   skipFormat?: boolean;
   rootProject?: boolean;
   useProjectJson?: boolean;

package/dist/src/generators/e2e-project/schema.json

@@ -37,9 +37,9 @@
       "default": "jest"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["none", "eslint"]
+      "enum": ["none", "eslint", "oxlint"]
     },
     "minimal": {
       "type": "boolean",

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface Schema {
   directory: string;
@@ -11,7 +11,7 @@ export interface Schema {
   e2eProjectDirectory?: string;
   tags?: string;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   enableTypedLinting?: boolean;
   /**
    * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.

package/dist/src/generators/plugin/schema.json

@@ -32,9 +32,9 @@
       "x-priority": "important"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["none", "eslint"],
+      "enum": ["none", "eslint", "oxlint"],
       "x-priority": "important"
     },
     "unitTestRunner": {

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

@@ -1,5 +1,5 @@
 import { type Tree } from '@nx/devkit';
-import type { LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { Schema } from '../schema';
 export interface NormalizedSchema extends Schema {
     projectName: string;

package/dist/src/generators/preset/generator.js

@@ -5,6 +5,7 @@ exports.presetGeneratorInternal = presetGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const create_package_1 = require("../create-package/create-package");
 const plugin_1 = require("../plugin/plugin");
+const internal_1 = require("@nx/js/internal");
 async function presetGenerator(tree, rawOptions) {
     return await presetGeneratorInternal(tree, {
         addPlugin: false,
@@ -14,10 +15,10 @@ async function presetGenerator(tree, rawOptions) {
 }
 async function presetGeneratorInternal(tree, rawOptions) {
     const tasks = [];
-    const options = normalizeOptions(rawOptions);
+    const options = await normalizeOptions(tree, rawOptions);
     const pluginTask = await (0, plugin_1.pluginGenerator)(tree, {
         compiler: 'tsc',
-        linter: 'eslint',
+        linter: options.linter,
         skipFormat: true,
         unitTestRunner: 'jest',
         importPath: options.pluginName,
@@ -42,7 +43,7 @@ async function presetGeneratorInternal(tree, rawOptions) {
             project: options.pluginName,
             skipFormat: true,
             unitTestRunner: 'jest',
-            linter: 'eslint',
+            linter: options.linter,
             compiler: 'tsc',
             useProjectJson: options.useProjectJson,
             addPlugin: options.addPlugin,
@@ -62,7 +63,7 @@ function moveNxPluginToDevDeps(tree) {
         return json;
     });
 }
-function normalizeOptions(options) {
+async function normalizeOptions(tree, options) {
     return {
         ...options,
         pluginName: (0, devkit_1.names)(options.pluginName.includes('/')
@@ -71,6 +72,9 @@ function normalizeOptions(options) {
         createPackageName: options.createPackageName === 'false' // for command line in e2e, it is passed as a string
             ? undefined
             : options.createPackageName,
+        // Resolved once here rather than left to the two child generators, which
+        // each prompt on their own and would ask the same question twice.
+        linter: await (0, internal_1.normalizeLinterOption)(tree, options.linter),
     };
 }
 exports.default = presetGenerator;

package/dist/src/generators/preset/schema.d.ts

@@ -1,11 +1,15 @@
+import type { LinterType } from '@nx/js';
+
 export interface PresetGeneratorSchema {
   pluginName: string;
   createPackageName?: string;
   useProjectJson?: boolean;
   addPlugin?: boolean;
+  linter?: LinterType;
 }
 
 export interface NormalizedPresetGeneratorOptions
   extends PresetGeneratorSchema {
   createPackageName: string;
+  linter: LinterType;
 }

package/dist/src/generators/preset/schema.json

@@ -25,6 +25,11 @@
       "type": "string",
       "description": "Name of package which creates a workspace"
     },
+    "linter": {
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
+      "type": "string",
+      "enum": ["none", "eslint", "oxlint"]
+    },
     "useProjectJson": {
       "type": "boolean",
       "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.7",
   "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": {
@@ -36,16 +36,16 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/jest": "23.2.0-beta.6",
-    "@nx/eslint": "23.2.0-beta.6",
-    "@nx/js": "23.2.0-beta.6"
+    "@nx/devkit": "23.2.0-beta.7",
+    "@nx/jest": "23.2.0-beta.7",
+    "@nx/js": "23.2.0-beta.7",
+    "@nx/eslint": "23.2.0-beta.7"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.7"
   },
   "peerDependencies": {
-    "@nx/vitest": "23.2.0-beta.6"
+    "@nx/vitest": "23.2.0-beta.7"
   },
   "peerDependenciesMeta": {
     "@nx/vitest": {