nx 14.4.1 → 14.5.0-beta.1

package/src/project-graph/build-nodes/workspace-projects.js

@@ -24,6 +24,9 @@ function buildWorkspaceProjectNodes(ctx, builder) {
                     ...nx.implicitDependencies,
                 ];
             }
+            if (nx === null || nx === void 0 ? void 0 : nx.namedInputs) {
+                p.namedInputs = Object.assign(Object.assign({}, (p.namedInputs || {})), nx.namedInputs);
+            }
         }
         p.targets = (0, nx_plugin_1.mergePluginTargetsWithNxTargets)(p.root, p.targets, (0, nx_plugin_1.loadNxPlugins)(ctx.workspace.plugins));
         const projectType = p.projectType === 'application'

package/src/project-graph/build-nodes/workspace-projects.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":"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"}

package/src/project-graph/nx-deps-cache.d.ts

@@ -9,7 +9,7 @@ export interface ProjectGraphCache {
         name: string;
         version: string;
     }[];
-    pluginsConfig: any;
+    pluginsConfig?: any;
     nodes: Record<string, ProjectGraphNode>;
     externalNodes?: Record<string, ProjectGraphExternalNode>;
     dependencies: Record<string, ProjectGraphDependency[]>;

package/src/tasks-runner/cache.d.ts

@@ -25,16 +25,27 @@ export declare class Cache {
     temporaryOutputPath(task: Task): string;
     removeRecordedOutputsHashes(outputs: string[]): Promise<void>;
     shouldCopyOutputsFromCache(taskWithCachedResult: TaskWithCachedResult, outputs: string[]): Promise<boolean>;
+    private expandOutputsInWorkspace;
+    private expandOutputsInCache;
+    private _expandOutputs;
     private copy;
     private remove;
     private recordOutputsHash;
     private areLatestOutputsHashesDifferentThanTaskHash;
     private getLatestRecordedHashForTask;
-    private isAnyOutputMissing;
+    private haveOutputsBeenAddedOrRemoved;
+    private getFilesInDirectory;
+    private visitDirectory;
     private getFileNameWithLatestRecordedHashForOutput;
+    private getLatestOutputHashFilename;
     private getFromLocalDir;
     private createCacheDir;
     private createTerminalOutputsDir;
     private ensureLatestOutputsHashesDir;
     private tryAndRetry;
 }
+/**
+ * Collapse Expanded Outputs back into a smaller set of directories/files to track
+ * Note: DO NOT USE, Only exported for unit testing
+ * */
+export declare function collapseExpandedOutputs(expandedOutputs: string[]): string[];

package/src/tasks-runner/cache.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Cache = void 0;
+exports.collapseExpandedOutputs = exports.Cache = void 0;
 const tslib_1 = require("tslib");
 const workspace_root_1 = require("../utils/workspace-root");
 const fs_extra_1 = require("fs-extra");
@@ -8,6 +8,7 @@ const path_1 = require("path");
 const child_process_1 = require("child_process");
 const cache_directory_1 = require("../utils/cache-directory");
 const os_1 = require("os");
