@nx/js 23.2.0-beta.6 → 23.2.0-beta.8

package/dist/internal.d.ts

@@ -21,6 +21,8 @@ export { getProjectPackageManagerWorkspaceState, getProjectPackageManagerWorkspa
 export { findNpmDependencies } from './src/utils/find-npm-dependencies';
 export { addBuildAndWatchDepsTargets, isValidPackageJsonBuildConfig, } from './src/plugins/typescript/util';
 export { normalizeLinterOption, normalizeUnitTestRunnerOption, } from './src/utils/generator-prompts';
+export { detectLinters } from './src/utils/linter';
+export { addLintingToProject, type AddLintingToProjectOptions, } from './src/utils/add-linting-to-project';
 export { createGlobPatternsForDependencies } from './src/utils/generate-globs';
 export { getImportPath } from './src/utils/get-import-path';
 export { stripGlobToBaseDir } from './src/utils/strip-glob-to-base-dir';

package/dist/internal.js

@@ -5,8 +5,8 @@
 // internal consumers and may change without semver protection. Consider it
 // the @nx/js equivalent of `@nx/devkit/internal`.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addLocalRegistryScripts = exports.stripGlobToBaseDir = exports.getImportPath = exports.createGlobPatternsForDependencies = exports.normalizeUnitTestRunnerOption = exports.normalizeLinterOption = exports.isValidPackageJsonBuildConfig = exports.addBuildAndWatchDepsTargets = exports.findNpmDependencies = exports.getProjectPackageManagerWorkspaceStateWarningTask = exports.getProjectPackageManagerWorkspaceState = exports.getNpmScope = exports.sortPackageJsonFields = exports.CopyAssetsHandler = exports.addSwcRegisterDependencies = exports.addSwcDependencies = exports.addSwcTestConfig = exports.addSwcConfig = exports.createTmpTsConfig = exports.computeCompilerOptionsPaths = exports.calculateProjectDependencies = exports.calculateProjectBuildableDependencies = exports.compileTypeScript = exports.getNeededCompilerOptionOverrides = exports.isTypescriptVersionAtLeast = exports.getTsConfigModuleResolution = exports.getRangeMinimum = exports.ensureTypescript = exports.createTreeParseConfigHost = exports.getTsConfigBaseOptions = exports.updateTsconfigFiles = exports.shouldConfigureTsSolutionSetup = exports.isUsingTsSolutionSetup = exports.getProjectType = exports.getProjectSourceRoot = exports.getDefinedCustomConditionName = exports.findRuntimeTsConfigName = exports.assertNotUsingTsSolutionSetup = exports.addProjectToTsSolutionWorkspace = exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = exports.isEsmProject = exports.walkTsconfigExtendsChain = exports.findProjectsNpmDependencies = exports.isBuiltinModuleImport = exports.TargetProjectLocator = exports.requireWithTsconfigFallback = exports.registerTsConfigPaths = exports.registerTsProject = exports.loadTsFile = exports.forceRegisterEsmLoader = void 0;
-exports.typesNodeVersion = exports.tsLibVersion = exports.swcNodeVersion = exports.swcHelpersVersion = exports.swcCoreVersion = exports.swcCliVersion = exports.prettierVersion = exports.esbuildVersion = exports.nxVersion = exports.releaseTasks = exports.addReleaseConfigForTsSolution = exports.addReleaseConfigForNonTsSolution = void 0;
+exports.getImportPath = exports.createGlobPatternsForDependencies = exports.addLintingToProject = exports.detectLinters = exports.normalizeUnitTestRunnerOption = exports.normalizeLinterOption = exports.isValidPackageJsonBuildConfig = exports.addBuildAndWatchDepsTargets = exports.findNpmDependencies = exports.getProjectPackageManagerWorkspaceStateWarningTask = exports.getProjectPackageManagerWorkspaceState = exports.getNpmScope = exports.sortPackageJsonFields = exports.CopyAssetsHandler = exports.addSwcRegisterDependencies = exports.addSwcDependencies = exports.addSwcTestConfig = exports.addSwcConfig = exports.createTmpTsConfig = exports.computeCompilerOptionsPaths = exports.calculateProjectDependencies = exports.calculateProjectBuildableDependencies = exports.compileTypeScript = exports.getNeededCompilerOptionOverrides = exports.isTypescriptVersionAtLeast = exports.getTsConfigModuleResolution = exports.getRangeMinimum = exports.ensureTypescript = exports.createTreeParseConfigHost = exports.getTsConfigBaseOptions = exports.updateTsconfigFiles = exports.shouldConfigureTsSolutionSetup = exports.isUsingTsSolutionSetup = exports.getProjectType = exports.getProjectSourceRoot = exports.getDefinedCustomConditionName = exports.findRuntimeTsConfigName = exports.assertNotUsingTsSolutionSetup = exports.addProjectToTsSolutionWorkspace = exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = exports.isEsmProject = exports.walkTsconfigExtendsChain = exports.findProjectsNpmDependencies = exports.isBuiltinModuleImport = exports.TargetProjectLocator = exports.requireWithTsconfigFallback = exports.registerTsConfigPaths = exports.registerTsProject = exports.loadTsFile = exports.forceRegisterEsmLoader = void 0;
+exports.typesNodeVersion = exports.tsLibVersion = exports.swcNodeVersion = exports.swcHelpersVersion = exports.swcCoreVersion = exports.swcCliVersion = exports.prettierVersion = exports.esbuildVersion = exports.nxVersion = exports.releaseTasks = exports.addReleaseConfigForTsSolution = exports.addReleaseConfigForNonTsSolution = exports.addLocalRegistryScripts = exports.stripGlobToBaseDir = void 0;
 // Re-exports of nx-source internals.
 var internal_1 = require("@nx/devkit/internal");
 Object.defineProperty(exports, "forceRegisterEsmLoader", { enumerable: true, get: function () { return internal_1.forceRegisterEsmLoader; } });
@@ -89,6 +89,10 @@ Object.defineProperty(exports, "isValidPackageJsonBuildConfig", { enumerable: tr
 var generator_prompts_1 = require("./src/utils/generator-prompts");
 Object.defineProperty(exports, "normalizeLinterOption", { enumerable: true, get: function () { return generator_prompts_1.normalizeLinterOption; } });
 Object.defineProperty(exports, "normalizeUnitTestRunnerOption", { enumerable: true, get: function () { return generator_prompts_1.normalizeUnitTestRunnerOption; } });
+var linter_1 = require("./src/utils/linter");
+Object.defineProperty(exports, "detectLinters", { enumerable: true, get: function () { return linter_1.detectLinters; } });
+var add_linting_to_project_1 = require("./src/utils/add-linting-to-project");
+Object.defineProperty(exports, "addLintingToProject", { enumerable: true, get: function () { return add_linting_to_project_1.addLintingToProject; } });
 var generate_globs_1 = require("./src/utils/generate-globs");
 Object.defineProperty(exports, "createGlobPatternsForDependencies", { enumerable: true, get: function () { return generate_globs_1.createGlobPatternsForDependencies; } });
 var get_import_path_1 = require("./src/utils/get-import-path");

package/dist/src/executors/copy-workspace-modules/copy-workspace-modules.js

@@ -6,7 +6,6 @@ const internal_1 = require("@nx/devkit/internal");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const internal_2 = require("@nx/devkit/internal");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function copyWorkspaceModules(schema, context) {
     devkit_1.logger.log('Copying Workspace Modules to Build Directory...');
@@ -21,7 +20,7 @@ function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
     if (!packageJson.dependencies) {
         return;
     }
-    const workspaceModules = (0, internal_2.getWorkspacePackagesFromGraph)(projectGraph);
+    const workspaceModules = (0, internal_1.getWorkspacePackagesFromGraph)(projectGraph);
     const processedModules = new Set();
     const workspaceModulesDir = (0, path_1.join)(outputDirectory, 'workspace_modules');
     function calculateRelativePath(fromPkgName, toPkgName) {

package/dist/src/executors/node/node.impl.js

@@ -6,16 +6,12 @@ const internal_1 = require("@nx/devkit/internal");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const devkit_1 = require("@nx/devkit");
-const internal_2 = require("@nx/devkit/internal");
 const crypto_1 = require("crypto");
 const path = tslib_1.__importStar(require("path"));
 const path_1 = require("path");
 const buildable_libs_utils_1 = require("../../utils/buildable-libs-utils");
-const internal_3 = require("@nx/devkit/internal");
 const line_aware_writer_1 = require("./lib/line-aware-writer");
 const coalescing_debounce_1 = require("./lib/coalescing-debounce");
-const internal_4 = require("@nx/devkit/internal");
-const internal_5 = require("@nx/devkit/internal");
 const detect_module_format_1 = require("./lib/detect-module-format");
 const output_file_1 = require("./lib/output-file");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
@@ -175,7 +171,7 @@ async function* nodeExecutor(options, context) {
                         // Windows cannot deliver graceful signals through this API, so
                         // skip the grace period and force-kill immediately (matching the
                         // previous taskkill /F behavior).
-                        await (0, internal_3.killProcessTreeGraceful)(task.childProcess.pid, signal, process.platform === 'win32' ? 0 : undefined);
+                        await (0, internal_1.killProcessTreeGraceful)(task.childProcess.pid, signal, process.platform === 'win32' ? 0 : undefined);
                     }
                     if (task.id === globalLineAwareWriter.currentProcessId) {
                         globalLineAwareWriter.setActiveProcess(null);
@@ -237,7 +233,7 @@ async function* nodeExecutor(options, context) {
                 await debouncedProcessQueue.trigger();
             };
             if ((0, devkit_1.isDaemonEnabled)()) {
-                additionalExitHandler = await internal_2.daemonClient.registerFileWatcher({
+                additionalExitHandler = await internal_1.daemonClient.registerFileWatcher({
                     watchProjects: [context.projectName],
                     includeDependencies: true,
                 }, async (err, data) => {
@@ -279,9 +275,12 @@ async function* nodeExecutor(options, context) {
             }, context);
             while (true) {
                 const event = await output.next();
+                if (event.done) {
+                    break;
+                }
                 await addToQueue(null, Promise.resolve(event.value));
                 await debouncedProcessQueue.trigger();
-                if (event.done && !options.watch) {
+                if (!options.watch) {
                     break;
                 }
             }
@@ -337,7 +336,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
         // {workspaceRoot}/dist/{projectRoot} -> dist/my-app
         const outputPath = project.data.targets[buildOptions.target]?.outputs?.[0];
         if (outputPath) {
-            const outputFilePath = (0, internal_5.interpolate)(outputPath, {
+            const outputFilePath = (0, internal_1.interpolate)(outputPath, {
                 projectName: project.name,
                 projectRoot: project.data.root,
                 workspaceRoot: context.root,
@@ -366,12 +365,12 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
     return (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
 }
 function fileToRunCorrectPath(fileToRun) {
-    if ((0, internal_4.fileExists)(fileToRun))
+    if ((0, internal_1.fileExists)(fileToRun))
         return fileToRun;
     const extensionsToTry = ['.cjs', '.mjs', '.cjs.js', '.esm.js'];
     for (const ext of extensionsToTry) {
         const file = fileToRun.replace(/\.js$/, ext);
-        if ((0, internal_4.fileExists)(file))
+        if ((0, internal_1.fileExists)(file))
             return file;
     }
     throw new Error(`Could not find ${fileToRun}. Make sure your build succeeded.`);

package/dist/src/executors/prune-lockfile/prune-lockfile.js

@@ -6,9 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const internal_2 = require("@nx/devkit/internal");
-const internal_3 = require("@nx/devkit/internal");
-const internal_4 = require("@nx/devkit/internal");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function pruneLockfileExecutor(schema, context) {
     devkit_1.logger.log('Pruning lockfile...');
@@ -33,9 +30,9 @@ async function pruneLockfileExecutor(schema, context) {
 }
 function createPrunedLockfile(packageJson, graph) {
     const packageManager = (0, devkit_1.detectPackageManager)(devkit_1.workspaceRoot);
-    const lockfileName = (0, internal_3.getLockFileName)(packageManager);
-    const lockFile = (0, internal_3.createLockFile)(packageJson, graph, packageManager);
-    const workspacePackages = (0, internal_4.getWorkspacePackagesFromGraph)(graph);
+    const lockfileName = (0, internal_1.getLockFileName)(packageManager);
+    const lockFile = (0, internal_1.createLockFile)(packageJson, graph, packageManager);
+    const workspacePackages = (0, internal_1.getWorkspacePackagesFromGraph)(graph);
     for (const [pkgName, pkgVersion] of Object.entries(packageJson.dependencies ?? {})) {
         if (pkgVersion.startsWith('workspace:') ||
             pkgVersion.startsWith('file:') ||
@@ -125,7 +122,7 @@ function getOutputDir(schema, context) {
     if (!maybeOutputPath) {
         throw new Error(`Could not infer an output directory from the '${schema.buildTarget}' target. Please provide 'outputPath'.`);
     }
-    maybeOutputPath = (0, internal_2.interpolate)(maybeOutputPath, {
+    maybeOutputPath = (0, internal_1.interpolate)(maybeOutputPath, {
         workspaceRoot: devkit_1.workspaceRoot,
         projectRoot: project.root,
         projectName: project.name,

package/dist/src/executors/verdaccio/verdaccio.impl.js

@@ -7,7 +7,6 @@ const internal_1 = require("@nx/devkit/internal");
 const child_process_1 = require("child_process");
 const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const node_fs_1 = require("node:fs");
-const internal_2 = require("@nx/devkit/internal");
 const path_1 = require("path");
 const semver_1 = require("semver");
 let childProcess;
@@ -68,7 +67,7 @@ async function verdaccioExecutor(options, context) {
     };
 }
 function getVerdaccioBinPath() {
-    const { packageJson, path: packageJsonPath } = (0, internal_2.readModulePackageJson)('verdaccio');
+    const { packageJson, path: packageJsonPath } = (0, internal_1.readModulePackageJson)('verdaccio');
     const bin = typeof packageJson.bin === 'string'
         ? packageJson.bin
         : packageJson.bin['verdaccio'];

package/dist/src/generators/library/library.js

@@ -7,6 +7,7 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const add_linting_to_project_1 = require("../../utils/add-linting-to-project");
 const assert_supported_typescript_version_1 = require("../../utils/assert-supported-typescript-version");
 const generator_prompts_1 = require("../../utils/generator-prompts");
 const sort_fields_1 = require("../../utils/package-json/sort-fields");
@@ -110,6 +111,8 @@ async function libraryGeneratorInternal(tree, schema) {
             testEnvironment: options.testEnvironment,
             runtimeTsconfigFileName: 'tsconfig.lib.json',
             compiler: options.compiler === 'swc' ? 'swc' : 'babel',
+            passWithNoTests: options.passWithNoTests,
+            skipPackageJson: options.skipPackageJson,
             addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
@@ -248,6 +251,17 @@ async function configureProject(tree, options) {
     }
 }
 async function addLint(tree, options) {
+    // Everything below reaches into `@nx/eslint`'s config utilities, which have
+    // no equivalent for other linters. Dispatch before touching any of it.
+    if (options.linter !== 'eslint') {
+        return (0, add_linting_to_project_1.addLintingToProject)(tree, {
+            linter: options.linter,
+            project: options.name,
+            addPlugin: options.addPlugin,
+            rootProject: options.rootProject,
+            unitTestRunner: options.unitTestRunner,
+        });
+    }
     const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
     const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig, addIgnoresToLintConfig, isTypedLintingEnabled,
     // nx-ignore-next-line
@@ -548,22 +562,20 @@ async function normalizeOptions(tree, options) {
     const hasPlugin = (0, ts_solution_setup_1.isUsingTypeScriptPlugin)(tree);
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     if (isUsingTsSolutionConfig) {
-        options.unitTestRunner ??= await (0, internal_1.promptWhenInteractive)({
-            type: 'autocomplete',
-            name: 'unitTestRunner',
-            message: `Which unit test runner would you like to use?`,
-            choices: [{ name: 'none' }, { name: 'vitest' }, { name: 'jest' }],
-            initial: 0,
-        }, { unitTestRunner: 'none' }).then(({ unitTestRunner }) => unitTestRunner);
+        options.unitTestRunner ??= (0, internal_1.isInteractive)()
+            ? await (0, internal_1.selectPrompt)({
+                message: `Which unit test runner would you like to use?`,
+                choices: [{ value: 'none' }, { value: 'vitest' }, { value: 'jest' }],
+            })
+            : 'none';
     }
     else {
-        options.unitTestRunner ??= await (0, internal_1.promptWhenInteractive)({
-            type: 'autocomplete',
-            name: 'unitTestRunner',
-            message: `Which unit test runner would you like to use?`,
-            choices: [{ name: 'jest' }, { name: 'vitest' }, { name: 'none' }],
-            initial: 0,
-        }, { unitTestRunner: undefined }).then(({ unitTestRunner }) => unitTestRunner);
+        options.unitTestRunner ??= (0, internal_1.isInteractive)()
+            ? await (0, internal_1.selectPrompt)({
+                message: `Which unit test runner would you like to use?`,
+                choices: [{ value: 'jest' }, { value: 'vitest' }, { value: 'none' }],
+            })
+            : undefined;
         if (!options.unitTestRunner && options.bundler === 'vite') {
             options.unitTestRunner = 'vitest';
         }
@@ -638,6 +650,10 @@ async function normalizeOptions(tree, options) {
         isUsingTsSolutionConfig;
     return {
         ...options,
+        // Read from `options`, not a hoisted local: the `npm-scripts` block resets
+        // it to 'none' after `normalizeLinterOption` runs. Naming the key also
+        // satisfies the normalized type, since the spread carries `linter?`.
+        linter: options.linter,
         fileName,
         name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectNames,

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

@@ -1,6 +1,5 @@
 import type { ProjectNameAndRootOptions } from '@nx/devkit/internal';
-// nx-ignore-next-line
-const { Linter, LinterType } = require('@nx/eslint'); // use require to import to avoid circular dependency
+import type { LinterType } from '../../utils/linter';
 import type { ProjectPackageManagerWorkspaceState } from '../../utils/package-manager-workspaces';
 
 export type Compiler = 'tsc' | 'swc';
@@ -15,7 +14,7 @@ export interface LibraryGeneratorSchema {
   skipPackageJson?: boolean;
   includeBabelRc?: boolean;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   testEnvironment?: 'jsdom' | 'node';
   importPath?: string;
   js?: boolean;
@@ -37,11 +36,15 @@ export interface LibraryGeneratorSchema {
   addPlugin?: boolean;
   useProjectJson?: boolean;
   useTscExecutor?: boolean;
+  /** @internal Only honored by the vitest setup. */
+  passWithNoTests?: boolean;
 }
 
 export interface NormalizedLibraryGeneratorOptions
   extends LibraryGeneratorSchema {
   name: string;
+  /** `normalizeOptions` always resolves this, so it is no longer optional. */
+  linter: LinterType;
   projectNames: ProjectNameAndRootOptions['names'];
   fileName: string;
   projectRoot: string;

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

@@ -29,9 +29,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/index.d.ts

@@ -16,5 +16,6 @@ export { initGenerator } from './generators/init/init';
 export { setupPrettierGenerator } from './generators/setup-prettier/generator';
 export { setupVerdaccio } from './generators/setup-verdaccio/generator';
 export { isValidVariable } from './utils/is-valid-variable';
+export { type LinterType } from './utils/linter';
 export { createLockFile, getLockFileName } from '@nx/devkit/internal';
 export { createPackageJson } from '@nx/devkit/internal';

package/dist/src/plugins/typescript/plugin.js

@@ -5,12 +5,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const devkit_2 = require("@nx/devkit");
-const internal_2 = require("@nx/devkit/internal");
 const picomatch = require("picomatch");
-const internal_3 = require("@nx/devkit/internal");
-const internal_4 = require("@nx/devkit/internal");
-const internal_5 = require("@nx/devkit/internal");
 const util_1 = require("./util");
 let ts;
 const resolvedTypescriptPaths = {};
@@ -20,12 +15,12 @@ function resolveTypescriptPath(projectRoot, workspaceRoot) {
     // path is outside the workspace tree (e.g. pnpm's enableGlobalVirtualStore),
     // since typescript is not a declared dep.
     resolvedTypescriptPaths[projectRoot] ??= require.resolve('typescript', {
-        paths: [projectRoot, ...(0, internal_5.getNxRequirePaths)(workspaceRoot), __dirname],
+        paths: [projectRoot, ...(0, internal_1.getNxRequirePaths)(workspaceRoot), __dirname],
     });
     return resolvedTypescriptPaths[projectRoot];
 }
 const TSCONFIG_CACHE_VERSION = 2;
-const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(internal_4.workspaceDataDirectory, 'tsconfig-files.hash');
+const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(internal_1.workspaceDataDirectory, 'tsconfig-files.hash');
 // Module-level cache store — each invocation gets a unique Symbol key
 const cacheStore = new Map();
 // Shared tsconfig cache — initialized once per batch, persisted to disk
@@ -117,8 +112,8 @@ const tsConfigGlob = '**/tsconfig*.json';
 exports.createNodesV2 = [
     tsConfigGlob,
     async (configFilePaths, options, context) => {
-        const optionsHash = (0, internal_2.hashObject)(options);
-        const targetsCachePath = (0, node_path_1.join)(internal_4.workspaceDataDirectory, `tsc-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const targetsCachePath = (0, node_path_1.join)(internal_1.workspaceDataDirectory, `tsc-${optionsHash}.hash`);
         const targetsCache = readFromCache(targetsCachePath);
         // Each invocation gets a unique Symbol key — guaranteed no collisions
         const cacheKey = Symbol('tsc-invocation');
@@ -136,7 +131,7 @@ exports.createNodesV2 = [
         const normalizedOptions = normalizePluginOptions(options);
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
-        const lockFileName = (0, internal_3.getLockFileName)(packageManager);
+        const lockFileName = (0, internal_1.getLockFileName)(packageManager);
         const { configFilePaths: validConfigFilePaths, hashes, projectRoots, } = await resolveValidConfigFilesAndHashes(configFilePaths, normalizedOptions, optionsHash, context, cache, lockFileName);
         try {
             return await (0, devkit_1.createNodesFromFiles)((configFilePath, options, context, idx) => {
@@ -171,7 +166,7 @@ exports.createNodesV2 = [
 ];
 exports.createNodes = exports.createNodesV2;
 async function resolveValidConfigFilesAndHashes(configFilePaths, options, optionsHash, context, cache, lockFileName) {
-    const lockFileHash = (0, internal_2.hashFile)((0, node_path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
+    const lockFileHash = (0, internal_1.hashFile)((0, node_path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
     const validConfigFilePaths = [];
     const hashes = [];
     const projectRoots = [];
@@ -218,7 +213,7 @@ async function getConfigFileHash(configFilePath, workspaceRoot, project, options
         packageJson = (0, devkit_1.readJsonFile)((0, node_path_1.join)(workspaceRoot, project.root, 'package.json'));
     }
     catch { }
-    return (0, devkit_2.hashArray)([
+    return (0, devkit_1.hashArray)([
         ...[
             fullConfigPath,
             ...extendedConfigFiles.files.sort(),
@@ -228,7 +223,7 @@ async function getConfigFileHash(configFilePath, workspaceRoot, project, options
         ...extendedConfigFiles.packages.sort(),
         lockFileHash,
         optionsHash,
-        ...(packageJson ? [(0, internal_2.hashObject)(packageJson)] : []),
+        ...(packageJson ? [(0, internal_1.hashObject)(packageJson)] : []),
     ]);
 }
 function checkIfConfigFileShouldBeProject(config, cache) {
@@ -956,7 +951,7 @@ function getFileHash(filePath, workspaceRoot, cache) {
     const relativePath = posixRelative(workspaceRoot, filePath);
     if (!cache.fileHashes[relativePath]) {
         const content = readFile(filePath, workspaceRoot, cache);
-        cache.fileHashes[relativePath] = (0, devkit_2.hashArray)([content]);
+        cache.fileHashes[relativePath] = (0, devkit_1.hashArray)([content]);
     }
     return cache.fileHashes[relativePath];
 }

package/dist/src/release/utils/update-lock-file.js

@@ -4,7 +4,6 @@ exports.updateLockFile = updateLockFile;
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
 async function updateLockFile(cwd, { dryRun, verbose, options, }) {
     if (options?.skipLockFileUpdate) {
@@ -47,7 +46,7 @@ async function updateLockFile(cwd, { dryRun, verbose, options, }) {
             installArgs = `${installArgs} --ignore-scripts`.trim();
         }
     }
-    const lockFile = (0, internal_2.getLockFileName)(packageManager);
+    const lockFile = (0, internal_1.getLockFileName)(packageManager);
     const command = `${packageManagerCommands.updateLockFile} ${installArgs}`.trim();
     if (verbose) {
         if (dryRun) {

package/dist/src/utils/add-linting-to-project.d.ts

@@ -0,0 +1,46 @@
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { type LinterType } from './linter';
+export interface AddLintingToProjectOptions {
+    /** Required, but `undefined` still reaches here — see the normalization below. */
+    linter: LinterType | undefined;
+    project: string;
+    skipPackageJson?: boolean;
+    keepExistingVersions?: boolean;
+    addPlugin?: boolean;
+    /** ESLint-only. Ignored by other linters. */
+    tsConfigPaths?: string[];
+    unitTestRunner?: string;
+    /** ESLint-only. Ignored by other linters. */
+    rootProject?: boolean;
+    /** ESLint-only. Ignored by other linters. */
+    enableTypedLinting?: boolean;
+    /** ESLint-only. Oxlint is inference-only, so it writes no explicit target. */
+    addExplicitTargets?: boolean;
+    /**
+     * ESLint-only. The `@nx/dependency-checks` rule lints `package.json`, which
+     * Oxlint cannot read.
+     */
+    addPackageJsonDependencyChecks?: boolean;
+    /**
+     * Oxlint plugins to enable for this project, e.g. `['react', 'jsx-a11y']`.
+     * Ignored by other linters, which express framework presets differently.
+     */
+    oxlintPlugins?: string[];
+}
+/**
+ * Sets a project's linter up, dispatching to whichever linter the workspace
+ * asked for. Consumers call this instead of importing `lintProjectGenerator`
+ * from `@nx/eslint` directly, so adding a linter does not mean editing every
+ * generator. The two arms name different generators on purpose: `@nx/eslint`
+ * writes a lint target, while `@nx/oxlint` is inference-only and only
+ * configures the project.
+ *
+ * Scope is deliberately narrow: registering the linter and its project target.
+ * Linter-specific config shaping — ESLint framework presets, `extends`, ignore
+ * entries — stays at the call site guarded on `linter`, because none of it has
+ * a cross-linter equivalent.
+ *
+ * Both plugins are loaded through `ensurePackage`; a static import would be
+ * circular, since both depend on `@nx/js`.
+ */
+export declare function addLintingToProject(tree: Tree, options: AddLintingToProjectOptions): Promise<GeneratorCallback>;

package/dist/src/utils/add-linting-to-project.js

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addLintingToProject = addLintingToProject;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+const versions_1 = require("./versions");
+const linter_1 = require("./linter");
+/**
+ * Sets a project's linter up, dispatching to whichever linter the workspace
+ * asked for. Consumers call this instead of importing `lintProjectGenerator`
+ * from `@nx/eslint` directly, so adding a linter does not mean editing every
+ * generator. The two arms name different generators on purpose: `@nx/eslint`
+ * writes a lint target, while `@nx/oxlint` is inference-only and only
+ * configures the project.
+ *
+ * Scope is deliberately narrow: registering the linter and its project target.
+ * Linter-specific config shaping — ESLint framework presets, `extends`, ignore
+ * entries — stays at the call site guarded on `linter`, because none of it has
+ * a cross-linter equivalent.
+ *
+ * Both plugins are loaded through `ensurePackage`; a static import would be
+ * circular, since both depend on `@nx/js`.
+ */
+async function addLintingToProject(tree, options) {
+    // Callers should resolve this themselves, since their own guards need a
+    // concrete value. Resolving again here keeps a caller that forgets from
+    // silently getting ESLint in a workspace that uses something else.
+    const linter = options.linter ?? (0, linter_1.detectLinters)(tree)[0] ?? 'none';
+    if (linter === 'none') {
+        return () => { };
+    }
+    if (linter === 'oxlint') {
+        // `ensurePackage` installs by package name, so the subpath is required
+        // separately. `nx-ignore-next-line` keeps this out of the import graph, so
+        // the dependency stays a devDependency of this package rather than a runtime
+        // one. That devDependency is what makes the `js` <-> `@nx/oxlint` cycle,
+        // which is deliberate and recorded in `ignoredCircularDependencies` in the
+        // root eslint config.
+        (0, devkit_1.ensurePackage)('@nx/oxlint', versions_1.nxVersion);
+        // `@nx/oxlint` is the only ESM package under `packages/` and its
+        // `./generators` subpath has no `require` condition, so a bare `require()`
+        // throws ERR_REQUIRE_ESM below Node 20.19 / 22.12.
+        //
+        // Resolve to an absolute path before importing. `ensurePackage` exposes an
+        // on-demand install by adding a temp dir to NODE_PATH, which `require.resolve`
+        // honours and the ESM loader does not — so handing `import()` a bare specifier
+        // fails with ERR_MODULE_NOT_FOUND on exactly the Node band this indirection
+        // exists for. `load-resolved-plugin.ts` calls `handleImport` the same way.
+        // nx-ignore-next-line
+        const generatorsPath = require.resolve('@nx/oxlint/generators', {
+            paths: [devkit_1.workspaceRoot, __dirname],
+        });
+        const { configurationGenerator } = await (0, internal_1.handleImport)(generatorsPath);
+        return configurationGenerator(tree, {
+            project: options.project,
+            plugins: [
+                ...(options.oxlintPlugins ?? []),
+                ...oxlintTestPlugins(options.unitTestRunner),
+            ],
+            skipFormat: true,
+            skipPackageJson: options.skipPackageJson,
+            keepExistingVersions: options.keepExistingVersions,
+            // No `addPlugin`: `@nx/oxlint` is inference-only, so it always registers.
+        });
+    }
+    if (linter === 'eslint') {
+        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
+        return lintProjectGenerator(tree, {
+            linter,
+            project: options.project,
+            tsConfigPaths: options.tsConfigPaths,
+            unitTestRunner: options.unitTestRunner,
+            rootProject: options.rootProject,
+            enableTypedLinting: options.enableTypedLinting,
+            addExplicitTargets: options.addExplicitTargets,
+            addPackageJsonDependencyChecks: options.addPackageJsonDependencyChecks,
+            skipFormat: true,
+            skipPackageJson: options.skipPackageJson,
+            keepExistingVersions: options.keepExistingVersions,
+            addPlugin: options.addPlugin,
+        });
+    }
+    // Spelling ESLint out as its own branch rather than letting it be the
+    // fallthrough: a new `LinterType` member then fails to compile here instead of
+    // silently getting an ESLint setup.
+    const unhandled = linter;
+    throw new Error(`Unsupported linter: ${unhandled}`);
+}
+/**
+ * Which Oxlint plugins a test runner needs is the runner package's knowledge,
+ * so it is read from there rather than hardcoded here — this only maps the
+ * runner name to its package. Matched loosely because runners arrive with
+ * suffixes, e.g. Angular's `vitest-analog`. Both packages are already installed
+ * by the time the runner's own generator runs; `ensurePackage` keeps them out
+ * of the import graph, since both depend on `@nx/js`.
+ */
+function oxlintTestPlugins(unitTestRunner) {
+    const pkg = unitTestRunner?.includes('vitest')
+        ? '@nx/vitest'
+        : unitTestRunner?.includes('jest')
+            ? '@nx/jest'
+            : undefined;
+    if (!pkg) {
+        return [];
+    }
+    // `ensurePackage` installs by package name, so the `internal` subpath is
+    // required separately. Plain `require` holds only while both runners are CJS;
+    // `@nx/oxlint` is ESM, which is why the arm above needs `handleImport`.
+    (0, devkit_1.ensurePackage)(pkg, versions_1.nxVersion);
+    const { oxlintPlugins } = require(`${pkg}/internal`);
+    return oxlintPlugins ?? [];
+}

package/dist/src/utils/generator-prompts.d.ts

@@ -1,3 +1,4 @@
 import type { Tree } from '@nx/devkit';
-export declare function normalizeLinterOption(tree: Tree, linter: undefined | 'none' | 'eslint'): Promise<'none' | 'eslint'>;
+import { type LinterType } from './linter';
+export declare function normalizeLinterOption(tree: Tree, linter: undefined | LinterType): Promise<LinterType>;
 export declare function normalizeUnitTestRunnerOption<T extends 'none' | 'jest' | 'vitest'>(tree: Tree, unitTestRunner: undefined | T, testRunners?: Array<'jest' | 'vitest'>): Promise<T>;

package/dist/src/utils/generator-prompts.js

@@ -4,37 +4,38 @@ exports.normalizeLinterOption = normalizeLinterOption;
 exports.normalizeUnitTestRunnerOption = normalizeUnitTestRunnerOption;
 const internal_1 = require("@nx/devkit/internal");
 const ts_solution_setup_1 = require("./typescript/ts-solution-setup");
+const linter_1 = require("./linter");
 async function normalizeLinterOption(tree, linter) {
     if (linter) {
         return linter;
     }
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
-    const choices = isTsSolutionSetup
-        ? [{ name: 'none' }, { name: 'eslint' }]
-        : [{ name: 'eslint' }, { name: 'none' }];
-    const defaultValue = isTsSolutionSetup ? 'none' : 'eslint';
-    return await (0, internal_1.promptWhenInteractive)({
-        type: 'autocomplete',
-        name: 'linter',
-        message: `Which linter would you like to use?`,
-        choices,
-        initial: 0,
-    }, { linter: defaultValue }).then(({ linter }) => linter);
+    // Following the workspace is not a question. When it already has a linter,
+    // use it — including in a hybrid workspace, where `detectLinters` puts the
+    // one being migrated *to* first. Pass `--linter` to choose something else.
+    const [detected] = (0, linter_1.detectLinters)(tree);
+    if (detected) {
+        return detected;
+    }
+    // Nothing to follow, so this is a real choice. `none` is the non-interactive
+    // answer, and leads the list so the interactive default matches it.
+    return (0, internal_1.isInteractive)()
+        ? (0, internal_1.selectPrompt)({
+            message: `Which linter would you like to use?`,
+            choices: [{ value: 'none' }, { value: 'eslint' }, { value: 'oxlint' }],
+        })
+        : 'none';
 }
 async function normalizeUnitTestRunnerOption(tree, unitTestRunner, testRunners = ['jest', 'vitest']) {
     if (unitTestRunner) {
         return unitTestRunner;
     }
     const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
-    const choices = isTsSolutionSetup
-        ? [{ name: 'none' }, ...testRunners.map((runner) => ({ name: runner }))]
-        : [...testRunners.map((runner) => ({ name: runner })), { name: 'none' }];
+    const choices = (isTsSolutionSetup ? ['none', ...testRunners] : [...testRunners, 'none']).map((value) => ({ value: value }));
     const defaultValue = (isTsSolutionSetup ? 'none' : testRunners[0]);
-    return await (0, internal_1.promptWhenInteractive)({
-        type: 'autocomplete',
-        name: 'unitTestRunner',
-        message: `Which unit test runner would you like to use?`,
-        choices,
-        initial: 0,
-    }, { unitTestRunner: defaultValue }).then(({ unitTestRunner }) => unitTestRunner);
+    return (0, internal_1.isInteractive)()
+        ? (0, internal_1.selectPrompt)({
+            message: `Which unit test runner would you like to use?`,
+            choices,
+        })
+        : defaultValue;
 }

package/dist/src/utils/linter.d.ts

@@ -0,0 +1,30 @@
+import { type Tree } from '@nx/devkit';
+/**
+ * The linters Nx generators can set up for a project.
+ *
+ * Canonical home. `@nx/eslint` re-exports this for back-compat. Two standalone
+ * copies exist because neither package can depend on `@nx/js`: `@nx/workspace`
+ * (which `@nx/js` itself depends on) and `LINTERS` in `create-nx-workspace`.
+ * The assertion below pins the first; `create-nx-workspace` has no edge to
+ * assert across, so that one is still kept in sync by hand.
+ */
+export type LinterType = 'eslint' | 'oxlint' | 'none';
+/**
+ * Every linter the workspace has installed, most-preferred first — so `[0]` is
+ * the one a generator should follow when it was not told which to set up, and
+ * `.includes(x)` answers whether the workspace uses `x` at all. Those differ in
+ * a workspace part-way through a migration: it has both, and a project
+ * generated for Oxlint still lives under the root ESLint config.
+ *
+ * Oxlint sorts first when both are present. A workspace with both has adopted
+ * Oxlint alongside its existing ESLint setup, and new projects should follow
+ * the direction of travel rather than the setup being migrated away from.
+ *
+ * Empty means the workspace opted out of linting; callers that need a concrete
+ * answer should read that as `none` rather than inferring ESLint for it.
+ *
+ * Reads the tree, never the generator's own module resolution: `eslint` is a
+ * peer dependency of several first-party plugins, so it resolves from disk in
+ * workspaces that do not use it.
+ */
+export declare function detectLinters(tree: Tree): Exclude<LinterType, 'none'>[];

package/dist/src/utils/linter.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectLinters = detectLinters;
+const devkit_1 = require("@nx/devkit");
+function hasPlugin(tree, plugin) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    return !!nxJson?.plugins?.some((p) => typeof p === 'string' ? p === plugin : p.plugin === plugin);
+}
+function hasAnyDependency(tree, packages) {
+    return packages.some((pkg) => Boolean((0, devkit_1.getDependencyVersionFromPackageJson)(tree, pkg)));
+}
+/**
+ * Every linter the workspace has installed, most-preferred first — so `[0]` is
+ * the one a generator should follow when it was not told which to set up, and
+ * `.includes(x)` answers whether the workspace uses `x` at all. Those differ in
+ * a workspace part-way through a migration: it has both, and a project
+ * generated for Oxlint still lives under the root ESLint config.
+ *
+ * Oxlint sorts first when both are present. A workspace with both has adopted
+ * Oxlint alongside its existing ESLint setup, and new projects should follow
+ * the direction of travel rather than the setup being migrated away from.
+ *
+ * Empty means the workspace opted out of linting; callers that need a concrete
+ * answer should read that as `none` rather than inferring ESLint for it.
+ *
+ * Reads the tree, never the generator's own module resolution: `eslint` is a
+ * peer dependency of several first-party plugins, so it resolves from disk in
+ * workspaces that do not use it.
+ */
+function detectLinters(tree) {
+    const linters = [];
+    if (hasPlugin(tree, '@nx/oxlint') ||
+        hasAnyDependency(tree, ['@nx/oxlint', 'oxlint'])) {
+        linters.push('oxlint');
+    }
+    // `@nx/eslint` registers its inference plugin as `@nx/eslint/plugin`, unlike
+    // `@nx/oxlint`, which registers under its bare package name.
+    if (hasPlugin(tree, '@nx/eslint/plugin') ||
+        hasAnyDependency(tree, ['@nx/eslint', 'eslint'])) {
+        linters.push('eslint');
+    }
+    return linters;
+}

package/dist/src/utils/package-json/update-package-json.js

@@ -5,21 +5,18 @@ exports.getExports = getExports;
 exports.getUpdatedPackageJsonContent = getUpdatedPackageJsonContent;
 exports.getOutputDir = getOutputDir;
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
-const internal_3 = require("@nx/devkit/internal");
-const internal_4 = require("@nx/devkit/internal");
 const get_main_file_dir_1 = require("../get-main-file-dir");
 const strip_glob_to_base_dir_1 = require("../strip-glob-to-base-dir");
 function updatePackageJson(options, context, target, dependencies, fileMap = null) {
     let packageJson;
     if (fileMap == null) {
-        fileMap = (0, internal_4.readFileMapCache)()?.fileMap?.projectFileMap || {};
+        fileMap = (0, internal_1.readFileMapCache)()?.fileMap?.projectFileMap || {};
     }
     if (options.updateBuildableProjectDepsInPackageJson) {
-        packageJson = (0, internal_2.createPackageJson)(context.projectName, context.projectGraph, {
+        packageJson = (0, internal_1.createPackageJson)(context.projectName, context.projectGraph, {
             target: context.targetName,
             root: context.root,
             // By default we remove devDependencies since this is a production build.
@@ -32,7 +29,7 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
     }
     else {
         const pathToPackageJson = (0, path_1.join)(context.root, options.projectRoot, 'package.json');
-        packageJson = (0, internal_3.fileExists)(pathToPackageJson)
+        packageJson = (0, internal_1.fileExists)(pathToPackageJson)
             ? (0, devkit_1.readJsonFile)(pathToPackageJson)
             : { name: context.projectName, version: '0.0.1' };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.8",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -147,11 +147,18 @@
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/workspace": "23.2.0-beta.6"
+    "@nx/devkit": "23.2.0-beta.8",
+    "@nx/workspace": "23.2.0-beta.8"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.6"
+    "@nx/esbuild": "23.2.0-beta.8",
+    "@nx/eslint": "23.2.0-beta.8",
+    "@nx/jest": "23.2.0-beta.8",
+    "@nx/oxlint": "23.2.0-beta.8",
+    "@nx/vite": "23.2.0-beta.8",
+    "@nx/rollup": "23.2.0-beta.8",
+    "@nx/vitest": "23.2.0-beta.8",
+    "nx": "23.2.0-beta.8"
   },
   "peerDependencies": {
     "@swc/cli": ">=0.6.0 <0.9.0",