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

package/dist/src/generators/application/application.js

@@ -118,7 +118,7 @@ async function applicationGeneratorInternal(tree, schema) {
         await (0, internal_2.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
     }
     updateTsConfigOptions(tree, options);
-    if (options.linter === 'eslint') {
+    if (options.linter !== 'none') {
         const lintTask = await (0, lib_1.addLintingToApplication)(tree, options);
         tasks.push(lintTask);
     }

package/dist/src/generators/application/lib/add-linting.js

@@ -2,20 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingToApplication = addLintingToApplication;
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
 const internal_1 = require("@nx/eslint/internal");
+const internal_2 = require("@nx/js/internal");
 async function addLintingToApplication(tree, options) {
-    const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
+    return (0, internal_2.addLintingToProject)(tree, {
         linter: options.linter,
         project: options.name,
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
         ],
         unitTestRunner: options.unitTestRunner,
-        skipFormat: true,
         enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
         rootProject: options.rootProject,
         addPlugin: options.addPlugin,
     });
-    return lintTask;
 }

package/dist/src/generators/application/lib/normalize-options.js

@@ -36,7 +36,7 @@ async function normalizeOptions(host, options) {
         appProjectRoot,
         importPath,
         parsedTags,
-        linter: options.linter ?? 'eslint',
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         unitTestRunner: options.unitTestRunner ?? 'jest',
         rootProject: options.rootProject ?? false,
         port: options.port ?? 3000,

package/dist/src/generators/application/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;
@@ -7,7 +7,7 @@ export interface Schema {
   skipPackageJson?: boolean;
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'jest' | 'none';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   formatter?: 'none' | 'prettier';
   tags?: string;
   frontendProject?: string;

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

@@ -34,11 +34,9 @@
       "x-priority": "internal"
     },
     "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": ["eslint", "none"],
-      "default": "none",
-      "x-prompt": "Which linter would you like to use?",
+      "enum": ["eslint", "oxlint", "none"],
       "x-priority": "important"
     },
     "unitTestRunner": {

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

@@ -6,11 +6,11 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
-const internal_2 = require("@nx/eslint/internal");
+const internal_2 = require("@nx/js/internal");
+const internal_3 = require("@nx/eslint/internal");
 const path = tslib_1.__importStar(require("path"));
 const versions_1 = require("../../utils/versions");
-const internal_3 = require("@nx/jest/internal");
-const internal_4 = require("@nx/js/internal");
+const internal_4 = require("@nx/jest/internal");
 const posix_1 = require("node:path/posix");
 async function e2eProjectGenerator(host, options) {
     return await e2eProjectGeneratorInternal(host, {
@@ -24,7 +24,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
     const options = await normalizeOptions(host, _options);
     const appProject = (0, devkit_1.readProjectConfiguration)(host, options.project);
     // Detect Jest 30+ to use .cts config files (CommonJS TypeScript)
-    const jestMajorVersion = (0, internal_3.getInstalledJestMajorVersion)(host);
+    const jestMajorVersion = (0, internal_4.getInstalledJestMajorVersion)(host);
     const useCommonJsConfig = jestMajorVersion === null || jestMajorVersion >= 30;
     const jestConfigExt = useCommonJsConfig ? 'cts' : 'ts';
     // TODO(@ndcunningham): This is broken.. the outputs are wrong.. and this isn't using the jest generator
@@ -98,7 +98,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
             };
         });
     }
-    const jestPreset = (0, internal_3.findRootJestPreset)(host) ?? 'jest.preset.js';
+    const jestPreset = (0, internal_4.findRootJestPreset)(host) ?? 'jest.preset.js';
     const tsConfigFile = options.isUsingTsSolutionConfig
         ? 'tsconfig.json'
         : 'tsconfig.spec.json';
@@ -146,7 +146,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
         host.rename(jestConfigPath, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'jest.config.cts'));
     }
     if (options.isUsingTsSolutionConfig) {
-        (0, internal_4.addSwcTestConfig)(host, options.e2eProjectRoot, 'es6');
+        (0, internal_2.addSwcTestConfig)(host, options.e2eProjectRoot, 'es6');
         (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/ts-solution'), options.e2eProjectRoot, {
             ...options,
             relativeProjectReferencePath: (0, posix_1.relative)(options.e2eProjectRoot, appProject.root),
@@ -164,6 +164,19 @@ async function e2eProjectGeneratorInternal(host, _options) {
     // axios is more than likely used in the application code, so install it as a regular dependency.
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, { axios: versions_1.axiosVersion }, {});
     tasks.push(installTask);
+    if (options.linter &&
+        options.linter !== 'eslint' &&
+        options.linter !== 'none') {
+        tasks.push(await (0, internal_2.addLintingToProject)(host, {
+            linter: options.linter,
+            project: options.e2eProjectName,
+            rootProject: options.rootProject,
+            addPlugin: options.addPlugin,
+            // The generated e2e specs are Jest; this is what enables the linter's
+            // Jest rules.
+            unitTestRunner: 'jest',
+        }));
+    }
     if (options.linter === 'eslint') {
         const linterTask = await (0, eslint_1.lintProjectGenerator)(host, {
             project: options.e2eProjectName,
@@ -178,11 +191,11 @@ async function e2eProjectGeneratorInternal(host, _options) {
             addPlugin: options.addPlugin,
         });
         tasks.push(linterTask);
-        if (options.rootProject && (0, internal_2.isEslintConfigSupported)(host)) {
-            (0, internal_2.addPluginsToLintConfig)(host, options.e2eProjectRoot, '@nx');
-            (0, internal_2.replaceOverridesInLintConfig)(host, options.e2eProjectRoot, [
-                internal_2.typeScriptOverride,
-                internal_2.javaScriptOverride,
+        if (options.rootProject && (0, internal_3.isEslintConfigSupported)(host)) {
+            (0, internal_3.addPluginsToLintConfig)(host, options.e2eProjectRoot, '@nx');
+            (0, internal_3.replaceOverridesInLintConfig)(host, options.e2eProjectRoot, [
+                internal_3.typeScriptOverride,
+                internal_3.javaScriptOverride,
             ]);
         }
     }
@@ -199,7 +212,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        await (0, internal_4.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -223,10 +236,13 @@ async function normalizeOptions(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
-    const isUsingTsSolutionConfig = (0, internal_4.isUsingTsSolutionSetup)(tree);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(tree);
     return {
         addPlugin,
         ...options,
+        // Both arms below test for a concrete linter, so an unresolved `undefined`
+        // would fall through them and leave the e2e project with no linter at all.
+        linter: await (0, internal_2.normalizeLinterOption)(tree, options.linter),
         e2eProjectRoot,
         e2eProjectName,
         importPath,

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

@@ -4,7 +4,7 @@ export interface Schema {
   directory?: string;
   name?: string;
   port?: number;
-  linter?: 'eslint' | 'none';
+  linter?: 'eslint' | 'oxlint' | 'none';
   rootProject?: boolean;
   isNest?: boolean;
   skipFormat?: boolean;

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

@@ -9,7 +9,10 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "$default": { "$source": "argv", "index": 0 },
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
       "x-dropdown": "project",
       "x-prompt": "What project is this for?"
     },
@@ -34,10 +37,9 @@
       "default": 3000
     },
     "linter": {
-      "description": "Linter to be used for the E2E project",
+      "description": "Linter to be used for the E2E project. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "isNest": {
       "description": "Is the E2E server project nest",

package/dist/src/generators/library/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;
@@ -8,7 +8,7 @@ export interface Schema {
   skipFormat?: boolean;
   tags?: string;
   unitTestRunner?: 'jest' | 'none';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   buildable?: boolean;
   publishable?: boolean;
   importPath?: string;

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

@@ -34,11 +34,9 @@
       "default": false
     },
     "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": ["eslint", "none"],
-      "default": "none",
-      "x-prompt": "Which linter would you like to use?",
+      "enum": ["eslint", "oxlint", "none"],
       "x-priority": "important"
     },
     "unitTestRunner": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.7",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -73,15 +73,15 @@
     "semver": "^7.6.3",
     "tcp-port-used": "^1.0.2",
     "kill-port": "^1.6.1",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/jest": "23.2.0-beta.6",
-    "@nx/js": "23.2.0-beta.6",
-    "@nx/eslint": "23.2.0-beta.6",
-    "@nx/docker": "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",
+    "@nx/docker": "23.2.0-beta.7"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.6",
-    "@nx/webpack": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.7",
+    "@nx/webpack": "23.2.0-beta.7"
   },
   "peerDependencies": {
     "express": ">=4.0.0 <6.0.0",