nx 14.4.0 → 14.5.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/package.json +4 -4
  3. package/src/command-line/examples.js +1 -1
  4. package/src/command-line/examples.js.map +1 -1
  5. package/src/command-line/format.js +4 -1
  6. package/src/command-line/format.js.map +1 -1
  7. package/src/command-line/generate.js +2 -1
  8. package/src/command-line/generate.js.map +1 -1
  9. package/src/command-line/nx-commands.js +2 -10
  10. package/src/command-line/nx-commands.js.map +1 -1
  11. package/src/command-line/run-many.js +2 -1
  12. package/src/command-line/run-many.js.map +1 -1
  13. package/src/command-line/run-one.js +2 -2
  14. package/src/command-line/run-one.js.map +1 -1
  15. package/src/config/workspace-json-project-json.d.ts +6 -0
  16. package/src/core/dep-graph/main.esm.js +1 -1
  17. package/src/project-graph/build-nodes/workspace-projects.js +3 -0
  18. package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
  19. package/src/project-graph/build-project-graph.js +7 -1
  20. package/src/project-graph/build-project-graph.js.map +1 -1
  21. package/src/project-graph/nx-deps-cache.d.ts +1 -0
  22. package/src/project-graph/nx-deps-cache.js +7 -0
  23. package/src/project-graph/nx-deps-cache.js.map +1 -1
  24. package/src/tasks-runner/cache.d.ts +3 -0
  25. package/src/tasks-runner/cache.js +104 -58
  26. package/src/tasks-runner/cache.js.map +1 -1
  27. package/src/utils/package-json.d.ts +5 -2
  28. package/src/utils/package-json.js.map +1 -1
  29. package/src/utils/package-manager.js +3 -2
  30. package/src/utils/package-manager.js.map +1 -1
package/src/project-graph/build-nodes/workspace-projects.js CHANGED
@@ -24,6 +24,9 @@ function buildWorkspaceProjectNodes(ctx, builder) {
24
24
  ...nx.implicitDependencies,
25
25
  ];
26
26
  }
27
+ if (nx === null || nx === void 0 ? void 0 : nx.namedInputs) {
28
+ p.namedInputs = Object.assign(Object.assign({}, (p.namedInputs || {})), nx.namedInputs);
29
+ }
27
30
  }
28
31
  p.targets = (0, nx_plugin_1.mergePluginTargetsWithNxTargets)(p.root, p.targets, (0, nx_plugin_1.loadNxPlugins)(ctx.workspace.plugins));
29
32
  const projectType = p.projectType === 'application'