+const fastGlob = require("fast-glob");
 class Cache {
     constructor(options) {
         this.options = options;
@@ -68,11 +69,13 @@ class Cache {
                 yield (0, fs_extra_1.mkdir)(td);
                 yield (0, fs_extra_1.writeFile)((0, path_1.join)(td, 'terminalOutput'), terminalOutput !== null && terminalOutput !== void 0 ? terminalOutput : 'no terminal output');
                 yield (0, fs_extra_1.mkdir)((0, path_1.join)(td, 'outputs'));
-                yield Promise.all(outputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const expandedOutputs = yield this.expandOutputsInWorkspace(outputs);
+                const collapsedOutputs = collapseExpandedOutputs(expandedOutputs);
+                yield Promise.all(expandedOutputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     const src = (0, path_1.join)(this.root, f);
                     if (yield (0, fs_extra_1.pathExists)(src)) {
-                        const cached = (0, path_1.join)(td, 'outputs', f);
                         const isFile = (yield (0, fs_extra_1.lstat)(src)).isFile();
+                        const cached = (0, path_1.join)(td, 'outputs', f);
                         const directory = isFile ? (0, path_1.dirname)(cached) : cached;
                         yield (0, fs_extra_1.mkdir)(directory, { recursive: true });
                         yield this.copy(src, cached);
@@ -87,7 +90,7 @@ class Cache {
                 if (this.options.remoteCache) {
                     yield this.options.remoteCache.store(task.hash, this.cachePath);
                 }
-                yield this.recordOutputsHash(outputs, task.hash);
+                yield this.recordOutputsHash(collapsedOutputs, task.hash);
                 if (terminalOutput) {
                     const outputPath = this.temporaryOutputPath(task);
                     yield (0, fs_extra_1.writeFile)(outputPath, terminalOutput);
@@ -98,8 +101,10 @@ class Cache {
     copyFilesFromCache(hash, cachedResult, outputs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return this.tryAndRetry(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                yield this.removeRecordedOutputsHashes(outputs);
-                yield Promise.all(outputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const expandedOutputs = yield this.expandOutputsInCache(outputs, cachedResult);
+                const collapsedOutputs = collapseExpandedOutputs(expandedOutputs);
+                yield this.removeRecordedOutputsHashes(collapsedOutputs);
+                yield Promise.all(expandedOutputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     const cached = (0, path_1.join)(cachedResult.outputsPath, f);
                     if (yield (0, fs_extra_1.pathExists)(cached)) {
                         const isFile = (yield (0, fs_extra_1.lstat)(cached)).isFile();
@@ -111,7 +116,7 @@ class Cache {
                         yield this.copy(cached, src);
                     }
                 })));
-                yield this.recordOutputsHash(outputs, hash);
+                yield this.recordOutputsHash(collapsedOutputs, hash);
             }));
         });
     }
@@ -120,70 +125,120 @@ class Cache {
     }
     removeRecordedOutputsHashes(outputs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            for (const output of outputs) {
+            yield Promise.all(outputs.map((output) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
                 try {
                     yield (0, fs_extra_1.unlink)(hashFile);
                 }
                 catch (_a) { }
-            }
+            })));
         });
     }
     shouldCopyOutputsFromCache(taskWithCachedResult, outputs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return ((yield this.areLatestOutputsHashesDifferentThanTaskHash(outputs, taskWithCachedResult.task.hash)) ||
-                (yield this.isAnyOutputMissing(taskWithCachedResult.cachedResult, outputs)));
+            const [outputsInCache, outputsInWorkspace] = yield Promise.all([
+                this.expandOutputsInCache(outputs, taskWithCachedResult.cachedResult),
+                this.expandOutputsInWorkspace(outputs),
+            ]);
+            const collapsedOutputsInCache = collapseExpandedOutputs(outputsInCache);
+            const [latestHashesDifferent, outputMissing] = yield Promise.all([
+                this.areLatestOutputsHashesDifferentThanTaskHash(collapsedOutputsInCache, taskWithCachedResult),
+                this.haveOutputsBeenAddedOrRemoved(taskWithCachedResult, outputsInCache, outputsInWorkspace),
+            ]);
+            return latestHashesDifferent || outputMissing;
         });
     }
-    copy(src, directory) {
-        if (this.useFsExtraToCopyAndRemove) {
-            return (0, fs_extra_1.copy)(src, directory);
-        }
-        return new Promise((res, rej) => {
-            (0, child_process_1.execFile)('cp', ['-a', src, (0, path_1.dirname)(directory)], (error) => {
-                if (!error) {
-                    res();
-                }
-                else {
-                    this.useFsExtraToCopyAndRemove = true;
-                    (0, fs_extra_1.copy)(src, directory).then(res, rej);
+    expandOutputsInWorkspace(outputs) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this._expandOutputs(outputs, workspace_root_1.workspaceRoot);
+        });
+    }
+    expandOutputsInCache(outputs, cachedResult) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this._expandOutputs(outputs, cachedResult.outputsPath);
+        });
+    }
+    _expandOutputs(outputs, cwd) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return (yield Promise.all(outputs.map((entry) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                if (yield (0, fs_extra_1.pathExists)((0, path_1.join)(cwd, entry))) {
+                    return entry;
                 }
+                return fastGlob(entry, { cwd });
+            })))).flat();
+        });
+    }
+    copy(src, destination) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.useFsExtraToCopyAndRemove) {
+                return (0, fs_extra_1.copy)(src, destination);
+            }
+            return new Promise((res, rej) => {
+                (0, child_process_1.execFile)('cp', ['-a', src, (0, path_1.dirname)(destination)], (error) => {
+                    if (!error) {
+                        res();
+                    }
+                    else {
+                        this.useFsExtraToCopyAndRemove = true;
+                        (0, fs_extra_1.copy)(src, destination).then(res, rej);
+                    }
+                });
             });
         });
     }
