nx 17.0.1 → 17.0.3

package/src/daemon/server/server.js

@@ -1,31 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startServer = exports.handleResult = void 0;
-const workspace_root_1 = require("../../utils/workspace-root");
+const fs_1 = require("fs");
 const net_1 = require("net");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
-const socket_utils_1 = require("../socket-utils");
-const logger_1 = require("./logger");
-const shutdown_utils_1 = require("./shutdown-utils");
-const watcher_1 = require("./watcher");
-const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
-const fs_1 = require("fs");
-const handle_request_project_graph_1 = require("./handle-request-project-graph");
-const handle_process_in_background_1 = require("./handle-process-in-background");
-const handle_outputs_tracking_1 = require("./handle-outputs-tracking");
+const file_hasher_1 = require("../../hasher/file-hasher");
+const native_1 = require("../../native");
 const consume_messages_from_socket_1 = require("../../utils/consume-messages-from-socket");
-const outputs_tracking_1 = require("./outputs-tracking");
-const handle_request_shutdown_1 = require("./handle-request-shutdown");
-const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
-const versions_1 = require("../../utils/versions");
 const fileutils_1 = require("../../utils/fileutils");
+const versions_1 = require("../../utils/versions");
+const workspace_context_1 = require("../../utils/workspace-context");
+const workspace_root_1 = require("../../utils/workspace-root");
 const cache_1 = require("../cache");
+const socket_utils_1 = require("../socket-utils");
+const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const handle_hash_tasks_1 = require("./handle-hash-tasks");
-const file_hasher_1 = require("../../hasher/file-hasher");
+const handle_outputs_tracking_1 = require("./handle-outputs-tracking");
+const handle_process_in_background_1 = require("./handle-process-in-background");
 const handle_request_file_data_1 = require("./handle-request-file-data");
-const workspace_context_1 = require("../../utils/workspace-context");
-const native_1 = require("../../native");
+const handle_request_project_graph_1 = require("./handle-request-project-graph");
+const handle_request_shutdown_1 = require("./handle-request-shutdown");
+const logger_1 = require("./logger");
+const outputs_tracking_1 = require("./outputs-tracking");
+const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
+const shutdown_utils_1 = require("./shutdown-utils");
+const watcher_1 = require("./watcher");
 let performanceObserver;
 let workspaceWatcherError;
 let outputsWatcherError;
@@ -55,7 +55,6 @@ const server = (0, net_1.createServer)(async (socket) => {
     });
 });
 registerProcessTerminationListeners();
-registerProcessServerJsonTracking();
 async function handleMessage(socket, data) {
     if (workspaceWatcherError) {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `File watcher error in the workspace '${workspace_root_1.workspaceRoot}'.`, workspaceWatcherError);
@@ -147,19 +146,6 @@ function registerProcessTerminationListeners() {
         reason: 'received process SIGHUP',
     }));
 }