package/src/project-graph/build-nodes/workspace-projects.js.map CHANGED
@@ -1 +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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"}
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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"}
package/src/project-graph/build-project-graph.js CHANGED
@@ -95,7 +95,13 @@ function jsPluginConfig(nxJson, packageJsonDeps) {
95
95
  if ((_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.pluginsConfig) === null || _a === void 0 ? void 0 : _a['@nrwl/js']) {
96
96
  return (_b = nxJson === null || nxJson === void 0 ? void 0 : nxJson.pluginsConfig) === null || _b === void 0 ? void 0 : _b['@nrwl/js'];
97
97
  }
98
- if (packageJsonDeps['@nrwl/workspace'] || packageJsonDeps['@nrwl/js']) {
98
+ if (packageJsonDeps['@nrwl/workspace'] ||
99
+ packageJsonDeps['@nrwl/js'] ||
100
+ packageJsonDeps['@nrwl/node'] ||
101
+ packageJsonDeps['@nrwl/next'] ||
102
+ packageJsonDeps['@nrwl/react'] ||
103
+ packageJsonDeps['@nrwl/angular'] ||
104
+ packageJsonDeps['@nrwl/web']) {
99
105
  return { analyzePackageJson: true, analyzeSourceFiles: true };
100
106
  }
101
107
  else {
package/src/project-graph/build-project-graph.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":"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"}
package/src/project-graph/nx-deps-cache.d.ts CHANGED
@@ -9,6 +9,7 @@ export interface ProjectGraphCache {
9
9
  name: string;
10
10
  version: string;
11
11
  }[];
12
+ pluginsConfig?: any;
12
13
  nodes: Record<string, ProjectGraphNode>;
13
14
  externalNodes?: Record<string, ProjectGraphExternalNode>;
14
15
  dependencies: Record<string, ProjectGraphDependency[]>;
package/src/project-graph/nx-deps-cache.js CHANGED
@@ -62,6 +62,7 @@ function createCache(nxJson, packageJsonDeps, projectGraph, tsConfig) {
62
62
  // compilerOptions may not exist, especially for repos converted through add-nx-to-monorepo
63
63
  pathMappings: ((_a = tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.paths) || {},
64
64
  nxJsonPlugins,
65
+ pluginsConfig: nxJson.pluginsConfig,
65
66
  nodes: projectGraph.nodes,
66
67
  externalNodes: projectGraph.externalNodes,
67
68
  dependencies: projectGraph.dependencies,
@@ -83,6 +84,9 @@ function shouldRecomputeWholeGraph(cache, packageJsonDeps, workspaceJson, nxJson
83
84
  if (cache.deps['@nrwl/workspace'] !== packageJsonDeps['@nrwl/workspace']) {
84
85
  return true;
85
86
  }
87
+ if (cache.deps['nx'] !== packageJsonDeps['nx']) {
88
+ return true;
89
+ }
86
90
  // we have a cached project that is no longer present
87
91
  if (Object.keys(cache.nodes).some((p) => (cache.nodes[p].type === 'app' ||
88
92
  cache.nodes[p].type === 'lib' ||
@@ -115,6 +119,9 @@ function shouldRecomputeWholeGraph(cache, packageJsonDeps, workspaceJson, nxJson
115
119
  })) {
116
120
  return true;
117
121
  }
122
+ if (JSON.stringify(nxJson.pluginsConfig) !== JSON.stringify(cache.pluginsConfig)) {
123
+ return true;
124
+ }
118
125
  return false;
119
126
  }
120
127
  exports.shouldRecomputeWholeGraph = shouldRecomputeWholeGraph;
package/src/project-graph/nx-deps-cache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/nx-deps-cache.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/nx-deps-cache.ts"],"names":[],"mappings":"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"}
package/src/tasks-runner/cache.d.ts CHANGED
@@ -21,6 +21,9 @@ export declare class Cache {
21
21
  removeOldCacheRecords(): void;
22
22
  get(task: Task): Promise<CachedResult | null>;
23
23
  put(task: Task, terminalOutput: string | null, outputs: string[], code: number): Promise<void>;
24
+ private expandOutputsInWorkspace;
25
+ private expandOutputsInCache;
26
+ private _expandOutputs;
24
27
  copyFilesFromCache(hash: string, cachedResult: CachedResult, outputs: string[]): Promise<void>;
25
28
  temporaryOutputPath(task: Task): string;
26
29
  removeRecordedOutputsHashes(outputs: string[]): Promise<void>;
package/src/tasks-runner/cache.js CHANGED
@@ -8,6 +8,11 @@ const path_1 = require("path");
8
8
  const child_process_1 = require("child_process");
9
9
  const cache_directory_1 = require("../utils/cache-directory");
10
10
  const os_1 = require("os");
11
+ const fastGlob = require("fast-glob");
12
+ /**
13
+ * Heuristic to prevent spawning too many cp processes which makes it slower than just using fs-extra
14
+ */
15
+ const MAX_CP_PROCESSES = 4;
11
16
  class Cache {
12
17
  constructor(options) {
13
18
  this.options = options;
@@ -68,14 +73,16 @@ class Cache {
68
73
  yield (0, fs_extra_1.mkdir)(td);
69
74
  yield (0, fs_extra_1.writeFile)((0, path_1.join)(td, 'terminalOutput'), terminalOutput !== null && terminalOutput !== void 0 ? terminalOutput : 'no terminal output');
70
75
  yield (0, fs_extra_1.mkdir)((0, path_1.join)(td, 'outputs'));
71
- yield Promise.all(outputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
76
+ const expandedOutputs = yield this.expandOutputsInWorkspace(outputs);
77
+ const forceFsExtras = expandedOutputs.length > MAX_CP_PROCESSES;
78
+ yield Promise.all(expandedOutputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
72
79
  const src = (0, path_1.join)(this.root, f);
73
80
  if (yield (0, fs_extra_1.pathExists)(src)) {
74
- const cached = (0, path_1.join)(td, 'outputs', f);
75
81
  const isFile = (yield (0, fs_extra_1.lstat)(src)).isFile();
82
+ const cached = (0, path_1.join)(td, 'outputs', f);
76
83
  const directory = isFile ? (0, path_1.dirname)(cached) : cached;
77
84
  yield (0, fs_extra_1.mkdir)(directory, { recursive: true });
78
- yield this.copy(src, cached);
85
+ yield this.copy(src, cached, forceFsExtras);
79
86
  }
80
87
  })));
81
88
  // we need this file to account for partial writes to the cache folder.
@@ -87,7 +94,7 @@ class Cache {
87
94
  if (this.options.remoteCache) {
88
95
  yield this.options.remoteCache.store(task.hash, this.cachePath);
89
96
  }
90
- yield this.recordOutputsHash(outputs, task.hash);
97
+ yield this.recordOutputsHash(expandedOutputs, task.hash);
91
98
  if (terminalOutput) {
92
99
  const outputPath = this.temporaryOutputPath(task);
93
100
  yield (0, fs_extra_1.writeFile)(outputPath, terminalOutput);
@@ -95,23 +102,45 @@ class Cache {
95
102
  }));
96
103
  });
97
104
  }
105
+ expandOutputsInWorkspace(outputs) {
106
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
107
+ return this._expandOutputs(outputs, workspace_root_1.workspaceRoot);
108
+ });
109
+ }
110
+ expandOutputsInCache(outputs, cachedResult) {
111
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
112
+ return this._expandOutputs(outputs, cachedResult.outputsPath);
113
+ });
114
+ }
115
+ _expandOutputs(outputs, cwd) {
116
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
117
+ return (yield Promise.all(outputs.map((entry) => tslib_1.__awaiter(this, void 0, void 0, function* () {
118
+ if (yield (0, fs_extra_1.pathExists)((0, path_1.join)(cwd, entry))) {
119
+ return entry;
120
+ }
121
+ return fastGlob(entry, { cwd });
122
+ })))).flat();
123
+ });
124
+ }
98
125
  copyFilesFromCache(hash, cachedResult, outputs) {
99
126
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
100
127
  return this.tryAndRetry(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
101
- yield this.removeRecordedOutputsHashes(outputs);
102
- yield Promise.all(outputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
128
+ const expandedOutputs = yield this.expandOutputsInCache(outputs, cachedResult);
129
+ const forceFsExtras = expandedOutputs.length > MAX_CP_PROCESSES;
130
+ yield this.removeRecordedOutputsHashes(expandedOutputs);
131
+ yield Promise.all(expandedOutputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
103
132
  const cached = (0, path_1.join)(cachedResult.outputsPath, f);
104
133
  if (yield (0, fs_extra_1.pathExists)(cached)) {
105
134
  const isFile = (yield (0, fs_extra_1.lstat)(cached)).isFile();
106
135
  const src = (0, path_1.join)(this.root, f);
107
- yield this.remove(src);
136
+ yield this.remove(src, forceFsExtras);
108
137
  // Ensure parent directory is created if src is a file
109
138
  const directory = isFile ? (0, path_1.resolve)(src, '..') : src;
110
139
  yield (0, fs_extra_1.mkdir)(directory, { recursive: true });
111
- yield this.copy(cached, src);
140
+ yield this.copy(cached, src, forceFsExtras);
112
141
  }
113
142
  })));