-    remove(folder) {
-        if (this.useFsExtraToCopyAndRemove) {
-            return (0, fs_extra_1.remove)(folder);
-        }
-        return new Promise((res, rej) => {
-            (0, child_process_1.execFile)('rm', ['-rf', folder], (error) => {
-                if (!error) {
-                    res();
-                }
-                else {
-                    this.useFsExtraToCopyAndRemove = true;
-                    (0, fs_extra_1.remove)(folder).then(res, rej);
-                }
+    remove(path) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.useFsExtraToCopyAndRemove) {
+                return (0, fs_extra_1.remove)(path);
+            }
+            return new Promise((res, rej) => {
+                (0, child_process_1.execFile)('rm', ['-rf', path], (error) => {
+                    if (!error) {
+                        res();
+                    }
+                    else {
+                        this.useFsExtraToCopyAndRemove = true;
+                        (0, fs_extra_1.remove)(path).then(res, rej);
+                    }
+                });
             });
         });
     }
     recordOutputsHash(outputs, hash) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            for (const output of outputs) {
+            yield (0, fs_extra_1.mkdir)(this.latestOutputsHashesDir, { recursive: true });
+            yield Promise.all(outputs.map((output) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
                 try {
-                    yield (0, fs_extra_1.mkdir)((0, path_1.dirname)(hashFile), { recursive: true });
                     yield (0, fs_extra_1.writeFile)(hashFile, hash);
                 }
                 catch (_a) { }
-            }
+            })));
         });
     }
-    areLatestOutputsHashesDifferentThanTaskHash(outputs, hash) {
+    areLatestOutputsHashesDifferentThanTaskHash(outputs, { task }) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            for (let output of outputs) {
-                if ((yield this.getLatestRecordedHashForTask(output)) !== hash)
+            const latestExistingOutputHashes = (yield (0, fs_extra_1.readdir)(this.latestOutputsHashesDir)).map((m) => m.substring(0, m.length - 5));
+            // Purposely blocking
+            for (const output of outputs) {
+                const latestOutputFilename = this.getLatestOutputHashFilename(output);
+                const conflicts = latestExistingOutputHashes.filter((w) => {
+                    // This is the exact same output
+                    return (w !== latestOutputFilename &&
+                        // This is an child of the output
+                        (latestOutputFilename.startsWith(w) ||
+                            // This is a parent of the output
+                            w.startsWith(latestOutputFilename)));
+                });
+                if (conflicts.length > 0) {
+                    // Clean up the conflicts
+                    yield Promise.all(conflicts.map((conflict) => (0, fs_extra_1.unlink)((0, path_1.join)(this.latestOutputsHashesDir, conflict + '.hash'))));
+                    return true;
+                }
+                const hash = yield this.getLatestRecordedHashForTask(output);
+                if (!!hash && hash !== task.hash) {
                     return true;
+                }
             }
             return false;
         });
@@ -198,31 +253,72 @@ class Cache {
             }
         });
     }
-    isAnyOutputMissing(cachedResult, outputs) {
+    haveOutputsBeenAddedOrRemoved(result, cachedOutputs, workspaceFiles) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            for (let output of outputs) {
-                const cacheOutputPath = (0, path_1.join)(cachedResult.outputsPath, output);
-                const rootOutputPath = (0, path_1.join)(this.root, output);
-                if ((yield (0, fs_extra_1.pathExists)(cacheOutputPath)) &&
-                    (yield (0, fs_extra_1.lstat)(cacheOutputPath)).isFile()) {
-                    return ((yield (0, fs_extra_1.pathExists)((0, path_1.join)(cachedResult.outputsPath, output))) &&
-                        !(yield (0, fs_extra_1.pathExists)((0, path_1.join)(this.root, output))));
+            const workspaceSet = new Set(workspaceFiles);
+            for (const path of cachedOutputs) {
+                if (!(yield (0, fs_extra_1.pathExists)((0, path_1.join)(workspace_root_1.workspaceRoot, path)))) {
+                    return true;
                 }
-                const haveDifferentAmountOfFiles = (yield (0, fs_extra_1.pathExists)(cacheOutputPath)) &&
-                    (yield (0, fs_extra_1.pathExists)(rootOutputPath)) &&
-                    (yield (0, fs_extra_1.readdir)(cacheOutputPath)).length !==
-                        (yield (0, fs_extra_1.readdir)(rootOutputPath)).length;
-                if (((yield (0, fs_extra_1.pathExists)(cacheOutputPath)) &&
-                    !(yield (0, fs_extra_1.pathExists)(rootOutputPath))) ||
-                    haveDifferentAmountOfFiles) {
+                const isFile = (yield (0, fs_extra_1.lstat)(path)).isFile();
+                if (!workspaceSet.has(path)) {
                     return true;
                 }
+                if (!isFile) {
+                    const [cachedFiles, workspaceFiles] = yield Promise.all([
+                        this.getFilesInDirectory((0, path_1.join)(result.cachedResult.outputsPath, path)),
+                        this.getFilesInDirectory((0, path_1.join)(workspace_root_1.workspaceRoot, path)),
+                    ]);
+                    if (workspaceFiles.size !== cachedFiles.size) {
+                        return true;
+                    }
+                    for (const file of cachedFiles) {
+                        if (!workspaceFiles.has(file)) {
+                            return true;
+                        }
+                        workspaceFiles.delete(file);
+                    }
+                    if (workspaceFiles.size !== 0) {
+                        return true;
+                    }
+                }
+                workspaceSet.delete(path);
+            }
+            if (workspaceSet.size !== 0) {
+                return true;
             }
             return false;
         });
     }
+    getFilesInDirectory(path) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const paths = new Set();
+            yield this.visitDirectory(path, (entry) => {
+                paths.add((0, path_1.relative)(path, entry));
+            });
+            return paths;
+        });
+    }
+    visitDirectory(path, visitor) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const children = yield (0, fs_extra_1.readdir)((0, path_1.join)(path), {
+                withFileTypes: true,
+            });
+            yield Promise.all(children.map((child) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                if (child.isFile()) {
+                    visitor((0, path_1.join)(path, child.name));
+                }
+                else {
+                    yield this.visitDirectory((0, path_1.join)(path, child.name), visitor);
+                }
+            })));
+        });
+    }
     getFileNameWithLatestRecordedHashForOutput(output) {
-        return (0, path_1.join)(this.latestOutputsHashesDir, `${output.split(path_1.sep).join('-')}.hash`);
+        return (0, path_1.join)(this.latestOutputsHashesDir, `${this.getLatestOutputHashFilename(output)}.hash`);
+    }
+    getLatestOutputHashFilename(output) {
+        return output.split(path_1.sep).join('-');
     }
     getFromLocalDir(task) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -281,4 +377,46 @@ class Cache {
     }
 }
 exports.Cache = Cache;