-async function registerProcessServerJsonTracking() {
-    if (useNativeWatcher()) {
-        return;
-    }
-    (0, shutdown_utils_1.storeProcessJsonSubscription)(await (0, watcher_1.subscribeToServerProcessJsonChanges)(async () => {
-        if ((0, cache_1.getDaemonProcessIdSync)() !== process.pid) {
-            await (0, shutdown_utils_1.handleServerProcessTermination)({
-                server,
-                reason: 'this process is no longer the current daemon',
-            });
-        }
-    }));
-}
 let existingLockHash;
 function daemonIsOutdated() {
     return nxVersionChanged() || lockFileHashChanged();
@@ -295,30 +281,12 @@ async function startServer() {
                     logger_1.serverLogger.log(`Started listening on: ${socket_utils_1.FULL_OS_SOCKET_PATH}`);
                     // this triggers the storage of the lock file hash
                     daemonIsOutdated();
-                    if (useNativeWatcher()) {
-                        if (!(0, shutdown_utils_1.getWatcherInstance)()) {
-                            (0, shutdown_utils_1.storeWatcherInstance)(await (0, watcher_1.watchWorkspace)(server, handleWorkspaceChanges));
-                            logger_1.serverLogger.watcherLog(`Subscribed to changes within: ${workspace_root_1.workspaceRoot} (native)`);
-                        }
-                        if (!(0, shutdown_utils_1.getOutputWatcherInstance)()) {
-                            (0, shutdown_utils_1.storeOutputWatcherInstance)(await (0, watcher_1.watchOutputFiles)(handleOutputsChanges));
-                        }
+                    if (!(0, shutdown_utils_1.getWatcherInstance)()) {
+                        (0, shutdown_utils_1.storeWatcherInstance)(await (0, watcher_1.watchWorkspace)(server, handleWorkspaceChanges));
+                        logger_1.serverLogger.watcherLog(`Subscribed to changes within: ${workspace_root_1.workspaceRoot} (native)`);
                     }
-                    else {
-                        if (!(0, shutdown_utils_1.getSourceWatcherSubscription)()) {
-                            (0, shutdown_utils_1.storeSourceWatcherSubscription)(await (0, watcher_1.subscribeToWorkspaceChanges)(server, handleWorkspaceChanges));
-                            logger_1.serverLogger.watcherLog(`Subscribed to changes within: ${workspace_root_1.workspaceRoot}`);
-                        }
-                        // temporary disable outputs tracking on linux
-                        const outputsTrackingIsEnabled = process.platform != 'linux';
-                        if (outputsTrackingIsEnabled) {
-                            if (!(0, shutdown_utils_1.getOutputsWatcherSubscription)()) {
-                                (0, shutdown_utils_1.storeOutputsWatcherSubscription)(await (0, watcher_1.subscribeToOutputsChanges)(handleOutputsChanges));
-                            }
-                        }
-                        else {
-                            (0, outputs_tracking_1.disableOutputsTracking)();
-                        }
+                    if (!(0, shutdown_utils_1.getOutputWatcherInstance)()) {
+                        (0, shutdown_utils_1.storeOutputWatcherInstance)(await (0, watcher_1.watchOutputFiles)(handleOutputsChanges));
                     }
                     return resolve(server);
                 }
@@ -333,7 +301,3 @@ async function startServer() {
     });
 }
 exports.startServer = startServer;
-// TODO(cammisuli): remove with nx 16.6 (only our watcher will be supported)
-function useNativeWatcher() {
-    return process.env.NX_NATIVE_WATCHER === 'true';
-}

package/src/daemon/server/shutdown-utils.d.ts

@@ -1,13 +1,7 @@
 /// <reference types="node" />
 import type { Server, Socket } from 'net';
-import type { AsyncSubscription } from '@parcel/watcher';
 import type { Watcher } from '../../native';
 export declare const SERVER_INACTIVITY_TIMEOUT_MS: 10800000;
-export declare function getSourceWatcherSubscription(): AsyncSubscription;
-export declare function storeSourceWatcherSubscription(s: AsyncSubscription): void;
-export declare function getOutputsWatcherSubscription(): AsyncSubscription;
-export declare function storeOutputsWatcherSubscription(s: AsyncSubscription): void;
-export declare function storeProcessJsonSubscription(s: AsyncSubscription): void;
 export declare function storeWatcherInstance(instance: Watcher): void;
 export declare function getWatcherInstance(): Watcher;
 export declare function storeOutputWatcherInstance(instance: Watcher): void;

package/src/daemon/server/shutdown-utils.js

@@ -1,34 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.respondWithErrorAndExit = exports.respondToClient = exports.resetInactivityTimeout = exports.handleServerProcessTermination = exports.getOutputWatcherInstance = exports.storeOutputWatcherInstance = exports.getWatcherInstance = exports.storeWatcherInstance = exports.storeProcessJsonSubscription = exports.storeOutputsWatcherSubscription = exports.getOutputsWatcherSubscription = exports.storeSourceWatcherSubscription = exports.getSourceWatcherSubscription = exports.SERVER_INACTIVITY_TIMEOUT_MS = void 0;
+exports.respondWithErrorAndExit = exports.respondToClient = exports.resetInactivityTimeout = exports.handleServerProcessTermination = exports.getOutputWatcherInstance = exports.storeOutputWatcherInstance = exports.getWatcherInstance = exports.storeWatcherInstance = exports.SERVER_INACTIVITY_TIMEOUT_MS = void 0;
 const workspace_root_1 = require("../../utils/workspace-root");
 const logger_1 = require("./logger");
 const socket_utils_1 = require("../socket-utils");
 const cache_1 = require("../cache");
 exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
-let sourceWatcherSubscription;
-let outputsWatcherSubscription;
-function getSourceWatcherSubscription() {
-    return sourceWatcherSubscription;
-}
-exports.getSourceWatcherSubscription = getSourceWatcherSubscription;
-function storeSourceWatcherSubscription(s) {
-    sourceWatcherSubscription = s;
-}
-exports.storeSourceWatcherSubscription = storeSourceWatcherSubscription;
-function getOutputsWatcherSubscription() {
-    return outputsWatcherSubscription;
-}
-exports.getOutputsWatcherSubscription = getOutputsWatcherSubscription;
-function storeOutputsWatcherSubscription(s) {
-    outputsWatcherSubscription = s;
-}
-exports.storeOutputsWatcherSubscription = storeOutputsWatcherSubscription;
-let processJsonSubscription;
-function storeProcessJsonSubscription(s) {
-    processJsonSubscription = s;
-}
-exports.storeProcessJsonSubscription = storeProcessJsonSubscription;
 let watcherInstance;
 function storeWatcherInstance(instance) {
     watcherInstance = instance;
@@ -51,18 +28,6 @@ async function handleServerProcessTermination({ server, reason, }) {
     try {
         server.close();
         (0, cache_1.deleteDaemonJsonProcessCache)();
-        if (sourceWatcherSubscription) {
-            await sourceWatcherSubscription.unsubscribe();
-            logger_1.serverLogger.watcherLog(`Unsubscribed from changes within: ${workspace_root_1.workspaceRoot} (sources)`);
-        }
-        if (outputsWatcherSubscription) {
-            await outputsWatcherSubscription.unsubscribe();
-            logger_1.serverLogger.watcherLog(`Unsubscribed from changes within: ${workspace_root_1.workspaceRoot} (outputs)`);
-        }
-        if (processJsonSubscription) {
-            await processJsonSubscription.unsubscribe();
-            logger_1.serverLogger.watcherLog(`Unsubscribed from changes within: ${workspace_root_1.workspaceRoot} (server-process.json)`);
-        }
         if (watcherInstance) {
             await watcherInstance.stop();
             logger_1.serverLogger.watcherLog(`Stopping the watcher for ${workspace_root_1.workspaceRoot} (sources)`);

package/src/daemon/server/watcher.d.ts

@@ -1,16 +1,12 @@
 /// <reference types="node" />
-import type { AsyncSubscription, Event } from '@parcel/watcher';
 import { Server } from 'net';
 import type { WatchEvent } from '../../native';
-export type FileWatcherCallback = (err: Error | string | null, changeEvents: Event[] | WatchEvent[] | null) => Promise<void>;
-export declare function subscribeToOutputsChanges(cb: FileWatcherCallback): Promise<AsyncSubscription>;
+export type FileWatcherCallback = (err: Error | string | null, changeEvents: WatchEvent[] | null) => Promise<void>;
 export declare function watchWorkspace(server: Server, cb: FileWatcherCallback): Promise<import("../../native").Watcher>;
 export declare function watchOutputFiles(cb: FileWatcherCallback): Promise<import("../../native").Watcher>;
-export declare function subscribeToWorkspaceChanges(server: Server, cb: FileWatcherCallback): Promise<AsyncSubscription>;
-export declare function subscribeToServerProcessJsonChanges(cb: () => void): Promise<AsyncSubscription>;
 /**
  * NOTE: An event type of "create" will also apply to the case where the user has restored
  * an original version of a file after modifying/deleting it by using git, so we adjust
  * our log language accordingly.
  */
-export declare function convertChangeEventsToLogMessage(changeEvents: Event[]): string;
+export declare function convertChangeEventsToLogMessage(changeEvents: WatchEvent[]): string;

package/src/daemon/server/watcher.js

@@ -1,42 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertChangeEventsToLogMessage = exports.subscribeToServerProcessJsonChanges = exports.subscribeToWorkspaceChanges = exports.watchOutputFiles = exports.watchWorkspace = exports.subscribeToOutputsChanges = void 0;
-/**
- * In addition to its native performance, another great advantage of `@parcel/watcher` is that it will
- * automatically take advantage of Facebook's watchman tool (https://facebook.github.io/watchman/) if
- * the user has it installed (but not require it if they don't).
- *
- * See https://github.com/parcel-bundler/watcher for more details.
- */
+exports.convertChangeEventsToLogMessage = exports.watchOutputFiles = exports.watchWorkspace = void 0;
 const workspace_root_1 = require("../../utils/workspace-root");
 const path_1 = require("path");
 const socket_utils_1 = require("../socket-utils");
 const shutdown_utils_1 = require("./shutdown-utils");
 const path_2 = require("../../utils/path");
 const ignore_1 = require("../../utils/ignore");
-const os_1 = require("os");
 const cache_1 = require("../cache");
 const ALWAYS_IGNORE = [...(0, ignore_1.getAlwaysIgnore)(workspace_root_1.workspaceRoot), socket_utils_1.FULL_OS_SOCKET_PATH];
-async function subscribeToOutputsChanges(cb) {
-    const watcher = await Promise.resolve().then(() => require('@parcel/watcher'));
-    return await watcher.subscribe(workspace_root_1.workspaceRoot, (err, events) => {
-        if (err) {
-            return cb(err, null);
-        }
-        else {
-            const workspaceRelativeEvents = [];
-            for (const event of events) {
-                const workspaceRelativeEvent = {
-                    type: event.type,
-                    path: (0, path_2.normalizePath)((0, path_1.relative)(workspace_root_1.workspaceRoot, event.path)),
-                };
-                workspaceRelativeEvents.push(workspaceRelativeEvent);
-            }
-            cb(null, workspaceRelativeEvents);
-        }
-    }, watcherOptions([...ALWAYS_IGNORE]));
-}
-exports.subscribeToOutputsChanges = subscribeToOutputsChanges;
 async function watchWorkspace(server, cb) {
     const { Watcher } = await Promise.resolve().then(() => require('../../native'));
     let relativeServerProcess = (0, path_2.normalizePath)((0, path_1.relative)(workspace_root_1.workspaceRoot, cache_1.serverProcessJsonPath));
@@ -83,60 +55,6 @@ async function watchOutputFiles(cb) {
     return watcher;
 }
 exports.watchOutputFiles = watchOutputFiles;
-async function subscribeToWorkspaceChanges(server, cb) {
-    /**
-     * The imports and exports of @nx/workspace are somewhat messy and far reaching across the repo (and beyond),
-     * and so it is much safer for us to lazily load here `@parcel/watcher` so that its inclusion is not inadvertently
-     * executed by packages which do not have its necessary native binaries available.
-     */
-    const watcher = await Promise.resolve().then(() => require('@parcel/watcher'));
-    const ignoreObj = (0, ignore_1.getIgnoreObject)();
-    return await watcher.subscribe(workspace_root_1.workspaceRoot, (err, events) => {
-        if (err) {
-            return cb(err, null);
-        }
-        let hasIgnoreFileUpdate = false;
-        // Most of our utilities (ignore, hashing etc) require unix-style workspace relative paths
-        const workspaceRelativeEvents = [];
-        for (const event of events) {
-            const workspaceRelativeEvent = {
-                type: event.type,
-                path: (0, path_2.normalizePath)((0, path_1.relative)(workspace_root_1.workspaceRoot, event.path)),
-            };
-            if (workspaceRelativeEvent.path.endsWith('.gitignore') ||
-                workspaceRelativeEvent.path === '.nxignore') {
-                hasIgnoreFileUpdate = true;
-            }
-            workspaceRelativeEvents.push(workspaceRelativeEvent);
-        }
-        // If the ignore files themselves have changed we need to dynamically update our cached ignoreGlobs
-        if (hasIgnoreFileUpdate) {
-            (0, shutdown_utils_1.handleServerProcessTermination)({
-                server,
-                reason: 'Stopping the daemon the set of ignored files changed.',
-            });
-        }
-        const nonIgnoredEvents = workspaceRelativeEvents
-            .filter(({ path }) => !!path)
-            .filter(({ path }) => !ignoreObj.ignores(path));
-        if (nonIgnoredEvents && nonIgnoredEvents.length > 0) {
-            cb(null, nonIgnoredEvents);
-        }
-    }, watcherOptions((0, ignore_1.getIgnoredGlobs)(workspace_root_1.workspaceRoot)));
-}
-exports.subscribeToWorkspaceChanges = subscribeToWorkspaceChanges;
-// TODO: When we update @parcel/watcher to a version that handles negation globs, then this can be folded into the workspace watcher
-async function subscribeToServerProcessJsonChanges(cb) {
-    const watcher = await Promise.resolve().then(() => require('@parcel/watcher'));
-    return await watcher.subscribe((0, path_1.dirname)(cache_1.serverProcessJsonPath), (err, events) => {
-        for (const event of events) {
-            if (event.path === cache_1.serverProcessJsonPath) {
-                cb();
-            }
-        }
-    }, watcherOptions([]));
-}
-exports.subscribeToServerProcessJsonChanges = subscribeToServerProcessJsonChanges;
 /**
  * NOTE: An event type of "create" will also apply to the case where the user has restored
  * an original version of a file after modifying/deleting it by using git, so we adjust
@@ -179,12 +97,3 @@ function convertChangeEventsToLogMessage(changeEvents) {
     return `${numCreatedOrRestoredFiles} file(s) created or restored, ${numModifiedFiles} file(s) modified, ${numDeletedFiles} file(s) deleted`;
 }
 exports.convertChangeEventsToLogMessage = convertChangeEventsToLogMessage;
-function watcherOptions(ignore) {
-    const options = {
-        ignore,
-    };
-    if ((0, os_1.platform)() === 'win32') {
-        options.backend = 'windows';
-    }
-    return options;
-}

package/src/generators/utils/project-configuration.js

@@ -143,16 +143,18 @@ function readAndCombineAllProjectConfigurations(tree) {
             const config = (0, project_json_1.buildProjectFromProjectJson)(json, projectFile);
             (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, config);
         }
-        else {
+        else if ((0, path_1.basename)(projectFile) === 'package.json') {
             const packageJson = (0, json_1.readJson)(tree, projectFile);
             const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, projectFile, (0, nx_json_1.readNxJson)(tree));
-            (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
-            // Inferred targets, tags, etc don't show up when running generators
-            // This is to help avoid running into issues when trying to update the workspace
-            {
-                name: config.name,
-                root: config.root,
-            });
+            if (!rootMap.has(config.root)) {
+                (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
+                // Inferred targets, tags, etc don't show up when running generators
+                // This is to help avoid running into issues when trying to update the workspace
+                {
+                    name: config.name,
+                    root: config.root,
+                });
+            }
         }
     }
     return (0, project_configuration_utils_1.readProjectConfigurationsFromRootMap)(rootMap);

package/src/migrations/update-15-0-0/prefix-outputs.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const project_configuration_1 = require("../../generators/utils/project-configuration");
 const nx_json_1 = require("../../generators/utils/nx-json");
-const path_1 = require("../../utils/path");
-const path_2 = require("path");
+const path_1 = require("path");
 const utils_1 = require("../../tasks-runner/utils");
 const json_1 = require("../../generators/utils/json");
 async function default_1(tree) {
@@ -29,8 +28,8 @@ async function default_1(tree) {
             (0, project_configuration_1.updateProjectConfiguration)(tree, projectName, project);
         }
         catch {
-            if (tree.exists((0, path_2.join)(project.root, 'package.json'))) {
-                (0, json_1.updateJson)(tree, (0, path_2.join)(project.root, 'package.json'), (json) => {
+            if (tree.exists((0, path_1.join)(project.root, 'package.json'))) {
+                (0, json_1.updateJson)(tree, (0, path_1.join)(project.root, 'package.json'), (json) => {
                     for (const target of Object.values(json.nx?.targets ?? {})) {
                         if (target.outputs) {
                             try {
@@ -51,11 +50,12 @@ async function default_1(tree) {
             if (!target.outputs) {
                 continue;
             }
-            target.outputs = target.outputs.map((output) => {
-                return /^{[\s\S]+}/.test(output)
-                    ? output
-                    : (0, path_1.joinPathFragments)('{workspaceRoot}', output);
-            });
+            try {
+                (0, utils_1.validateOutputs)(target.outputs);
+            }
+            catch (e) {
+                target.outputs = (0, utils_1.transformLegacyOutputs)('{projectRoot}', e);
+            }
         }
         (0, nx_json_1.updateNxJson)(tree, nxJson);
     }

package/src/project-graph/project-graph.js

@@ -44,7 +44,12 @@ exports.readCachedProjectGraph = readCachedProjectGraph;
 function readCachedProjectConfiguration(projectName) {
     const graph = readCachedProjectGraph();
     const node = graph.nodes[projectName];
-    return node.data;
+    try {
+        return node.data;
+    }
+    catch (e) {
+        throw new Error(`Cannot find project: '${projectName}' in your workspace.`);
+    }
 }
 exports.readCachedProjectConfiguration = readCachedProjectConfiguration;
 /**

package/src/project-graph/utils/normalize-project-nodes.js

@@ -6,7 +6,10 @@ const logger_1 = require("../../utils/logger");
 const project_configuration_utils_1 = require("../utils/project-configuration-utils");
 async function normalizeProjectNodes(ctx, builder, nxJson) {
     const toAdd = [];
-    const projects = Object.keys(ctx.projects);
+    // Sorting projects by name to make sure that the order of projects in the graph is deterministic.
+    // This is important to ensure that expanded properties referencing projects (e.g. implicit dependencies)
+    // are also deterministic, and thus don't cause the calculated project configuration hash to shift.
+    const projects = Object.keys(ctx.projects).sort();
     // Used for expanding implicit dependencies (e.g. `@proj/*` or `tag:foo`)
     const partialProjectGraphNodes = projects.reduce((graph, project) => {
         const projectConfiguration = ctx.projects[project];

package/src/project-graph/utils/retrieve-workspace-files.js

@@ -121,7 +121,9 @@ exports.retrieveProjectConfigurationsWithoutPluginInference = retrieveProjectCon
 function buildAllWorkspaceFiles(projectFileMap, globalFiles) {
     perf_hooks_1.performance.mark('get-all-workspace-files:start');
     let fileData = Object.values(projectFileMap).flat();
-    fileData = fileData.concat(globalFiles);
+    fileData = fileData
+        .concat(globalFiles)
+        .sort((a, b) => a.file.localeCompare(b.file));
     perf_hooks_1.performance.mark('get-all-workspace-files:end');
     perf_hooks_1.performance.measure('get-all-workspace-files', 'get-all-workspace-files:start', 'get-all-workspace-files:end');
     return fileData;

package/src/tasks-runner/utils.js

@@ -80,7 +80,7 @@ class InvalidOutputsError extends Error {
 function validateOutputs(outputs) {
     const invalidOutputs = new Set();
     for (const output of outputs) {
-        if (!/^{[\s\S]+}/.test(output)) {
+        if (!/^!?{[\s\S]+}/.test(output)) {
             invalidOutputs.add(output);
         }
     }
@@ -94,11 +94,15 @@ function transformLegacyOutputs(projectRoot, error) {
         if (!error.invalidOutputs.has(output)) {
             return output;
         }
-        const relativePath = (0, fileutils_1.isRelativePath)(output)
+        let [isNegated, outputPath] = output.startsWith('!')
+            ? [true, output.substring(1)]
+            : [false, output];
+        const relativePath = (0, fileutils_1.isRelativePath)(outputPath)
             ? output
-            : (0, path_1.relative)(projectRoot, output);
+            : (0, path_1.relative)(projectRoot, outputPath);
         const isWithinProject = !relativePath.startsWith('..');
-        return (0, path_2.joinPathFragments)(isWithinProject ? '{projectRoot}' : '{workspaceRoot}', isWithinProject ? relativePath : output);
+        return ((isNegated ? '!' : '') +
+            (0, path_2.joinPathFragments)(isWithinProject ? '{projectRoot}' : '{workspaceRoot}', isWithinProject ? relativePath : outputPath));
     });
 }
 exports.transformLegacyOutputs = transformLegacyOutputs;

package/src/utils/package-manager.d.ts

@@ -7,6 +7,7 @@ export interface PackageManagerCommands {
     addDev: string;
     rm: string;
     exec: string;
+    dlx: string;
     list: string;
     run: (script: string, args: string) => string;
 }

package/src/utils/package-manager.js

@@ -55,13 +55,14 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 addDev: useBerry ? 'yarn add -D' : 'yarn add -D -W',
                 rm: 'yarn remove',
                 exec: 'yarn',
+                dlx: useBerry ? 'yarn dlx' : 'yarn',
                 run: (script, args) => `yarn ${script} ${args}`,
                 list: useBerry ? 'yarn info --name-only' : 'yarn list',
             };
         },
         pnpm: () => {
             const pnpmVersion = getPackageManagerVersion('pnpm', root);
-            const useExec = (0, semver_1.gte)(pnpmVersion, '6.13.0');
+            const modernPnpm = (0, semver_1.gte)(pnpmVersion, '6.13.0');
             const includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
             const isPnpmWorkspace = (0, fs_1.existsSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'));
             return {
@@ -70,7 +71,8 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 add: isPnpmWorkspace ? 'pnpm add -w' : 'pnpm add',
                 addDev: isPnpmWorkspace ? 'pnpm add -Dw' : 'pnpm add -D',
                 rm: 'pnpm rm',
-                exec: useExec ? 'pnpm exec' : 'pnpx',
+                exec: modernPnpm ? 'pnpm exec' : 'pnpx',
+                dlx: modernPnpm ? 'pnpm dlx' : 'pnpx',
                 run: (script, args) => includeDoubleDashBeforeArgs
                     ? `pnpm run ${script} -- ${args}`
                     : `pnpm run ${script} ${args}`,
@@ -87,6 +89,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 addDev: 'npm install -D',
                 rm: 'npm rm',
                 exec: 'npx',
+                dlx: 'npx',
                 run: (script, args) => `npm run ${script} -- ${args}`,
                 list: 'npm ls',
             };

package/src/utils/params.js

@@ -532,10 +532,25 @@ function getPromptsForSchema(opts, schema, projectsConfigurations) {
             // Normalize x-prompt
             if (typeof v['x-prompt'] === 'string') {
                 const message = v['x-prompt'];
-                v['x-prompt'] = {
-                    type: v.type === 'boolean' ? 'confirm' : 'input',
-                    message,
-                };
+                if (v.type === 'boolean') {
+                    v['x-prompt'] = {
+                        type: 'confirm',
+                        message,
+                    };
+                }
+                else if (v.type === 'array' && v.items?.enum) {
+                    v['x-prompt'] = {
+                        type: 'multiselect',
+                        items: v.items.enum,
+                        message,
+                    };
+                }
+                else {
+                    v['x-prompt'] = {
+                        type: 'input',
+                        message,
+                    };
+                }
             }
             question.message = v['x-prompt'].message;
             question.validate = (s) => {