@nx/workspace 23.2.0-beta.7 → 23.2.0-beta.9

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/files-integrated-repo/__dot__vscode/extensions.json__tmpl__

@@ -3,7 +3,8 @@
     <% if(cliCommand === 'ng') { %>
     "angular.ng-template",<% }
     %>
-    "nrwl.angular-console",
-    "esbenp.prettier-vscode"
+    "nrwl.angular-console"<% if(formatter === 'prettier') { %>,
+    "esbenp.prettier-vscode"<% } %><% if(formatter === 'oxfmt') { %>,
+    "oxc.oxc-vscode"<% } %>
   ]
 }

package/dist/src/generators/new/generate-preset.js

@@ -89,6 +89,7 @@ function generatePreset(host, opts) {
                     : null,
             opts.nxCloudToken ? `--nxCloudToken=${opts.nxCloudToken}` : null,
             opts.formatter ? `--formatter=${opts.formatter}` : null,
+            opts.skipInstall ? `--skipInstall` : null,
             opts.workspaces !== false ? `--workspaces` : `--no-workspaces`,
             opts.useProjectJson ? `--useProjectJson` : null,
         ].filter((e) => !!e);
@@ -99,8 +100,9 @@ function generatePreset(host, opts) {
 // `typescript: >3.0.0` peer to 7.x, whose entry point dropped the compiler API.
 function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner, js, }) {
     switch (preset) {
-        // Empty workspaces — no preset generator runs, so `@nx/js:init` never adds
-        // typescript and pinning it here would be net-new.
+        // These generate no project, so `@nx/js:init` never runs to add typescript
+        // and pinning it here would be net-new. The preset generator itself does
+        // run - it sets up the chosen formatter.
         case presets_1.Preset.Apps:
         case presets_1.Preset.NPM:
             return { dependencies: {}, dev: { '@nx/js': versions_1.nxVersion } };

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',
@@ -228,6 +227,10 @@ function createFiles(tree, options) {
         ...options,
         nxVersion: versions_1.nxVersion,
         packageManager: options.packageManager,
+        // After the spread and always defined: `formatter` is optional on the
+        // schema, and EJS throws a ReferenceError on a key that is absent rather
+        // than treating it as undefined.
+        formatter: options.formatter ?? 'none',
     });
 }
 async function createReadme(tree, { name, appName, directory, preset, nxCloud, workspaces }, nxCloudToken) {

package/dist/src/generators/new/new.d.ts

@@ -28,7 +28,7 @@ interface Schema {
     useGitHub?: boolean;
     nxCloud?: 'yes' | 'skip' | 'circleci' | 'github';
     analytics?: boolean;
-    formatter?: string;
+    formatter?: 'none' | 'prettier' | 'oxfmt';
     workspaces?: boolean;
     workspaceGlobs?: string | string[];
     useProjectJson?: boolean;

package/dist/src/generators/new/new.js

@@ -27,7 +27,16 @@ async function newGenerator(tree, opts) {
             (0, devkit_1.installPackagesTask)(tree, false, options.directory, options.packageManager);
         }
         // TODO: move all of these into create-nx-workspace
-        if (options.preset !== presets_1.Preset.NPM && !options.isCustomPreset) {
+        // The npm preset normally skips the preset generator entirely, which is why
+        // `--formatter` used to be dropped for it. Run it when there is a formatter
+        // to set up. `schema.json` defaults to `none`, so this fork is taken only
+        // when a formatter was actually asked for, which on this preset means an
+        // explicit `--formatter`.
+        const npmPresetNeedsFormatter = options.preset === presets_1.Preset.NPM &&
+            !!options.formatter &&
+            options.formatter !== 'none';
+        if ((options.preset !== presets_1.Preset.NPM || npmPresetNeedsFormatter) &&
+            !options.isCustomPreset) {
             await (0, generate_preset_1.generatePreset)(tree, options);
         }
         // if we move this into create-nx-workspace, we can also easily log things out like nx console install success

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

@@ -99,6 +99,7 @@
     "formatter": {
       "description": "The tool to use for code formatting.",
       "type": "string",
+      "enum": ["none", "prettier", "oxfmt"],
       "default": "none"
     },
     "workspaces": {

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

@@ -17,8 +17,28 @@ async function createPreset(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
-    if (options.preset === presets_1.Preset.Apps) {
-        return;
+    if (options.preset === presets_1.Preset.Apps || options.preset === presets_1.Preset.NPM) {
+        // These presets generate no project, so nothing downstream would set the
+        // formatter up and the choice would be dropped. Only the formatter is
+        // configured here - `@nx/js:init` would also add TypeScript and register
+        // its plugin, which both presets deliberately leave out.
+        //
+        // `@nx/js` is only in the new workspace's package.json, not necessarily on
+        // disk. `validateOptions` allows `skipInstall` with these presets, so the
+        // require has to be reached only when there is a formatter to set up AND
+        // the install that puts `@nx/js` there actually ran.
+        if (!options.formatter || options.formatter === 'none') {
+            return;
+        }
+        if (options.skipInstall) {
+            // No follow-up command to name: `@nx/js:init` is what sets a formatter
+            // up, and running it here is what the comment above rules out for these
+            // presets.
+            devkit_1.logger.warn(`Skipped ${options.formatter} setup: it lives in @nx/js, which --skipInstall leaves uninstalled.`);
+            return;
+        }
+        const { setUpFormatter } = require('@nx' + '/js');
+        return setUpFormatter(tree, options.formatter);
     }
     else if (options.preset === presets_1.Preset.AngularMonorepo) {
         const { applicationGenerator: angularApplicationGenerator } = require('@nx' + '/angular/generators');
@@ -39,6 +59,7 @@ async function createPreset(tree, options) {
             ssr: options.ssr,
             prefix: options.prefix,
             zoneless: options.zoneless,
+            formatter: options.formatter,
             nxCloudToken: options.nxCloudToken,
         });
     }
@@ -62,6 +83,7 @@ async function createPreset(tree, options) {
             ssr: options.ssr,
             prefix: options.prefix,
             zoneless: options.zoneless,
+            formatter: options.formatter,
             nxCloudToken: options.nxCloudToken,
         });
     }
@@ -132,6 +154,7 @@ async function createPreset(tree, options) {
             unitTestRunner: options.unitTestRunner ?? 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.Nuxt) {
@@ -162,6 +185,7 @@ async function createPreset(tree, options) {
             unitTestRunner: options.unitTestRunner ?? 'vitest',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.NextJs) {
@@ -208,6 +232,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             addPlugin,
             nxCloudToken: options.nxCloudToken,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.Nest) {
@@ -271,9 +296,17 @@ async function createPreset(tree, options) {
     }
     else if (options.preset === presets_1.Preset.TS) {
         const { initGenerator } = require('@nx' + '/js');
+        // `validateOptions` allows `skipInstall` here, and this run must then stay
+        // install-free: `skipPackageJson` gates both `ensurePackage` and the
+        // package.json write that would make `installPackagesTask` install, and
+        // `skipFormat` keeps `formatFiles` from loading the formatter. The
+        // formatter config is still written, so detection restores the dependency
+        // on the next `@nx/js:init`-running generator.
         return initGenerator(tree, {
             formatter: options.formatter,
             addTsPlugin: process.env.NX_ADD_PLUGINS !== 'false' && options.workspaces,
+            skipPackageJson: options.skipInstall,
+            skipFormat: options.skipInstall,
         });
     }
     else if (options.preset === presets_1.Preset.TsStandalone) {
@@ -290,6 +323,7 @@ async function createPreset(tree, options) {
             js: options.js,
             rootProject: true,
             addPlugin,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.NodeStandalone) {
@@ -306,6 +340,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
             unitTestRunner: options.unitTestRunner,
             addPlugin,
+            formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.NodeMonorepo) {

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

@@ -6,7 +6,8 @@ export interface Schema {
   preset: Preset;
   style?: string;
   linter?: string;
-  formatter?: string;
+  formatter?: 'none' | 'prettier' | 'oxfmt';
+  skipInstall?: boolean;
   workspaces?: boolean;
   framework?: string;
   packageManager?: string;

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

@@ -103,9 +103,15 @@
       "description": "Generate an application that does not use 'zone.js'.",
       "type": "boolean"
     },
+    "skipInstall": {
+      "description": "Skip installing dependencies. Formatter setup needs @nx/js on disk, so it is skipped too.",
+      "type": "boolean",
+      "default": false
+    },
     "formatter": {
       "description": "The tool to use for code formatting.",
       "type": "string",
+      "enum": ["none", "prettier", "oxfmt"],
       "default": "none"
     },
     "workspaces": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "23.2.0-beta.7",
+  "version": "23.2.0-beta.9",
   "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.7",
-    "@nx/devkit": "23.2.0-beta.7"
+    "nx": "23.2.0-beta.9",
+    "@nx/devkit": "23.2.0-beta.9"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.7"
+    "nx": "23.2.0-beta.9"
   },
   "publishConfig": {
     "access": "public"