+/**
+ * Heuristic to prevent writing too many hash files
+ */
+const MAX_OUTPUTS_TO_CHECK_HASHES = 5;
+/**
+ * Collapse Expanded Outputs back into a smaller set of directories/files to track
+ * Note: DO NOT USE, Only exported for unit testing
+ * */
+function collapseExpandedOutputs(expandedOutputs) {
+    var _a;
+    const tree = [];
+    // Create a Tree of directories/files
+    for (const output of expandedOutputs) {
+        const pathParts = [];
+        pathParts.unshift(output);
+        let dir = (0, path_1.dirname)(output);
+        while (dir !== (0, path_1.dirname)(dir)) {
+            pathParts.unshift(dir);
+            dir = (0, path_1.dirname)(dir);
+        }
+        for (let i = 0; i < pathParts.length; i++) {
+            (_a = tree[i]) !== null && _a !== void 0 ? _a : (tree[i] = new Set());
+            tree[i].add(pathParts[i]);
+        }
+    }
+    // Find a level in the tree that has too many outputs
+    if (tree.length === 0) {
+        return [];
+    }
+    let j = 0;
+    let level = tree[j];
+    for (j = 0; j < tree.length; j++) {
+        level = tree[j];
+        if (level.size > MAX_OUTPUTS_TO_CHECK_HASHES) {
+            break;
+        }
+    }
+    // Return the level before the level with too many outputs
+    // If the first level has too many outputs, return that one.
+    return Array.from(tree[Math.max(0, j - 1)]);
+}
+exports.collapseExpandedOutputs = collapseExpandedOutputs;
 //# sourceMappingURL=cache.js.map