114
- yield this.recordOutputsHash(outputs, hash);
143
+ yield this.recordOutputsHash(expandedOutputs, hash);
115
144
  }));
116
145
  });
117
146
  }
@@ -120,70 +149,80 @@ class Cache {
120
149
  }
121
150
  removeRecordedOutputsHashes(outputs) {
122
151
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
123
- for (const output of outputs) {
152
+ yield Promise.all(outputs.map((output) => tslib_1.__awaiter(this, void 0, void 0, function* () {
124
153
  const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
125
154
  try {
126
155
  yield (0, fs_extra_1.unlink)(hashFile);
127
156
  }
128
157
  catch (_a) { }
129
- }
158
+ })));
130
159
  });
131
160
  }
132
161
  shouldCopyOutputsFromCache(taskWithCachedResult, outputs) {
133
162
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
134
- return ((yield this.areLatestOutputsHashesDifferentThanTaskHash(outputs, taskWithCachedResult.task.hash)) ||
135
- (yield this.isAnyOutputMissing(taskWithCachedResult.cachedResult, outputs)));
163
+ const [latestHashesDifferent, outputMissing] = yield Promise.all([
164
+ this.areLatestOutputsHashesDifferentThanTaskHash(outputs, taskWithCachedResult),
165
+ this.isAnyOutputMissing(taskWithCachedResult.cachedResult, outputs),
166
+ ]);
167
+ return latestHashesDifferent || outputMissing;
136
168
  });
137
169
  }
