nx 14.2.3 → 14.3.0-beta.1
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.
- package/.eslintrc.json +12 -0
- package/CHANGELOG.md +1 -1
- package/package.json +4 -4
- package/src/command-line/affected.d.ts +3 -3
- package/src/command-line/affected.js +7 -7
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/dep-graph.js +7 -19
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/migrate.js +4 -0
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +22 -9
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/reset.js +3 -0
- package/src/command-line/reset.js.map +1 -1
- package/src/command-line/run-many.d.ts +3 -3
- package/src/command-line/run-many.js +2 -2
- package/src/command-line/run-many.js.map +1 -1
- package/src/config/workspaces.d.ts +3 -3
- package/src/config/workspaces.js +8 -20
- package/src/config/workspaces.js.map +1 -1
- package/src/daemon/server/watcher.d.ts +7 -0
- package/src/daemon/server/watcher.js +7 -45
- package/src/daemon/server/watcher.js.map +1 -1
- package/src/daemon/tmp-dir.js +1 -1
- package/src/daemon/tmp-dir.js.map +1 -1
- package/src/executors/run-commands/run-commands.impl.d.ts +2 -0
- package/src/executors/run-commands/run-commands.impl.js +7 -11
- package/src/executors/run-commands/run-commands.impl.js.map +1 -1
- package/src/executors/run-commands/schema.json +11 -1
- package/src/executors/run-script/run-script.impl.d.ts +1 -0
- package/src/executors/run-script/run-script.impl.js +1 -7
- package/src/executors/run-script/run-script.impl.js.map +1 -1
- package/src/executors/run-script/schema.json +11 -1
- package/src/hasher/git-based-file-hasher.js +4 -15
- package/src/hasher/git-based-file-hasher.js.map +1 -1
- package/src/hasher/hasher.js +7 -1
- package/src/hasher/hasher.js.map +1 -1
- package/src/hasher/node-based-file-hasher.js +8 -13
- package/src/hasher/node-based-file-hasher.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +1 -1
- package/src/project-graph/file-utils.js +5 -12
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/nx-deps-cache.js +5 -5
- package/src/project-graph/nx-deps-cache.js.map +1 -1
- package/src/tasks-runner/create-task-graph.js +2 -2
- package/src/tasks-runner/create-task-graph.js.map +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +4 -3
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js +3 -2
- package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/formatting-utils.d.ts +1 -0
- package/src/tasks-runner/life-cycles/formatting-utils.js +10 -0
- package/src/tasks-runner/life-cycles/formatting-utils.js.map +1 -0
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +3 -2
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command.js +5 -3
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/utils.d.ts +1 -1
- package/src/tasks-runner/utils.js +40 -39
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/cache-directory.d.ts +1 -0
- package/src/utils/cache-directory.js +3 -1
- package/src/utils/cache-directory.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +6 -1
- package/src/utils/command-line-utils.js +61 -15
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/ignore.d.ts +39 -0
- package/src/utils/ignore.js +110 -0
- package/src/utils/ignore.js.map +1 -0
- package/src/utils/params.d.ts +3 -1
- package/src/utils/params.js +23 -4
- package/src/utils/params.js.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isCacheableTask = exports.shouldStreamOutput = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.interpolate = exports.
|
|
3
|
+
exports.unparse = exports.isCacheableTask = exports.shouldStreamOutput = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.interpolate = exports.getOutputsForTargetAndConfiguration = exports.getOutputs = exports.getDependencyConfigs = exports.getCommandAsString = void 0;
|
|
4
4
|
const flat_1 = require("flat");
|
|
5
5
|
const output_1 = require("../utils/output");
|
|
6
6
|
const project_graph_utils_1 = require("../utils/project-graph-utils");
|
|
@@ -92,43 +92,6 @@ function getOutputsForTargetAndConfiguration(task, node) {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
exports.getOutputsForTargetAndConfiguration = getOutputsForTargetAndConfiguration;
|
|
95
|
-
function unparse(options) {
|
|
96
|
-
const unparsed = [];
|
|
97
|
-
for (const key of Object.keys(options)) {
|
|
98
|
-
const value = options[key];
|
|
99
|
-
unparseOption(key, value, unparsed);
|
|
100
|
-
}
|
|
101
|
-
return unparsed;
|
|
102
|
-
}
|
|
103
|
-
exports.unparse = unparse;
|
|
104
|
-
function unparseOption(key, value, unparsed) {
|
|
105
|
-
if (value === true) {
|
|
106
|
-
unparsed.push(`--${key}`);
|
|
107
|
-
}
|
|
108
|
-
else if (value === false) {
|
|
109
|
-
unparsed.push(`--no-${key}`);
|
|
110
|
-
}
|
|
111
|
-
else if (Array.isArray(value)) {
|
|
112
|
-
value.forEach((item) => unparseOption(key, item, unparsed));
|
|
113
|
-
}
|
|
114
|
-
else if (Object.prototype.toString.call(value) === '[object Object]') {
|
|
115
|
-
const flattened = (0, flat_1.flatten)(value, { safe: true });
|
|
116
|
-
for (const flattenedKey in flattened) {
|
|
117
|
-
unparseOption(`${key}.${flattenedKey}`, flattened[flattenedKey], unparsed);
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
else if (typeof value === 'string' &&
|
|
121
|
-
stringShouldBeWrappedIntoQuotes(value)) {
|
|
122
|
-
const sanitized = value.replace(/"/g, String.raw `\"`);
|
|
123
|
-
unparsed.push(`--${key}="${sanitized}"`);
|
|
124
|
-
}
|
|
125
|
-
else if (value != null) {
|
|
126
|
-
unparsed.push(`--${key}=${value}`);
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
function stringShouldBeWrappedIntoQuotes(str) {
|
|
130
|
-
return str.includes(' ') || str.includes('{') || str.includes('"');
|
|
131
|
-
}
|
|
132
95
|
function interpolate(template, data) {
|
|
133
96
|
return template.replace(/{([\s\S]+?)}/g, (match) => {
|
|
134
97
|
let value = data;
|
|
@@ -209,7 +172,7 @@ function getCliPath() {
|
|
|
209
172
|
}
|
|
210
173
|
exports.getCliPath = getCliPath;
|
|
211
174
|
function getPrintableCommandArgsForTask(task) {
|
|
212
|
-
const args =
|
|
175
|
+
const args = task.overrides['__overrides_unparsed__'];
|
|
213
176
|
const target = task.target.target.includes(':')
|
|
214
177
|
? `"${task.target.target}"`
|
|
215
178
|
: task.target.target;
|
|
@@ -252,4 +215,42 @@ function longRunningTask(task) {
|
|
|
252
215
|
const t = task.target.target;
|
|
253
216
|
return (!!task.overrides['watch'] || t === 'serve' || t === 'dev' || t === 'start');
|
|
254
217
|
}
|
|
218
|
+
// TODO: vsavkin remove when nx-cloud doesn't depend on it
|
|
219
|
+
function unparse(options) {
|
|
220
|
+
const unparsed = [];
|
|
221
|
+
for (const key of Object.keys(options)) {
|
|
222
|
+
const value = options[key];
|
|
223
|
+
unparseOption(key, value, unparsed);
|
|
224
|
+
}
|
|
225
|
+
return unparsed;
|
|
226
|
+
}
|
|
227
|
+
exports.unparse = unparse;
|
|
228
|
+
function unparseOption(key, value, unparsed) {
|
|
229
|
+
if (value === true) {
|
|
230
|
+
unparsed.push(`--${key}`);
|
|
231
|
+
}
|
|
232
|
+
else if (value === false) {
|
|
233
|
+
unparsed.push(`--no-${key}`);
|
|
234
|
+
}
|
|
235
|
+
else if (Array.isArray(value)) {
|
|
236
|
+
value.forEach((item) => unparseOption(key, item, unparsed));
|
|
237
|
+
}
|
|
238
|
+
else if (Object.prototype.toString.call(value) === '[object Object]') {
|
|
239
|
+
const flattened = (0, flat_1.flatten)(value, { safe: true });
|
|
240
|
+
for (const flattenedKey in flattened) {
|
|
241
|
+
unparseOption(`${key}.${flattenedKey}`, flattened[flattenedKey], unparsed);
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
else if (typeof value === 'string' &&
|
|
245
|
+
stringShouldBeWrappedIntoQuotes(value)) {
|
|
246
|
+
const sanitized = value.replace(/"/g, String.raw `\"`);
|
|
247
|
+
unparsed.push(`--${key}="${sanitized}"`);
|
|
248
|
+
}
|
|
249
|
+
else if (value != null) {
|
|
250
|
+
unparsed.push(`--${key}=${value}`);
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
function stringShouldBeWrappedIntoQuotes(str) {
|
|
254
|
+
return str.includes(' ') || str.includes('{') || str.includes('"');
|
|
255
|
+
}
|
|
255
256
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,4CAAyC;AAEzC,sEAA0E;AAC1E,2BAAgC;AAChC,+BAA4B;AAC5B,kDAG4B;AAE5B,8DAAoE;AAGpE,4DAAwD;AACxD,sDAAwD;AACxD,4CAAsD;AAEtD,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,MAAM,WAAW,GAAG,IAAA,0CAAwB,GAAE,CAAC,IAAI,CAAC;IACpD,MAAM,IAAI,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AACvD,CAAC;AAJD,gDAIC;AAED,SAAgB,oBAAoB,CAClC,EAAE,OAAO,EAAE,MAAM,EAAuC,EACxD,wBAA6E,EAC7E,YAA0B;;IAE1B,sFAAsF;IACtF,MAAM,iBAAiB,GAAG,iCAAiC,CACzD,MAAA,MAAA,MAAA,MAAA,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,0CAAE,OAAO,CAAC,MAAM,CAAC,0CAAE,SAAS,mCAC1D,wBAAwB,CAAC,MAAM,CAAC,mCAChC,EAAE,CACL,CAAC;IACF,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;QAChD,IACE,gBAAgB,CAAC,QAAQ,KAAK,cAAc;YAC5C,gBAAgB,CAAC,QAAQ,KAAK,MAAM,EACpC;YACA,eAAM,CAAC,KAAK,CAAC;gBACX,KAAK,EAAE,0CAA0C,OAAO,IAAI,MAAM,EAAE;gBACpE,SAAS,EAAE;oBACT,0BAA0B,gBAAgB,CAAC,QAAQ,0CAA0C;iBAC9F;aACF,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;KACF;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AA1BD,oDA0BC;AAED,SAAS,iCAAiC,CACxC,IAAyC;IAEzC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;YACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;SACxC;aAAM;YACL,OAAO,CAAC,CAAC;SACV;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,UAAU,CACxB,CAA0C,EAC1C,IAAU;IAEV,OAAO,mCAAmC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC;AALD,gCAKC;AAED;;;;GAIG;AACH,SAAgB,mCAAmC,CACjD,IAAwC,EACxC,IAA6B;;IAE7B,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;IAE9C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1C,MAAM,OAAO,iDACR,OAAO,CAAC,OAAO,GACf,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,0CAAG,aAAa,CAAC,GACxC,IAAI,CAAC,SAAS,CAClB,CAAC;IAEF,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,EAAE;QACpB,OAAO,OAAO,CAAC,OAAO;aACnB,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE;YACtB,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE;gBACvC,OAAO;gBACP,OAAO,kCAAO,IAAI,CAAC,IAAI,KAAE,IAAI,EAAE,IAAI,CAAC,IAAI,GAAE;aAC3C,CAAC,CAAC;YACH,OAAO,IAAA,0BAAc,EAAC,YAAY,CAAC;gBACjC,CAAC,CAAC,IAAA,wBAAiB,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC;gBACjD,CAAC,CAAC,YAAY,CAAC;QACnB,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;KACjC;IAED,+DAA+D;IAC/D,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;YACtC,CAAC,CAAC,OAAO,CAAC,UAAU;YACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KAC1B;SAAM,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,SAAS,EAAE;QACrD,OAAO;YACL,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACxB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,OAAO;YACxB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ;YACzB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,SAAS;SAC3B,CAAC;KACH;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AA3CD,kFA2CC;AAED,SAAgB,WAAW,CAAC,QAAgB,EAAE,IAAS;IACrD,OAAO,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,KAAa,EAAE,EAAE;QACzD,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAC1C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;gBACrB,OAAO;aACR;YACD,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,kCAYC;AAED,SAAgB,sBAAsB,CAAC,IAAU,EAAE,SAAqB;IACtE,MAAM,sBAAsB,GAAG,SAAS,CAAC,0BAA0B,EAAE,CAAC;IACtE,MAAM,OAAO,GAAG,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAErE,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,8BAAa,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE;QACjD,OAAO,CAAC,OAAO,GAAG,IAAA,gDAA0B,EAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KAC5E;IACD,OAAO,CAAC,OAAO,GAAG,IAAA,2CAA+B,EAC/C,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,OAAO,EACf,IAAA,yBAAa,EAAC,sBAAsB,CAAC,OAAO,CAAC,CAC9C,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CACb,sCAAsC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAClF,CAAC;KACH;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;AACtD,CAAC;AArBD,wDAqBC;AAED,SAAgB,kBAAkB,CAAC,IAAU,EAAE,SAAqB;IAClE,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACzD,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEvD,OAAO,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AAC1D,CAAC;AALD,gDAKC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,SAAqB;IAC/D,IAAI;QACF,MAAM,OAAO,GAAG,kBAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,aAAa,CAAC;QAClE,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACnC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAChE;AACH,CAAC;AARD,0CAQC;AAED,SAAgB,wBAAwB,CACtC,KAAgB,EAChB,GAAa;IAEb,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QAC3C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC3B,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACpC,YAAY,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CACtD,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAC1C,CAAC;SACH;KACF;IACD,OAAO;QACL,KAAK;QACL,YAAY,EAAE,YAAY;QAC1B,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CACpC;KACF,CAAC;AACJ,CAAC;AAtBD,4DAsBC;AAED,SAAgB,oBAAoB,CAClC,SAAoB;IAEpB,MAAM,eAAe,GAA6B,EAAE,CAAC;IACrD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACzC,eAAe,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC3C,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AACzB,CAAC;AAfD,oDAeC;AAED,SAAgB,UAAU;IACxB,OAAO,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACtD,CAAC;AAFD,gCAEC;AAED,SAAgB,8BAA8B,CAAC,IAAU;IACvD,MAAM,IAAI,GAAa,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC7C,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG;QAC3B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAEvB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa;QACtC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACjC,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,GAAG,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;AACvE,CAAC;AAZD,wEAYC;AAED,SAAgB,wBAAwB,CAAC,IAAU,EAAE,SAAkB;IACrE,MAAM,SAAS,qBAAQ,IAAI,CAAC,SAAS,CAAE,CAAC;IACxC,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5B,OAAO;QACL,IAAI,CAAC,SAAS,CAAC;YACb,iBAAiB,EAAE,IAAI,CAAC,MAAM;YAC9B,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;SACrB,CAAC;KACH,CAAC;AACJ,CAAC;AAVD,4DAUC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,iBAAgC,EAChC,OAGC;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACzD,IAAI,eAAe,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,iBAAiB;QAAE,OAAO,IAAI,CAAC;IAC3D,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,gDAYC;AAED,SAAgB,eAAe,CAC7B,IAAU,EACV,OAGC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAC1E,OAAO,CACL,SAAS;QACT,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1C,CAAC,eAAe,CAAC,IAAI,CAAC,CACvB,CAAC;AACJ,CAAC;AAbD,0CAaC;AAED,SAAS,eAAe,CAAC,IAAU;IACjC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC7B,OAAO,CACL,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,OAAO,CAC3E,CAAC;AACJ,CAAC;AAED,0DAA0D;AAC1D,SAAgB,OAAO,CAAC,OAAe;IACrC,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;KACrC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AARD,0BAQC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAU,EAAE,QAAkB;IAChE,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;KAC3B;SAAM,IAAI,KAAK,KAAK,KAAK,EAAE;QAC1B,QAAQ,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;KAC9B;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;KAC7D;SAAM,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,iBAAiB,EAAE;QACtE,MAAM,SAAS,GAAG,IAAA,cAAO,EAAW,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,KAAK,MAAM,YAAY,IAAI,SAAS,EAAE;YACpC,aAAa,CACX,GAAG,GAAG,IAAI,YAAY,EAAE,EACxB,SAAS,CAAC,YAAY,CAAC,EACvB,QAAQ,CACT,CAAC;SACH;KACF;SAAM,IACL,OAAO,KAAK,KAAK,QAAQ;QACzB,+BAA+B,CAAC,KAAK,CAAC,EACtC;QACA,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;QACtD,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,SAAS,GAAG,CAAC,CAAC;KAC1C;SAAM,IAAI,KAAK,IAAI,IAAI,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;KACpC;AACH,CAAC;AAED,SAAS,+BAA+B,CAAC,GAAW;IAClD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACrE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.cacheDir = void 0;
|
|
4
|
+
exports.projectGraphCacheDirectory = exports.cacheDir = void 0;
|
|
4
5
|
const path_1 = require("path");
|
|
5
6
|
const workspace_root_1 = require("./workspace-root");
|
|
6
7
|
const fileutils_1 = require("./fileutils");
|
|
@@ -34,4 +35,5 @@ function cacheDirectory(root, cacheDirectory) {
|
|
|
34
35
|
* Path to the directory where Nx stores its cache and daemon-related files.
|
|
35
36
|
*/
|
|
36
37
|
exports.cacheDir = cacheDirectory(workspace_root_1.workspaceRoot, readCacheDirectoryProperty(workspace_root_1.workspaceRoot));
|
|
38
|
+
exports.projectGraphCacheDirectory = (_a = process.env.NX_PROJECT_GRAPH_CACHE_DIRECTORY) !== null && _a !== void 0 ? _a : exports.cacheDir;
|
|
37
39
|
//# sourceMappingURL=cache-directory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/cache-directory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/cache-directory.ts"],"names":[],"mappings":";;;;AAAA,+BAAwC;AACxC,qDAAiD;AACjD,2CAA2C;AAG3C,SAAS,0BAA0B,CAAC,IAAY;IAC9C,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAsB,IAAA,WAAI,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;KACjE;IAAC,WAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,cAAsB;IAC1D,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACvD,IAAI,eAAe,EAAE;QACnB,cAAc,GAAG,eAAe,CAAC;KAClC;IACD,IAAI,cAAc,EAAE;QAClB,IAAI,IAAA,iBAAU,EAAC,cAAc,CAAC,EAAE;YAC9B,OAAO,cAAc,CAAC;SACvB;aAAM;YACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACnC;KACF;SAAM;QACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnD;AACH,CAAC;AAED;;GAEG;AACU,QAAA,QAAQ,GAAG,cAAc,CACpC,8BAAa,EACb,0BAA0B,CAAC,8BAAa,CAAC,CAC1C,CAAC;AAEW,QAAA,0BAA0B,GACrC,MAAA,OAAO,CAAC,GAAG,CAAC,gCAAgC,mCAAI,gBAAQ,CAAC"}
|
|
@@ -37,7 +37,9 @@ export interface NxArgs {
|
|
|
37
37
|
nxIgnoreCycles?: boolean;
|
|
38
38
|
type?: string;
|
|
39
39
|
}
|
|
40
|
-
export declare function splitArgsIntoNxArgsAndOverrides(args:
|
|
40
|
+
export declare function splitArgsIntoNxArgsAndOverrides(args: {
|
|
41
|
+
[k: string]: any;
|
|
42
|
+
}, mode: 'run-one' | 'run-many' | 'affected' | 'print-affected', options: {
|
|
41
43
|
printWarnings: boolean;
|
|
42
44
|
}, nxJson: NxJsonConfiguration): {
|
|
43
45
|
nxArgs: NxArgs;
|
|
@@ -47,3 +49,6 @@ export declare function parseFiles(options: NxArgs): {
|
|
|
47
49
|
files: string[];
|
|
48
50
|
};
|
|
49
51
|
export declare function getProjectRoots(projectNames: string[]): string[];
|
|
52
|
+
export declare function serializeArgsIntoCommandLine(args: {
|
|
53
|
+
[k: string]: any;
|
|
54
|
+
}): string[];
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getProjectRoots = exports.parseFiles = exports.splitArgsIntoNxArgsAndOverrides = exports.names = void 0;
|
|
3
|
+
exports.serializeArgsIntoCommandLine = exports.getProjectRoots = exports.parseFiles = exports.splitArgsIntoNxArgsAndOverrides = exports.names = void 0;
|
|
4
4
|
const yargsParser = require("yargs-parser");
|
|
5
5
|
const file_utils_1 = require("../project-graph/file-utils");
|
|
6
6
|
const output_1 = require("./output");
|
|
7
7
|
const child_process_1 = require("child_process");
|
|
8
8
|
const configuration_1 = require("../config/configuration");
|
|
9
|
+
//
|
|
9
10
|
function names(name) {
|
|
10
11
|
return {
|
|
11
12
|
name,
|
|
@@ -85,27 +86,59 @@ const runAffected = [
|
|
|
85
86
|
const ignoreArgs = ['$0', '_'];
|
|
86
87
|
function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings: true }, nxJson) {
|
|
87
88
|
var _a;
|
|
89
|
+
if (!args.__overrides__ && args._) {
|
|
90
|
+
// required for backwards compatibility
|
|
91
|
+
args.__overrides__ = args._;
|
|
92
|
+
delete args._;
|
|
93
|
+
}
|
|
88
94
|
const nxSpecific = mode === 'run-one' ? runOne : mode === 'run-many' ? runMany : runAffected;
|
|
95
|
+
let explicitOverrides;
|
|
96
|
+
if (args.__overrides__) {
|
|
97
|
+
explicitOverrides = yargsParser(args.__overrides__, {
|
|
98
|
+
configuration: {
|
|
99
|
+
'camel-case-expansion': false,
|
|
100
|
+
'dot-notation': false,
|
|
101
|
+
},
|
|
102
|
+
});
|
|
103
|
+
if (!explicitOverrides._ || explicitOverrides._.length === 0) {
|
|
104
|
+
delete explicitOverrides._;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
const overridesFromMainArgs = {};
|
|
108
|
+
if (args['__positional_overrides__']) {
|
|
109
|
+
overridesFromMainArgs['_'] = args['__positional_overrides__'];
|
|
110
|
+
}
|
|
89
111
|
const nxArgs = {};
|
|
90
|
-
const overrides = yargsParser(args._, {
|
|
91
|
-
configuration: {
|
|
92
|
-
'camel-case-expansion': false,
|
|
93
|
-
'dot-notation': false,
|
|
94
|
-
},
|
|
95
|
-
});
|
|
96
|
-
// This removes the overrides from the nxArgs._
|
|
97
|
-
args._ = overrides._;
|
|
98
|
-
delete overrides._;
|
|
99
112
|
Object.entries(args).forEach(([key, value]) => {
|
|
100
113
|
const camelCased = names(key).propertyName;
|
|
101
114
|
if (nxSpecific.includes(camelCased) || camelCased.startsWith('nx')) {
|
|
102
115
|
if (value !== undefined)
|
|
103
116
|
nxArgs[camelCased] = value;
|
|
104
117
|
}
|
|
105
|
-
else if (!ignoreArgs.includes(key)
|
|
106
|
-
|
|
118
|
+
else if (!ignoreArgs.includes(key) &&
|
|
119
|
+
key !== '__positional_overrides__' &&
|
|
120
|
+
key !== '__overrides__') {
|
|
121
|
+
overridesFromMainArgs[key] = value;
|
|
107
122
|
}
|
|
108
123
|
});
|
|
124
|
+
let overrides;
|
|
125
|
+
if (explicitOverrides) {
|
|
126
|
+
overrides = explicitOverrides;
|
|
127
|
+
overrides['__overrides_unparsed__'] = args.__overrides__;
|
|
128
|
+
if (Object.keys(overridesFromMainArgs).length > 0) {
|
|
129
|
+
const s = Object.keys(overridesFromMainArgs).join(', ');
|
|
130
|
+
output_1.output.warn({
|
|
131
|
+
title: `Nx didn't recognize the following args: ${s}`,
|
|
132
|
+
bodyLines: [
|
|
133
|
+
"When using '--' all executor args have to be defined after '--'.",
|
|
134
|
+
],
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
overrides = overridesFromMainArgs;
|
|
140
|
+
overrides['__overrides_unparsed__'] = serializeArgsIntoCommandLine(overridesFromMainArgs);
|
|
141
|
+
}
|
|
109
142
|
if (mode === 'run-many') {
|
|
110
143
|
if (!nxArgs.projects) {
|
|
111
144
|
nxArgs.projects = [];
|
|
@@ -143,9 +176,9 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
|
|
|
143
176
|
!nxArgs.base &&
|
|
144
177
|
!nxArgs.head &&
|
|
145
178
|
!nxArgs.all &&
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
179
|
+
overridesFromMainArgs._ &&
|
|
180
|
+
overridesFromMainArgs._.length >= 2) {
|
|
181
|
+
throw new Error(`Nx no longer supports using positional arguments for base and head. Please use --base and --head instead.`);
|
|
149
182
|
}
|
|
150
183
|
// Allow setting base and head via environment variables (lower priority then direct command arguments)
|
|
151
184
|
if (!nxArgs.base && process.env.NX_BASE) {
|
|
@@ -232,6 +265,7 @@ exports.parseFiles = parseFiles;
|
|
|
232
265
|
function getUncommittedFiles() {
|
|
233
266
|
return parseGitOutput(`git diff --name-only --relative HEAD .`);
|
|
234
267
|
}
|
|
268
|
+
``;
|
|
235
269
|
function getUntrackedFiles() {
|
|
236
270
|
return parseGitOutput(`git ls-files --others --exclude-standard`);
|
|
237
271
|
}
|
|
@@ -265,4 +299,16 @@ function getProjectRoots(projectNames) {
|
|
|
265
299
|
return projectNames.map((name) => projects[name].root);
|
|
266
300
|
}
|
|
267
301
|
exports.getProjectRoots = getProjectRoots;
|
|
302
|
+
function serializeArgsIntoCommandLine(args) {
|
|
303
|
+
const r = args['_'] ? [...args['_']] : [];
|
|
304
|
+
Object.keys(args).forEach((a) => {
|
|
305
|
+
if (a !== '_') {
|
|
306
|
+
r.push(typeof args[a] === 'string' && args[a].includes(' ')
|
|
307
|
+
? `--${a}="${args[a].replace(/"/g, '"')}"`
|
|
308
|
+
: `--${a}=${args[a]}`);
|
|
309
|
+
}
|
|
310
|
+
});
|
|
311
|
+
return r;
|
|
312
|
+
}
|
|
313
|
+
exports.serializeArgsIntoCommandLine = serializeArgsIntoCommandLine;
|
|
268
314
|
//# sourceMappingURL=command-line-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C,4DAA4D;AAC5D,qCAAkC;AAElC,iDAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { Ignore } from 'ignore';
|
|
2
|
+
import { Tree } from '../generators/tree';
|
|
3
|
+
export declare function createNxIgnore(root?: string): Ignore;
|
|
4
|
+
export declare function createGitIgnoreFromTree(tree: Tree): Ignore;
|
|
5
|
+
export declare function readWorkspaceIgnorePatterns(root?: string): string[];
|
|
6
|
+
export declare function createIgnoreFromPatterns(patterns: string[]): Ignore;
|
|
7
|
+
/**
|
|
8
|
+
* Reads ignore files from the file system and returns an object which can be
|
|
9
|
+
* used to check whether a file should be ignored.
|
|
10
|
+
*
|
|
11
|
+
* @param rootDir The directory in which to start searching for ignore files.
|
|
12
|
+
* Paths evaluated by the returned object must be relative to this directory.
|
|
13
|
+
* Defaults to the workspace root.
|
|
14
|
+
* @param ignoreFiles The filename of ignore files to include, e.g. ".gitignore".
|
|
15
|
+
* Defaults to [".gitignore", ".nxignore"].
|
|
16
|
+
*/
|
|
17
|
+
export declare function createIgnore(rootDir?: string, ignoreFiles?: string[]): Ignore;
|
|
18
|
+
/**
|
|
19
|
+
* Reads ignore files from a Tree and returns an object which can be
|
|
20
|
+
* used to check whether a file should be ignored.
|
|
21
|
+
*
|
|
22
|
+
* @param tree The tree in which to searching for ignore files.
|
|
23
|
+
* Paths evaluated by the returned object must be relative to the tree root.
|
|
24
|
+
* @param ignoreFiles The filename of ignore files to include, e.g. ".gitignore".
|
|
25
|
+
* Defaults to [".gitignore", ".nxignore"].
|
|
26
|
+
*/
|
|
27
|
+
export declare function createIgnoreFromTree(tree: Tree, ignoreFiles?: string[]): Ignore;
|
|
28
|
+
interface IgnoreFile {
|
|
29
|
+
/**
|
|
30
|
+
* Path to the ignore file, relative to the root directory.
|
|
31
|
+
*/
|
|
32
|
+
path: string;
|
|
33
|
+
/**
|
|
34
|
+
* Content of the ignore file.
|
|
35
|
+
*/
|
|
36
|
+
content: string;
|
|
37
|
+
}
|
|
38
|
+
export declare function createCombinedIgnore(ignoreFiles: IgnoreFile[]): Ignore;
|
|
39
|
+
export {};
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createCombinedIgnore = exports.createIgnoreFromTree = exports.createIgnore = exports.createIgnoreFromPatterns = exports.readWorkspaceIgnorePatterns = exports.createGitIgnoreFromTree = exports.createNxIgnore = void 0;
|
|
4
|
+
const fastGlob = require("fast-glob");
|
|
5
|
+
const fs = require("fs");
|
|
6
|
+
const ignore_1 = require("ignore");
|
|
7
|
+
const path = require("path");
|
|
8
|
+
const path_1 = require("./path");
|
|
9
|
+
const workspace_root_1 = require("./workspace-root");
|
|
10
|
+
const workspaceIgnoreFiles = ['.gitignore', '.nxignore'];
|
|
11
|
+
function createNxIgnore(root = workspace_root_1.workspaceRoot) {
|
|
12
|
+
return createIgnore(root, ['.nxignore']);
|
|
13
|
+
}
|
|
14
|
+
exports.createNxIgnore = createNxIgnore;
|
|
15
|
+
function createGitIgnoreFromTree(tree) {
|
|
16
|
+
return createIgnoreFromTree(tree, ['.gitignore']);
|
|
17
|
+
}
|
|
18
|
+
exports.createGitIgnoreFromTree = createGitIgnoreFromTree;
|
|
19
|
+
function readWorkspaceIgnorePatterns(root = workspace_root_1.workspaceRoot) {
|
|
20
|
+
return combineIgnorePatterns(workspaceIgnoreFiles.flatMap((ignoreFile) => readIgnoreFiles(root, ignoreFile)));
|
|
21
|
+
}
|
|
22
|
+
exports.readWorkspaceIgnorePatterns = readWorkspaceIgnorePatterns;
|
|
23
|
+
function createIgnoreFromPatterns(patterns) {
|
|
24
|
+
const ig = (0, ignore_1.default)();
|
|
25
|
+
ig.add(patterns);
|
|
26
|
+
return ig;
|
|
27
|
+
}
|
|
28
|
+
exports.createIgnoreFromPatterns = createIgnoreFromPatterns;
|
|
29
|
+
/**
|
|
30
|
+
* Reads ignore files from the file system and returns an object which can be
|
|
31
|
+
* used to check whether a file should be ignored.
|
|
32
|
+
*
|
|
33
|
+
* @param rootDir The directory in which to start searching for ignore files.
|
|
34
|
+
* Paths evaluated by the returned object must be relative to this directory.
|
|
35
|
+
* Defaults to the workspace root.
|
|
36
|
+
* @param ignoreFiles The filename of ignore files to include, e.g. ".gitignore".
|
|
37
|
+
* Defaults to [".gitignore", ".nxignore"].
|
|
38
|
+
*/
|
|
39
|
+
function createIgnore(rootDir = workspace_root_1.workspaceRoot, ignoreFiles = workspaceIgnoreFiles) {
|
|
40
|
+
return createCombinedIgnore(ignoreFiles.flatMap((ignoreFile) => readIgnoreFiles(rootDir, ignoreFile)));
|
|
41
|
+
}
|
|
42
|
+
exports.createIgnore = createIgnore;
|
|
43
|
+
/**
|
|
44
|
+
* Reads ignore files from a Tree and returns an object which can be
|
|
45
|
+
* used to check whether a file should be ignored.
|
|
46
|
+
*
|
|
47
|
+
* @param tree The tree in which to searching for ignore files.
|
|
48
|
+
* Paths evaluated by the returned object must be relative to the tree root.
|
|
49
|
+
* @param ignoreFiles The filename of ignore files to include, e.g. ".gitignore".
|
|
50
|
+
* Defaults to [".gitignore", ".nxignore"].
|
|
51
|
+
*/
|
|
52
|
+
function createIgnoreFromTree(tree, ignoreFiles = workspaceIgnoreFiles) {
|
|
53
|
+
return createCombinedIgnore(ignoreFiles.flatMap((ignoreFile) => readIgnoreFilesFromTree(tree, ignoreFile)));
|
|
54
|
+
}
|
|
55
|
+
exports.createIgnoreFromTree = createIgnoreFromTree;
|
|
56
|
+
function readIgnoreFiles(rootDir, ignoreFile) {
|
|
57
|
+
const ignoreFilePaths = fastGlob.sync(`**/${ignoreFile}`, {
|
|
58
|
+
cwd: rootDir,
|
|
59
|
+
dot: true,
|
|
60
|
+
});
|
|
61
|
+
return ignoreFilePaths.map((filePath) => ({
|
|
62
|
+
path: filePath,
|
|
63
|
+
content: fs.readFileSync(path.join(rootDir, filePath), 'utf-8'),
|
|
64
|
+
}));
|
|
65
|
+
}
|
|
66
|
+
function readIgnoreFilesFromTree(tree, ignoreFile) {
|
|
67
|
+
const remainingPaths = ['.'];
|
|
68
|
+
const ignoreFiles = [];
|
|
69
|
+
while (remainingPaths.length > 0) {
|
|
70
|
+
const currentPath = remainingPaths.pop();
|
|
71
|
+
for (const child of tree.children(currentPath)) {
|
|
72
|
+
const childPath = (0, path_1.normalizePath)(path.join(currentPath, child));
|
|
73
|
+
if (tree.isFile(childPath)) {
|
|
74
|
+
if (child === ignoreFile) {
|
|
75
|
+
ignoreFiles.push({
|
|
76
|
+
path: childPath,
|
|
77
|
+
content: tree.read(childPath, 'utf-8'),
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
remainingPaths.push(childPath);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return ignoreFiles;
|
|
87
|
+
}
|
|
88
|
+
function createCombinedIgnore(ignoreFiles) {
|
|
89
|
+
return createIgnoreFromPatterns(combineIgnorePatterns(ignoreFiles));
|
|
90
|
+
}
|
|
91
|
+
exports.createCombinedIgnore = createCombinedIgnore;
|
|
92
|
+
function combineIgnorePatterns(ignoreFiles) {
|
|
93
|
+
return ignoreFiles.flatMap(parseIgnoreFile);
|
|
94
|
+
}
|
|
95
|
+
function parseIgnoreFile(file) {
|
|
96
|
+
const base = (0, path_1.normalizePath)(path.dirname(file.path));
|
|
97
|
+
return file.content
|
|
98
|
+
.split(/\r?\n/)
|
|
99
|
+
.filter((line) => line && !line.startsWith('#'))
|
|
100
|
+
.map((pattern) => applyBaseToPattern(pattern, base));
|
|
101
|
+
}
|
|
102
|
+
function applyBaseToPattern(pattern, base) {
|
|
103
|
+
return isNegativePattern(pattern)
|
|
104
|
+
? '!' + path.posix.join(base, pattern.slice(1))
|
|
105
|
+
: path.posix.join(base, pattern);
|
|
106
|
+
}
|
|
107
|
+
function isNegativePattern(pattern) {
|
|
108
|
+
return pattern[0] === '!';
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=ignore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ignore.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/ignore.ts"],"names":[],"mappings":"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"}
|
package/src/utils/params.d.ts
CHANGED
|
@@ -23,6 +23,8 @@ declare type PropertyDescription = {
|
|
|
23
23
|
index: number;
|
|
24
24
|
} | {
|
|
25
25
|
$source: 'projectName';
|
|
26
|
+
} | {
|
|
27
|
+
$source: 'unparsed';
|
|
26
28
|
};
|
|
27
29
|
additionalProperties?: boolean;
|
|
28
30
|
'x-prompt'?: string | {
|
|
@@ -106,5 +108,5 @@ export declare function warnDeprecations(opts: {
|
|
|
106
108
|
}, schema: Schema): void;
|
|
107
109
|
export declare function convertSmartDefaultsIntoNamedParams(opts: {
|
|
108
110
|
[k: string]: any;
|
|
109
|
-
}, schema: Schema,
|
|
111
|
+
}, schema: Schema, defaultProjectName: string | null, relativeCwd: string | null): void;
|
|
110
112
|
export {};
|
package/src/utils/params.js
CHANGED
|
@@ -9,6 +9,7 @@ function handleErrors(isVerbose, fn) {
|
|
|
9
9
|
return yield fn();
|
|
10
10
|
}
|
|
11
11
|
catch (err) {
|
|
12
|
+
err !== null && err !== void 0 ? err : (err = new Error('Unknown error caught'));
|
|
12
13
|
if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
|
|
13
14
|
logger_1.logger.error('The generator workflow failed. See above.');
|
|
14
15
|
}
|
|
@@ -362,7 +363,7 @@ function combineOptionsForExecutor(commandLineOpts, config, target, schema, defa
|
|
|
362
363
|
}
|
|
363
364
|
combined = convertAliases(combined, schema, false);
|
|
364
365
|
Object.assign(combined, r);
|
|
365
|
-
convertSmartDefaultsIntoNamedParams(combined, schema,
|
|
366
|
+
convertSmartDefaultsIntoNamedParams(combined, schema, defaultProjectName, relativeCwd);
|
|
366
367
|
warnDeprecations(combined, schema);
|
|
367
368
|
setDefaults(combined, schema);
|
|
368
369
|
validateOptsAgainstSchema(combined, schema);
|
|
@@ -376,7 +377,7 @@ function combineOptionsForGenerator(commandLineOpts, collectionName, generatorNa
|
|
|
376
377
|
? getGeneratorDefaults(defaultProjectName, wc, collectionName, generatorName)
|
|
377
378
|
: {};
|
|
378
379
|
let combined = convertAliases(coerceTypesInOptions(Object.assign(Object.assign({}, generatorDefaults), commandLineOpts), schema), schema, false);
|
|
379
|
-
convertSmartDefaultsIntoNamedParams(combined, schema,
|
|
380
|
+
convertSmartDefaultsIntoNamedParams(combined, schema, defaultProjectName, relativeCwd);
|
|
380
381
|
if (isInteractive && isTTY()) {
|
|
381
382
|
combined = yield promptForValues(combined, schema);
|
|
382
383
|
}
|
|
@@ -398,14 +399,20 @@ function warnDeprecations(opts, schema) {
|
|
|
398
399
|
});
|
|
399
400
|
}
|
|
400
401
|
exports.warnDeprecations = warnDeprecations;
|
|
401
|
-
function convertSmartDefaultsIntoNamedParams(opts, schema,
|
|
402
|
+
function convertSmartDefaultsIntoNamedParams(opts, schema, defaultProjectName, relativeCwd) {
|
|
403
|
+
const argv = opts['_'] || [];
|
|
404
|
+
const usedPositionalArgs = {};
|
|
402
405
|
Object.entries(schema.properties).forEach(([k, v]) => {
|
|
403
406
|
if (opts[k] === undefined &&
|
|
404
407
|
v.$default !== undefined &&
|
|
405
408
|
v.$default.$source === 'argv' &&
|
|
406
409
|
argv[v.$default.index]) {
|
|
410
|
+
usedPositionalArgs[v.$default.index] = true;
|
|
407
411
|
opts[k] = coerceType(v, argv[v.$default.index]);
|
|
408
412
|
}
|
|
413
|
+
else if (v.$default !== undefined && v.$default.$source === 'unparsed') {
|
|
414
|
+
opts[k] = opts['__overrides_unparsed__'];
|
|
415
|
+
}
|
|
409
416
|
else if (opts[k] === undefined &&
|
|
410
417
|
v.$default !== undefined &&
|
|
411
418
|
v.$default.$source === 'projectName' &&
|
|
@@ -419,7 +426,19 @@ function convertSmartDefaultsIntoNamedParams(opts, schema, argv, defaultProjectN
|
|
|
419
426
|
opts[k] = relativeCwd.replace(/\\/g, '/');
|
|
420
427
|
}
|
|
421
428
|
});
|
|
422
|
-
|
|
429
|
+
const leftOverPositionalArgs = [];
|
|
430
|
+
for (let i = 0; i < argv.length; ++i) {
|
|
431
|
+
if (!usedPositionalArgs[i]) {
|
|
432
|
+
leftOverPositionalArgs.push(argv[i]);
|
|
433
|
+
}
|
|
434
|
+
}
|
|
435
|
+
if (leftOverPositionalArgs.length === 0) {
|
|
436
|
+
delete opts['_'];
|
|
437
|
+
}
|
|
438
|
+
else {
|
|
439
|
+
opts['_'] = leftOverPositionalArgs;
|
|
440
|
+
}
|
|
441
|
+
delete opts['__overrides_unparsed__'];
|
|
423
442
|
}
|
|
424
443
|
exports.convertSmartDefaultsIntoNamedParams = convertSmartDefaultsIntoNamedParams;
|
|
425
444
|
function getGeneratorDefaults(projectName, wc, collectionName, generatorName) {
|