package/src/tasks-runner/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,uCAWkB;AAClB,+BAAmD;AAEnD,iDAAgD;AAChD,8DAAoD;AACpD,2BAA8B;AAW9B,MAAa,KAAK;IAOhB,YAA6B,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;QAN/D,SAAI,GAAG,8BAAa,CAAC;QACrB,cAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClC,uBAAkB,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACrD,2BAAsB,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAC7D,8BAAyB,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC;IAEe,CAAC;IAEnE,qBAAqB;QACnB;;;WAGG;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAChE,IAAI,kBAAkB,EAAE;YACtB,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;YACpE,IAAI;gBACF,MAAM,CAAC,GAAG,IAAA,qBAAK,EAAC,MAAM,EAAE,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE;oBAC3D,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAC;gBACH,CAAC,CAAC,KAAK,EAAE,CAAC;aACX;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;gBAChE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aACxB;SACF;IACH,CAAC;IAEK,GAAG,CAAC,IAAU;;YAClB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAE7C,IAAI,GAAG,EAAE;gBACP,uCAAY,GAAG,KAAE,MAAM,EAAE,KAAK,IAAG;aAClC;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBACnC,oDAAoD;gBACpD,uBAAuB;gBACvB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBACnE,6BAA6B;gBAC7B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9C,OAAO,IAAI,CAAC,CAAC,iCAAM,IAAI,KAAE,MAAM,EAAE,IAAI,IAAG,CAAC,CAAC,IAAI,CAAC;aAChD;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IAEK,GAAG,CACP,IAAU,EACV,cAA6B,EAC7B,OAAiB,EACjB,IAAY;;YAEZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAS,EAAE;gBACjC,MAAM,EAAE,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC;gBAE7D,iEAAiE;gBACjE,MAAM,IAAA,iBAAM,EAAC,QAAQ,CAAC,CAAC;gBACvB,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAEtB,MAAM,IAAA,gBAAK,EAAC,EAAE,CAAC,CAAC;gBAChB,MAAM,IAAA,oBAAS,EACb,IAAA,WAAI,EAAC,EAAE,EAAE,gBAAgB,CAAC,EAC1B,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,oBAAoB,CACvC,CAAC;gBAEF,MAAM,IAAA,gBAAK,EAAC,IAAA,WAAI,EAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;gBACjC,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAO,CAAC,EAAE,EAAE;oBACtB,MAAM,GAAG,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC/B,IAAI,MAAM,IAAA,qBAAU,EAAC,GAAG,CAAC,EAAE;wBACzB,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;wBACtC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,gBAAK,EAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;wBAC3C,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;wBACpD,MAAM,IAAA,gBAAK,EAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC5C,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;qBAC9B;gBACH,CAAC,CAAA,CAAC,CACH,CAAC;gBACF,uEAAuE;gBACvE,kEAAkE;gBAClE,2EAA2E;gBAC3E,iCAAiC;gBACjC,MAAM,IAAA,oBAAS,EAAC,IAAA,WAAI,EAAC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACnD,MAAM,IAAA,oBAAS,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAElC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;iBACjE;gBAED,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEjD,IAAI,cAAc,EAAE;oBAClB,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;oBAClD,MAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;iBAC7C;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;IAEK,kBAAkB,CACtB,IAAY,EACZ,YAA0B,EAC1B,OAAiB;;YAEjB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAS,EAAE;gBACjC,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;gBAChD,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAO,CAAC,EAAE,EAAE;oBACtB,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;oBACjD,IAAI,MAAM,IAAA,qBAAU,EAAC,MAAM,CAAC,EAAE;wBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,gBAAK,EAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;wBAC9C,MAAM,GAAG,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;wBAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACvB,sDAAsD;wBACtD,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;wBACpD,MAAM,IAAA,gBAAK,EAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC5C,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;qBAC9B;gBACH,CAAC,CAAA,CAAC,CACH,CAAC;gBACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC9C,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;IAED,mBAAmB,CAAC,IAAU;QAC5B,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAEK,2BAA2B,CAAC,OAAiB;;YACjD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,0CAA0C,CAAC,MAAM,CAAC,CAAC;gBACzE,IAAI;oBACF,MAAM,IAAA,iBAAM,EAAC,QAAQ,CAAC,CAAC;iBACxB;gBAAC,WAAM,GAAE;aACX;QACH,CAAC;KAAA;IAEK,0BAA0B,CAC9B,oBAA0C,EAC1C,OAAiB;;YAEjB,OAAO,CACL,CAAC,MAAM,IAAI,CAAC,2CAA2C,CACrD,OAAO,EACP,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAC/B,CAAC;gBACF,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAC5B,oBAAoB,CAAC,YAAY,EACjC,OAAO,CACR,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEO,IAAI,CAAC,GAAW,EAAE,SAAiB;QACzC,IAAI,IAAI,CAAC,yBAAyB,EAAE;YAClC,OAAO,IAAA,eAAI,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SAC7B;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,IAAA,wBAAQ,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;gBACxD,IAAI,CAAC,KAAK,EAAE;oBACV,GAAG,EAAE,CAAC;iBACP;qBAAM;oBACL,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;oBACtC,IAAA,eAAI,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;iBACrC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,MAAc;QAC3B,IAAI,IAAI,CAAC,yBAAyB,EAAE;YAClC,OAAO,IAAA,iBAAM,EAAC,MAAM,CAAC,CAAC;SACvB;QAED,OAAO,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACpC,IAAA,wBAAQ,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;gBACxC,IAAI,CAAC,KAAK,EAAE;oBACV,GAAG,EAAE,CAAC;iBACP;qBAAM;oBACL,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;oBACtC,IAAA,iBAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;iBAC/B;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEa,iBAAiB,CAC7B,OAAiB,EACjB,IAAY;;YAEZ,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,0CAA0C,CAAC,MAAM,CAAC,CAAC;gBACzE,IAAI;oBACF,MAAM,IAAA,gBAAK,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBACpD,MAAM,IAAA,oBAAS,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;iBACjC;gBAAC,WAAM,GAAE;aACX;QACH,CAAC;KAAA;IAEa,2CAA2C,CACvD,OAAiB,EACjB,IAAY;;YAEZ,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;gBAC1B,IAAI,CAAC,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI;oBAC5D,OAAO,IAAI,CAAC;aACf;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KAAA;IAEa,4BAA4B,CACxC,MAAc;;YAEd,IAAI;gBACF,OAAO,MAAM,IAAA,mBAAQ,EACnB,IAAI,CAAC,0CAA0C,CAAC,MAAM,CAAC,EACvD,OAAO,CACR,CAAC;aACH;YAAC,WAAM;gBACN,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IAEa,kBAAkB,CAC9B,YAA0B,EAC1B,OAAiB;;YAEjB,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;gBAC1B,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBAC/D,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAE/C,IACE,CAAC,MAAM,IAAA,qBAAU,EAAC,eAAe,CAAC,CAAC;oBACnC,CAAC,MAAM,IAAA,gBAAK,EAAC,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,EACvC;oBACA,OAAO,CACL,CAAC,MAAM,IAAA,qBAAU,EAAC,IAAA,WAAI,EAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;wBAC1D,CAAC,CAAC,MAAM,IAAA,qBAAU,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAC7C,CAAC;iBACH;gBAED,MAAM,0BAA0B,GAC9B,CAAC,MAAM,IAAA,qBAAU,EAAC,eAAe,CAAC,CAAC;oBACnC,CAAC,MAAM,IAAA,qBAAU,EAAC,cAAc,CAAC,CAAC;oBAClC,CAAC,MAAM,IAAA,kBAAO,EAAC,eAAe,CAAC,CAAC,CAAC,MAAM;wBACrC,CAAC,MAAM,IAAA,kBAAO,EAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;gBAE3C,IACE,CAAC,CAAC,MAAM,IAAA,qBAAU,EAAC,eAAe,CAAC,CAAC;oBAClC,CAAC,CAAC,MAAM,IAAA,qBAAU,EAAC,cAAc,CAAC,CAAC,CAAC;oBACtC,0BAA0B,EAC1B;oBACA,OAAO,IAAI,CAAC;iBACb;aACF;YACD,OAAO,KAAK,CAAC;QACf,CAAC;KAAA;IAEO,0CAA0C,CAAC,MAAc;QAC/D,OAAO,IAAA,WAAI,EACT,IAAI,CAAC,sBAAsB,EAC3B,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CACtC,CAAC;IACJ,CAAC;IAEa,eAAe,CAAC,IAAU;;YACtC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC;YAC7D,MAAM,EAAE,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAE3C,IAAI,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,EAAE;gBAC9B,MAAM,cAAc,GAAG,MAAM,IAAA,mBAAQ,EACnC,IAAA,WAAI,EAAC,EAAE,EAAE,gBAAgB,CAAC,EAC1B,OAAO,CACR,CAAC;gBACF,IAAI,IAAI,GAAG,CAAC,CAAC;gBACb,IAAI;oBACF,IAAI,GAAG,MAAM,CAAC,MAAM,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC1D;gBAAC,WAAM,GAAE;gBACV,OAAO;oBACL,cAAc;oBACd,WAAW,EAAE,IAAA,WAAI,EAAC,EAAE,EAAE,SAAS,CAAC;oBAChC,IAAI;iBACL,CAAC;aACH;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IAEO,cAAc;QACpB,IAAA,oBAAS,EAAC,0BAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,OAAO,0BAAQ,CAAC;IAClB,CAAC;IAEO,wBAAwB;QAC9B,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QACrD,IAAA,oBAAS,EAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,4BAA4B;QAClC,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QACzD,IAAA,oBAAS,EAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,WAAW,CAAI,EAAoB;QACzC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,WAAW,GAAG,GAAG,CAAC;QACxB,MAAM,IAAI,GAAG,GAAS,EAAE;YACtB,IAAI;gBACF,QAAQ,EAAE,CAAC;gBACX,OAAO,MAAM,EAAE,EAAE,CAAC;aACnB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,QAAQ,KAAK,EAAE,EAAE;oBACnB,yCAAyC;oBACzC,MAAM,CAAC,CAAC;iBACT;gBACD,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC;gBACpE,OAAO,MAAM,IAAI,EAAE,CAAC;aACrB;QACH,CAAC,CAAA,CAAC;QACF,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF;AArUD,sBAqUC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}