138
- copy(src, directory) {
139
- if (this.useFsExtraToCopyAndRemove) {
140
- return (0, fs_extra_1.copy)(src, directory);
141
- }
142
- return new Promise((res, rej) => {
143
- (0, child_process_1.execFile)('cp', ['-a', src, (0, path_1.dirname)(directory)], (error) => {
144
- if (!error) {
145
- res();
146
- }
147
- else {
148
- this.useFsExtraToCopyAndRemove = true;
149
- (0, fs_extra_1.copy)(src, directory).then(res, rej);
150
- }
170
+ copy(src, destination, forceFsExtras) {
171
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
172
+ if (forceFsExtras || this.useFsExtraToCopyAndRemove) {
173
+ return (0, fs_extra_1.copy)(src, destination);
174
+ }
175
+ return new Promise((res, rej) => {
176
+ (0, child_process_1.execFile)('cp', ['-a', src, (0, path_1.dirname)(destination)], (error) => {
177
+ if (!error) {
178
+ res();
179
+ }
180
+ else {
181
+ this.useFsExtraToCopyAndRemove = true;
182
+ (0, fs_extra_1.copy)(src, destination).then(res, rej);
183
+ }
184
+ });
151
185
  });
152
186
  });
153
187
  }
154
- remove(folder) {
155
- if (this.useFsExtraToCopyAndRemove) {
156
- return (0, fs_extra_1.remove)(folder);
157
- }
158
- return new Promise((res, rej) => {
159
- (0, child_process_1.execFile)('rm', ['-rf', folder], (error) => {
160
- if (!error) {
161
- res();
162
- }
163
- else {
164
- this.useFsExtraToCopyAndRemove = true;
165
- (0, fs_extra_1.remove)(folder).then(res, rej);
166
- }
188
+ remove(path, forceFsExtras) {
189
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
190
+ if (forceFsExtras || this.useFsExtraToCopyAndRemove) {
191
+ return (0, fs_extra_1.remove)(path);
192
+ }
193
+ return new Promise((res, rej) => {
194
+ (0, child_process_1.execFile)('rm', ['-rf', path], (error) => {
195
+ if (!error) {
196
+ res();
197
+ }
198
+ else {
199
+ this.useFsExtraToCopyAndRemove = true;
200
+ (0, fs_extra_1.remove)(path).then(res, rej);
201
+ }
202
+ });
167
203
  });
168
204
  });
169
205
  }
170
206
  recordOutputsHash(outputs, hash) {
171
207
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
172
- for (const output of outputs) {
208
+ yield Promise.all(outputs.map((output) => tslib_1.__awaiter(this, void 0, void 0, function* () {
173
209
  const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
174
210
  try {
175
211
  yield (0, fs_extra_1.mkdir)((0, path_1.dirname)(hashFile), { recursive: true });
176
212
  yield (0, fs_extra_1.writeFile)(hashFile, hash);
177
213
  }
178
214
  catch (_a) { }
179
- }
215
+ })));
180
216
  });
181
217
  }
182
- areLatestOutputsHashesDifferentThanTaskHash(outputs, hash) {
218
+ areLatestOutputsHashesDifferentThanTaskHash(outputs, { task, cachedResult }) {
183
219
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
184
- for (let output of outputs) {
185
- if ((yield this.getLatestRecordedHashForTask(output)) !== hash)
220
+ const expandedOutputs = yield this.expandOutputsInCache(outputs, cachedResult);
221
+ // Purposely blocking
222
+ for (const output of expandedOutputs) {
223
+ if ((yield this.getLatestRecordedHashForTask(output)) !== task.hash) {
186
224
  return true;
225
+ }
187
226
  }
188
227
  return false;
189
228
  });
@@ -200,25 +239,32 @@ class Cache {
200
239
  }
201
240
  isAnyOutputMissing(cachedResult, outputs) {
202
241
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
203
- for (let output of outputs) {
242
+ const results = yield Promise.all(outputs.map((output) => tslib_1.__awaiter(this, void 0, void 0, function* () {
204
243
  const cacheOutputPath = (0, path_1.join)(cachedResult.outputsPath, output);
205
244
  const rootOutputPath = (0, path_1.join)(this.root, output);
206
- if ((yield (0, fs_extra_1.pathExists)(cacheOutputPath)) &&
207
- (yield (0, fs_extra_1.lstat)(cacheOutputPath)).isFile()) {
208
- return ((yield (0, fs_extra_1.pathExists)((0, path_1.join)(cachedResult.outputsPath, output))) &&
209
- !(yield (0, fs_extra_1.pathExists)((0, path_1.join)(this.root, output))));
245
+ const [cacheExists, outputsExists] = yield Promise.all([
246
+ (0, fs_extra_1.pathExists)(cacheOutputPath),
247
+ (0, fs_extra_1.pathExists)(rootOutputPath),
248
+ ]);
249
+ // This means it's probably a glob??
250
+ if (!cacheExists) {
251
+ const [{ length: outputFilesCount }, { length: cachedFilesCount }] = yield Promise.all([
252
+ this.expandOutputsInWorkspace([output]),
253
+ this.expandOutputsInCache([output], cachedResult),
254
+ ]);
255
+ return outputFilesCount !== cachedFilesCount;
210
256
  }
211
- const haveDifferentAmountOfFiles = (yield (0, fs_extra_1.pathExists)(cacheOutputPath)) &&
212
- (yield (0, fs_extra_1.pathExists)(rootOutputPath)) &&
213
- (yield (0, fs_extra_1.readdir)(cacheOutputPath)).length !==
214
- (yield (0, fs_extra_1.readdir)(rootOutputPath)).length;
215
- if (((yield (0, fs_extra_1.pathExists)(cacheOutputPath)) &&
216
- !(yield (0, fs_extra_1.pathExists)(rootOutputPath))) ||
217
- haveDifferentAmountOfFiles) {
257
+ if (cacheExists && !outputsExists) {
218
258
  return true;
219
259
  }
220
- }
221
- return false;
260
+ if ((yield (0, fs_extra_1.lstat)(cacheOutputPath)).isFile()) {
261
+ return !outputsExists;
262
+ }
263
+ const haveDifferentAmountOfFiles = (yield (0, fs_extra_1.readdir)(cacheOutputPath)).length !==
264
+ (yield (0, fs_extra_1.readdir)(rootOutputPath)).length;
265
+ return haveDifferentAmountOfFiles;
266
+ })));
267
+ return results.every((i) => i);
222
268
  });
223
269
  }
224
270
  getFileNameWithLatestRecordedHashForOutput(output) {
package/src/tasks-runner/cache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
package/src/utils/package-json.d.ts CHANGED
@@ -1,8 +1,11 @@
1
- import { TargetConfiguration } from '../config/workspace-json-project-json';
1
+ import { InputDefinition, TargetConfiguration } from '../config/workspace-json-project-json';
2
2
  export declare type PackageJsonTargetConfiguration = Omit<TargetConfiguration, 'executor'>;
3
3
  export interface NxProjectPackageJsonConfiguration {
4
4
  implicitDependencies?: string[];
5
5
  tags?: string[];
6
+ namedInputs?: {
7
+ [inputName: string]: (string | InputDefinition)[];
8
+ };
6
9
  targets?: Record<string, PackageJsonTargetConfiguration>;
7
10
  }
8
11
  export declare type PackageGroup = (string | {
@@ -47,7 +50,7 @@ export declare function buildTargetFromScript(script: string, nx: NxProjectPacka
47
50
  options: any;
48
51
  outputs?: string[];
49
52
  dependsOn?: (string | import("../config/workspace-json-project-json").TargetDependencyConfig)[];
50
- inputs?: (string | import("../config/workspace-json-project-json").InputDefinition)[];
53
+ inputs?: (string | InputDefinition)[];
51
54
  configurations?: {
52
55
  [config: string]: any;
53
56
  };
package/src/utils/package-json.js.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -51,11 +51,12 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
51
51
  const pnpmVersion = getPackageManagerVersion('pnpm');
52
52
  const useExec = (0, semver_1.gte)(pnpmVersion, '6.13.0');
53
53
  const includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
54
+ const isPnpmWorkspace = (0, fs_1.existsSync)('pnpm-workspace.yaml');
54
55
  return {
55
56
  install: 'pnpm install --no-frozen-lockfile',
56
57
  ciInstall: 'pnpm install --frozen-lockfile',
57
- add: 'pnpm add',
58
- addDev: 'pnpm add -D',
58
+ add: isPnpmWorkspace ? 'pnpm add -w' : 'pnpm add',
59
+ addDev: isPnpmWorkspace ? 'pnpm add -Dw' : 'pnpm add -D',
59
60
  addGlobal: 'pnpm add -g',
60
61
  rm: 'pnpm rm',
61
62
  exec: useExec ? 'pnpm exec' : 'pnpx',
package/src/utils/package-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"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"}