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

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { names } from '@nx/devkit';
 export { output } from './src/utilities/output';
 export { readPackageJson } from '@nx/devkit/internal';
 export { getWorkspacePath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
-export { Linter } from './src/utils/lint';
+export { Linter, type LinterType } from './src/utils/lint';
 export { moveGenerator } from './src/generators/move/move';
 export { removeGenerator } from './src/generators/remove/remove';
 export { runCommandsGenerator } from './src/generators/run-commands/run-commands';

package/dist/src/generators/infer-targets/infer-targets.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferredGenerator = convertToInferredGenerator;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const enquirer_1 = require("enquirer");
 async function convertToInferredGenerator(tree, options) {
     const generatorCollectionChoices = await getPossibleConvertToInferredGenerators();
     if (generatorCollectionChoices.size === 0) {
@@ -23,19 +22,12 @@ async function convertToInferredGenerator(tree, options) {
     }
     else {
         const allChoices = Array.from(generatorCollectionChoices.keys());
-        generatorsToRun = (await (0, enquirer_1.prompt)({
-            type: 'multiselect',
-            name: 'generatorsToRun',
+        generatorsToRun = await (0, internal_1.multiselectPrompt)({
             message: 'Which inference plugin do you want to use?',
             choices: allChoices,
-            initial: allChoices,
-            validate: (result) => {
-                if (result.length === 0) {
-                    return 'Please select at least one plugin.';
-                }
-                return true;
-            },
-        })).generatorsToRun;
+            initialValues: allChoices,
+            required: true,
+        });
     }
     if (generatorsToRun.length === 0) {
         devkit_1.output.error({

package/dist/src/generators/new/generate-workspace-files.js

@@ -8,7 +8,6 @@ const semver_1 = require("semver");
 const default_base_1 = require("../../utilities/default-base");
 const versions_1 = require("../../utils/versions");
 const presets_1 = require("../utils/presets");
-const internal_2 = require("@nx/devkit/internal");
 // map from the preset to the name of the plugin s.t. the README can have a more
 // meaningful generator command.
 const presetToPluginMap = {
@@ -135,7 +134,7 @@ async function generateWorkspaceFiles(tree, options) {
     await createReadme(tree, options, token);
     let aiAgentsCallback = undefined;
     if (options.aiAgents && options.aiAgents.length > 0) {
-        aiAgentsCallback = await (0, internal_2.setupAiAgentsGenerator)(tree, {
+        aiAgentsCallback = await (0, internal_1.setupAiAgentsGenerator)(tree, {
             directory: options.directory,
             writeNxCloudRules: options.nxCloud !== 'skip',
             packageVersion: 'latest',

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

@@ -53,9 +53,9 @@
       "description": "Application name."
     },
     "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",
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "packageManager": {
       "description": "The package manager used to install dependencies.",

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

@@ -282,6 +282,9 @@ async function createPreset(tree, options) {
             name: options.name,
             directory: '.',
             bundler: 'tsc',
+            // Forwarded so the library generator's own resolution short-circuits;
+            // without it the user is asked which linter to use a second time.
+            linter: options.linter,
             unitTestRunner: 'vitest',
             testEnvironment: 'node',
             js: options.js,

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

@@ -15,9 +15,9 @@
       "type": "string"
     },
     "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",
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "routing": {
       "description": "Add routing to the generated application.",

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

@@ -2,4 +2,4 @@ export declare const enum Linter {
     EsLint = "eslint",
     None = "none"
 }
-export type LinterType = 'eslint' | 'none';
+export type LinterType = 'eslint' | 'oxlint' | 'none';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.8",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -80,16 +80,15 @@
   "dependencies": {
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
-    "enquirer": "~2.3.6",
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "23.2.0-beta.6",
-    "@nx/devkit": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.8",
+    "@nx/devkit": "23.2.0-beta.8"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.8"
   },
   "publishConfig": {
     "access": "public"