package/src/tasks-runner/create-task-graph.d.ts

@@ -13,7 +13,7 @@ export declare class ProcessTasks {
     };
     constructor(defaultDependencyConfigs: TargetDependencies, projectGraph: ProjectGraph);
     processTasks(projectNames: string[], targets: string[], configuration: string, overrides: Object): string[];
-    processTask(task: Task, projectUsedToDeriveDependencies: string, configuration: string): void;
+    processTask(task: Task, projectUsedToDeriveDependencies: string, configuration: string, overrides: Object): void;
     createTask(id: string, project: ProjectGraphProjectNode, target: string, resolvedConfiguration: string | undefined, overrides: Object): Task;
     resolveConfiguration(project: ProjectGraphProjectNode, target: string, configuration: string | undefined): string;
     getId(project: string, target: string, configuration: string | undefined): string;

package/src/tasks-runner/create-task-graph.js

@@ -23,11 +23,11 @@ class ProcessTasks {
         }
         for (const taskId of Object.keys(this.tasks)) {
             const task = this.tasks[taskId];
-            this.processTask(task, task.target.project, configuration);
+            this.processTask(task, task.target.project, configuration, overrides);
         }
         return Object.keys(this.dependencies).filter((d) => this.dependencies[d].length === 0);
     }
-    processTask(task, projectUsedToDeriveDependencies, configuration) {
+    processTask(task, projectUsedToDeriveDependencies, configuration, overrides) {
         const seenKey = `${task.id}-${projectUsedToDeriveDependencies}`;
         if (this.seen.has(seenKey)) {
             return;
@@ -35,6 +35,9 @@ class ProcessTasks {
         this.seen.add(seenKey);
         const dependencyConfigs = (0, utils_1.getDependencyConfigs)({ project: task.target.project, target: task.target.target }, this.defaultDependencyConfigs, this.projectGraph);
         for (const dependencyConfig of dependencyConfigs) {
+            const taskOverrides = dependencyConfig.params === 'forward'
+                ? overrides
+                : { __overrides_unparsed__: [] };
             if (dependencyConfig.projects === 'dependencies') {
                 for (const dep of this.projectGraph.dependencies[projectUsedToDeriveDependencies]) {
                     const depProject = this.projectGraph.nodes[dep.target];
@@ -48,14 +51,14 @@ class ProcessTasks {
                             this.dependencies[task.id].push(depTargetId);
                         }
                         if (!this.tasks[depTargetId]) {
-                            const newTask = this.createTask(depTargetId, depProject, dependencyConfig.target, resolvedConfiguration, { __overrides_unparsed__: [] });
+                            const newTask = this.createTask(depTargetId, depProject, dependencyConfig.target, resolvedConfiguration, taskOverrides);
                             this.tasks[depTargetId] = newTask;
                             this.dependencies[depTargetId] = [];
-                            this.processTask(newTask, newTask.target.project, configuration);
+                            this.processTask(newTask, newTask.target.project, configuration, taskOverrides);
                         }
                     }
                     else {
-                        this.processTask(task, depProject.name, configuration);
+                        this.processTask(task, depProject.name, configuration, taskOverrides);
                     }
                 }
             }
@@ -68,10 +71,10 @@ class ProcessTasks {
                         this.dependencies[task.id].push(selfTaskId);
                     }
                     if (!this.tasks[selfTaskId]) {
-                        const newTask = this.createTask(selfTaskId, selfProject, dependencyConfig.target, resolvedConfiguration, { __overrides_unparsed__: [] });
+                        const newTask = this.createTask(selfTaskId, selfProject, dependencyConfig.target, resolvedConfiguration, taskOverrides);
                         this.tasks[selfTaskId] = newTask;
                         this.dependencies[selfTaskId] = [];
-                        this.processTask(newTask, newTask.target.project, configuration);
+                        this.processTask(newTask, newTask.target.project, configuration, taskOverrides);
                     }
                 }
             }

package/src/tasks-runner/create-task-graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-task-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/create-task-graph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-task-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/create-task-graph.ts"],"names":[],"mappings":"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"}

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

@@ -1,8 +1,11 @@
-import { TargetConfiguration } from '../config/workspace-json-project-json';
+import { InputDefinition, TargetConfiguration } from '../config/workspace-json-project-json';
 export declare type PackageJsonTargetConfiguration = Omit<TargetConfiguration, 'executor'>;
 export interface NxProjectPackageJsonConfiguration {
     implicitDependencies?: string[];
     tags?: string[];
+    namedInputs?: {
+        [inputName: string]: (string | InputDefinition)[];
+    };
     targets?: Record<string, PackageJsonTargetConfiguration>;
 }
 export declare type PackageGroup = (string | {
@@ -47,7 +50,7 @@ export declare function buildTargetFromScript(script: string, nx: NxProjectPacka
     options: any;
     outputs?: string[];
     dependsOn?: (string | import("../config/workspace-json-project-json").TargetDependencyConfig)[];
-    inputs?: (string | import("../config/workspace-json-project-json").InputDefinition)[];
+    inputs?: (string | InputDefinition)[];
     configurations?: {
         [config: string]: any;
     };

package/src/utils/package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,+BAAqC;AAErC,2CAA2C;AAC3C,qDAAiD;AAyDjD,SAAgB,mBAAmB,CACjC,IAA0B;IAE1B,MAAM,uBAAuB,GAAG,CAC9B,QAA6C,EAClB,EAAE;QAC7B,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;SACnD;QAED,uCACK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAChE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACzE;IACJ,CAAC,CAAC;IAEF,qDACK,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAC1C,uBAAuB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAE9C,uBAAuB,CAAC,IAAW,CAAC,EACvC;AACJ,CAAC;AAzBD,kDAyBC;AAED,SAAgB,qBAAqB,CACnC,MAAc,EACd,EAAqC;;IAErC,MAAM,qBAAqB,GAAG,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,0CAAG,MAAM,CAAC,KAAI,EAAE,CAAC;IAE1D,uCACK,qBAAqB,KACxB,QAAQ,EAAE,eAAe,EACzB,OAAO,kCACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,MAAM,OAER;AACJ,CAAC;AAdD,sDAcC;AAED,SAAgB,qBAAqB,CACnC,eAAuB,EACvB,YAAY,GAAG,CAAC,8BAAa,CAAC;IAK9B,IAAI,eAAuB,CAAC;IAC5B,IAAI,WAAwB,CAAC;IAE7B,IAAI;QACF,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,eAAe,eAAe,EAAE;YACnE,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;QACH,WAAW,GAAG,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;KAC7C;IAAC,WAAM;QACN,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE;YAClD,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;QACH,IAAI,cAAc,GAAG,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC;QACzC,eAAe,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAEvD,OAAO,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YACnC,cAAc,GAAG,IAAA,cAAO,EAAC,cAAc,CAAC,CAAC;YACzC,eAAe,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC;SACxD;QAED,WAAW,GAAG,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;QAC5C,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,eAAe,EAAE;YAC5D,MAAM,IAAI,KAAK,CACb,gBAAgB,WAAW,CAAC,IAAI,2BAA2B,eAAe,eAAe,CAC1F,CAAC;SACH;KACF;IAED,OAAO;QACL,WAAW;QACX,IAAI,EAAE,eAAe;KACtB,CAAC;AACJ,CAAC;AAvCD,sDAuCC"}
+{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,+BAAqC;AAKrC,2CAA2C;AAC3C,qDAAiD;AA0DjD,SAAgB,mBAAmB,CACjC,IAA0B;IAE1B,MAAM,uBAAuB,GAAG,CAC9B,QAA6C,EAClB,EAAE;QAC7B,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;SACnD;QAED,uCACK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAChE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACzE;IACJ,CAAC,CAAC;IAEF,qDACK,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAC1C,uBAAuB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAE9C,uBAAuB,CAAC,IAAW,CAAC,EACvC;AACJ,CAAC;AAzBD,kDAyBC;AAED,SAAgB,qBAAqB,CACnC,MAAc,EACd,EAAqC;;IAErC,MAAM,qBAAqB,GAAG,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,0CAAG,MAAM,CAAC,KAAI,EAAE,CAAC;IAE1D,uCACK,qBAAqB,KACxB,QAAQ,EAAE,eAAe,EACzB,OAAO,kCACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,MAAM,OAER;AACJ,CAAC;AAdD,sDAcC;AAED,SAAgB,qBAAqB,CACnC,eAAuB,EACvB,YAAY,GAAG,CAAC,8BAAa,CAAC;IAK9B,IAAI,eAAuB,CAAC;IAC5B,IAAI,WAAwB,CAAC;IAE7B,IAAI;QACF,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,eAAe,eAAe,EAAE;YACnE,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;QACH,WAAW,GAAG,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;KAC7C;IAAC,WAAM;QACN,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE;YAClD,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;QACH,IAAI,cAAc,GAAG,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC;QACzC,eAAe,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAEvD,OAAO,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YACnC,cAAc,GAAG,IAAA,cAAO,EAAC,cAAc,CAAC,CAAC;YACzC,eAAe,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC;SACxD;QAED,WAAW,GAAG,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;QAC5C,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,eAAe,EAAE;YAC5D,MAAM,IAAI,KAAK,CACb,gBAAgB,WAAW,CAAC,IAAI,2BAA2B,eAAe,eAAe,CAC1F,CAAC;SACH;KACF;IAED,OAAO;QACL,WAAW;QACX,IAAI,EAAE,eAAe;KACtB,CAAC;AACJ,CAAC;AAvCD,sDAuCC"}

package/src/utils/package-manager.js

@@ -51,11 +51,12 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
             const pnpmVersion = getPackageManagerVersion('pnpm');
             const useExec = (0, semver_1.gte)(pnpmVersion, '6.13.0');
             const includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
+            const isPnpmWorkspace = (0, fs_1.existsSync)('pnpm-workspace.yaml');
             return {
                 install: 'pnpm install --no-frozen-lockfile',
                 ciInstall: 'pnpm install --frozen-lockfile',
-                add: 'pnpm add',
-                addDev: 'pnpm add -D',
+                add: isPnpmWorkspace ? 'pnpm add -w' : 'pnpm add',
+                addDev: isPnpmWorkspace ? 'pnpm add -Dw' : 'pnpm add -D',
                 addGlobal: 'pnpm add -g',
                 rm: 'pnpm rm',
                 exec: useExec ? 'pnpm exec' : 'pnpx',