@nrwl/workspace 13.4.3 → 13.4.4-beta.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (45) hide show
  1. package/package.json +7 -6
  2. package/src/core/dep-graph/3rdpartylicenses.txt +1 -1
  3. package/src/core/project-graph/daemon/client/client.js +17 -5
  4. package/src/core/project-graph/daemon/client/client.js.map +1 -1
  5. package/src/core/project-graph/daemon/server/watcher.js +20 -1
  6. package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
  7. package/src/core/project-graph/daemon/socket-utils.d.ts +0 -1
  8. package/src/core/project-graph/daemon/socket-utils.js +1 -21
  9. package/src/core/project-graph/daemon/socket-utils.js.map +1 -1
  10. package/src/core/project-graph/project-graph.js +5 -2
  11. package/src/core/project-graph/project-graph.js.map +1 -1
  12. package/src/migrations/update-12-5-0/add-target-dependencies.js +1 -1
  13. package/src/migrations/update-12-5-0/add-target-dependencies.js.map +1 -1
  14. package/src/migrations/update-13-0-0/set-default-base-if-not-set.js +1 -1
  15. package/src/migrations/update-13-0-0/set-default-base-if-not-set.js.map +1 -1
  16. package/src/tasks-runner/cache.d.ts +3 -0
  17. package/src/tasks-runner/cache.js +39 -10
  18. package/src/tasks-runner/cache.js.map +1 -1
  19. package/src/tasks-runner/life-cycle.d.ts +8 -10
  20. package/src/tasks-runner/life-cycle.js.map +1 -1
  21. package/src/tasks-runner/neo-output/pretty-time.d.ts +4 -0
  22. package/src/tasks-runner/neo-output/pretty-time.js +75 -0
  23. package/src/tasks-runner/neo-output/pretty-time.js.map +1 -0
  24. package/src/tasks-runner/neo-output/render.d.ts +13 -0
  25. package/src/tasks-runner/neo-output/render.js +244 -0
  26. package/src/tasks-runner/neo-output/render.js.map +1 -0
  27. package/src/tasks-runner/run-command.d.ts +1 -4
  28. package/src/tasks-runner/run-command.js +56 -22
  29. package/src/tasks-runner/run-command.js.map +1 -1
  30. package/src/tasks-runner/task-orchestrator.d.ts +0 -3
  31. package/src/tasks-runner/task-orchestrator.js +3 -21
  32. package/src/tasks-runner/task-orchestrator.js.map +1 -1
  33. package/src/tasks-runner/tasks-runner.d.ts +1 -1
  34. package/src/tasks-runner/tasks-runner.js.map +1 -1
  35. package/src/tasks-runner/utils.d.ts +8 -0
  36. package/src/tasks-runner/utils.js +21 -1
  37. package/src/tasks-runner/utils.js.map +1 -1
  38. package/src/utilities/is_ci.d.ts +1 -0
  39. package/src/utilities/is_ci.js +20 -0
  40. package/src/utilities/is_ci.js.map +1 -0
  41. package/src/utilities/output.js +2 -1
  42. package/src/utilities/output.js.map +1 -1
  43. package/src/utils/versions.js +1 -1
  44. package/jest.config.js +0 -10
  45. package/src/generators/remove/lib/test-files/jest.config.js +0 -8
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "13.4.3",
3
+ "version": "13.4.4-beta.4",
4
4
  "description": "Smart, Fast and Extensible Build System",
5
5
  "repository": {
6
6
  "type": "git",
@@ -64,11 +64,12 @@
64
64
  "@parcel/watcher": "2.0.4",
65
65
  "chokidar": "^3.5.1",
66
66
  "cosmiconfig": "^4.0.0",
67
+ "cli-spinners": "2.6.1",
67
68
  "fs-extra": "^9.1.0",
68
69
  "dotenv": "~10.0.0",
70
+ "figures": "3.2.0",
69
71
  "glob": "7.1.4",
70
72
  "ignore": "^5.0.4",
71
- "npm-run-all": "^4.1.5",
72
73
  "npm-run-path": "^4.0.1",
73
74
  "open": "^7.4.2",
74
75
  "rxjs": "^6.5.4",
@@ -82,10 +83,10 @@
82
83
  "minimatch": "3.0.4",
83
84
  "enquirer": "~2.3.6",
84
85
  "tslib": "^2.3.0",
85
- "@nrwl/cli": "13.4.3",
86
- "@nrwl/devkit": "13.4.3",
87
- "@nrwl/jest": "13.4.3",
88
- "@nrwl/linter": "13.4.3"
86
+ "@nrwl/cli": "13.4.4-beta.4",
87
+ "@nrwl/devkit": "13.4.4-beta.4",
88
+ "@nrwl/jest": "13.4.4-beta.4",
89
+ "@nrwl/linter": "13.4.4-beta.4"
89
90
  },
90
91
  "nx-migrations": {
91
92
  "migrations": "./migrations.json"
@@ -28,7 +28,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28
28
  MIT
29
29
  (The MIT License)
30
30
 
31
- Copyright (c) 2017-2021 Narwhal Technologies Inc.
31
+ Copyright (c) 2017-2022 Narwhal Technologies Inc.
32
32
 
33
33
  Permission is hereby granted, free of charge, to any person obtaining
34
34
  a copy of this software and associated documentation files (the
@@ -159,17 +159,29 @@ function getProjectGraphFromServer() {
159
159
  socket.on('end', () => {
160
160
  try {
161
161
  perf_hooks_1.performance.mark('json-parse-start');
162
- const projectGraphResult = (0, socket_utils_1.deserializeResult)(serializedProjectGraphResult);
162
+ const projectGraphResult = JSON.parse(serializedProjectGraphResult);
163
163
  perf_hooks_1.performance.mark('json-parse-end');
164
164
  perf_hooks_1.performance.measure('deserialize graph result on the client', 'json-parse-start', 'json-parse-end');
165
165
  if (projectGraphResult.error) {
166
- return reject(projectGraphResult.error);
166
+ reject(projectGraphResult.error);
167
+ }
168
+ else {
169
+ perf_hooks_1.performance.measure('total for getProjectGraphFromServer()', 'getProjectGraphFromServer-start', 'json-parse-end');
170
+ return resolve(projectGraphResult.projectGraph);
167
171
  }
168
- perf_hooks_1.performance.measure('total for getProjectGraphFromServer()', 'getProjectGraphFromServer-start', 'json-parse-end');
169
- return resolve(projectGraphResult.projectGraph);
170
172
  }
171
173
  catch (e) {
172
- return reject(new Error(`Could not deserialize the ProjectGraph.\n${e.message}`));
174
+ const endOfGraph = serializedProjectGraphResult.length > 300
175
+ ? serializedProjectGraphResult.substring(serializedProjectGraphResult.length - 300)
176
+ : serializedProjectGraphResult;
177
+ reject(daemonProcessException([
178
+ 'Could not deserialize project graph.',
179
+ `Message: ${e.message}`,
180
+ '\n',
181
+ `Received:`,
182
+ endOfGraph,
183
+ '\n',
184
+ ].join('\n')));
173
185
  }
174
186
  });
175
187
  });
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,7 @@ const fs_1 = require("fs");
15
15
  const path_1 = require("path");
16
16
  const socket_utils_1 = require("../socket-utils");
17
17
  const shutdown_utils_1 = require("@nrwl/workspace/src/core/project-graph/daemon/server/shutdown-utils");
18
+ const ignore_1 = require("ignore");
18
19
  /**
19
20
  * This configures the files and directories which we always want to ignore as part of file watching
20
21
  * and which we know the location of statically (meaning irrespective of user configuration files).
@@ -51,6 +52,18 @@ function getIgnoredGlobsFromFile(file) {
51
52
  return [];
52
53
  }
53
54
  }
55
+ function configureIgnoreObject() {
56
+ const ig = (0, ignore_1.default)();
57
+ try {
58
+ ig.add((0, fs_1.readFileSync)(`${app_root_1.appRootPath}/.gitignore`, 'utf-8'));
59
+ }
60
+ catch (_a) { }
61
+ try {
62
+ ig.add((0, fs_1.readFileSync)(`${app_root_1.appRootPath}/.nxignore`, 'utf-8'));
63
+ }
64
+ catch (_b) { }
65
+ return ig;
66
+ }
54
67
  function subscribeToWorkspaceChanges(server, cb) {
55
68
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
56
69
  /**
@@ -59,6 +72,7 @@ function subscribeToWorkspaceChanges(server, cb) {
59
72
  * executed by packages which do not have its necessary native binaries available.
60
73
  */
61
74
  const watcher = yield Promise.resolve().then(() => require('@parcel/watcher'));
75
+ const ignoreObj = configureIgnoreObject();
62
76
  const subscription = yield watcher.subscribe(app_root_1.appRootPath, (err, events) => {
63
77
  // Let the consumer handle any errors
64
78
  if (err) {
@@ -86,7 +100,12 @@ function subscribeToWorkspaceChanges(server, cb) {
86
100
  watcherSubscription: subscription,
87
101
  });
88
102
  }
89
- cb(null, workspaceRelativeEvents);
103
+ const nonIgnoredEvents = workspaceRelativeEvents
104
+ .filter(({ path }) => !!path)
105
+ .filter(({ path }) => !ignoreObj.ignores(path));
106
+ if (nonIgnoredEvents && nonIgnoredEvents.length > 0) {
107
+ cb(null, nonIgnoredEvents);
108
+ }
90
109
  }, {
91
110
  ignore: getIgnoredGlobs(),
92
111
  });
@@ -1 +1 @@
1
- {"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/watcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/watcher.ts"],"names":[],"mappings":"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"}
@@ -13,4 +13,3 @@ export interface ProjectGraphServerResult {
13
13
  projectGraph: ProjectGraph | null;
14
14
  }
15
15
  export declare function serializeResult(error: Error | null, serializedProjectGraph: string | null): string | null;
16
- export declare function deserializeResult(serializedResult: string): ProjectGraphServerResult;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.deserializeResult = exports.serializeResult = exports.killSocketOrPath = exports.FULL_OS_SOCKET_PATH = exports.isWindows = void 0;
3
+ exports.serializeResult = exports.killSocketOrPath = exports.FULL_OS_SOCKET_PATH = exports.isWindows = void 0;
4
4
  const fs_1 = require("fs");
5
5
  const os_1 = require("os");
6
6
  const path_1 = require("path");
@@ -35,24 +35,4 @@ function serializeResult(error, serializedProjectGraph) {
35
35
  return `{ "error": ${serializeError(error)}, "projectGraph": ${serializedProjectGraph} }`;
36
36
  }
37
37
  exports.serializeResult = serializeResult;
38
- // Interpret a string sent over IPC from the server to the client as a project graph result
39
- function deserializeResult(serializedResult) {
40
- try {
41
- const result = JSON.parse(serializedResult);
42
- if (result.error) {
43
- const err = new Error();
44
- err.message = result.error.message;
45
- err.stack = result.error.stack;
46
- result.error = err;
47
- }
48
- return result;
49
- }
50
- catch (_a) {
51
- return {
52
- error: new Error('Could not deserialized project graph result'),
53
- projectGraph: null,
54
- };
55
- }
56
- }
57
- exports.deserializeResult = deserializeResult;
58
38
  //# sourceMappingURL=socket-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"socket-utils.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/socket-utils.ts"],"names":[],"mappings":";;;AACA,2BAAgC;AAChC,2BAA8B;AAC9B,+BAA+B;AAC/B,uCAA+C;AAElC,QAAA,SAAS,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC;AAEhD;;;;;GAKG;AACU,QAAA,mBAAmB,GAAG,iBAAS;IAC1C,CAAC,CAAC,mBAAmB,GAAG,IAAA,cAAO,EAAC,4BAAkB,CAAC;IACnD,CAAC,CAAC,IAAA,cAAO,EAAC,4BAAkB,CAAC,CAAC;AAEhC,SAAgB,gBAAgB;IAC9B,IAAI;QACF,IAAA,eAAU,EAAC,2BAAmB,CAAC,CAAC;KACjC;IAAC,WAAM,GAAE;AACZ,CAAC;AAJD,4CAIC;AAOD,2GAA2G;AAC3G,SAAS,cAAc,CAAC,KAAmB;IACzC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,+FAA+F;AAC/F,SAAgB,eAAe,CAC7B,KAAmB,EACnB,sBAAqC;IAErC,iIAAiI;IACjI,OAAO,cAAc,cAAc,CACjC,KAAK,CACN,qBAAqB,sBAAsB,IAAI,CAAC;AACnD,CAAC;AARD,0CAQC;AAED,2FAA2F;AAC3F,SAAgB,iBAAiB,CAC/B,gBAAwB;IAExB,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,MAAM,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;YACnC,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YAC/B,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC;SACpB;QACD,OAAO,MAAM,CAAC;KACf;IAAC,WAAM;QACN,OAAO;YACL,KAAK,EAAE,IAAI,KAAK,CAAC,6CAA6C,CAAC;YAC/D,YAAY,EAAE,IAAI;SACnB,CAAC;KACH;AACH,CAAC;AAlBD,8CAkBC"}
1
+ {"version":3,"file":"socket-utils.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/socket-utils.ts"],"names":[],"mappings":";;;AACA,2BAAgC;AAChC,2BAA8B;AAC9B,+BAA+B;AAC/B,uCAA+C;AAElC,QAAA,SAAS,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC;AAEhD;;;;;GAKG;AACU,QAAA,mBAAmB,GAAG,iBAAS;IAC1C,CAAC,CAAC,mBAAmB,GAAG,IAAA,cAAO,EAAC,4BAAkB,CAAC;IACnD,CAAC,CAAC,IAAA,cAAO,EAAC,4BAAkB,CAAC,CAAC;AAEhC,SAAgB,gBAAgB;IAC9B,IAAI;QACF,IAAA,eAAU,EAAC,2BAAmB,CAAC,CAAC;KACjC;IAAC,WAAM,GAAE;AACZ,CAAC;AAJD,4CAIC;AAOD,2GAA2G;AAC3G,SAAS,cAAc,CAAC,KAAmB;IACzC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,+FAA+F;AAC/F,SAAgB,eAAe,CAC7B,KAAmB,EACnB,sBAAqC;IAErC,iIAAiI;IACjI,OAAO,cAAc,cAAc,CACjC,KAAK,CACN,qBAAqB,sBAAsB,IAAI,CAAC;AACnD,CAAC;AARD,0CAQC"}
@@ -7,6 +7,7 @@ const nx_deps_cache_1 = require("../nx-deps/nx-deps-cache");
7
7
  const build_project_graph_1 = require("./build-project-graph");
8
8
  const file_utils_1 = require("../file-utils");
9
9
  const output_1 = require("../../utilities/output");
10
+ const is_ci_1 = require("../../utilities/is_ci");
10
11
  /**
11
12
  * Synchronously reads the latest cached copy of the workspace's ProjectGraph.
12
13
  * @throws {Error} if there is no cached ProjectGraph to read from
@@ -52,14 +53,16 @@ function createProjectGraphAsync(projectGraphVersion = '5.0') {
52
53
  // option=true,env=false => no daemon
53
54
  // option=false,env=undefined => no daemon
54
55
  // option=false,env=false => no daemon
55
- // option=true,env=undefined => daemon
56
+ // option=true,env=undefined,ci => no daemon
57
+ // option=true,env=undefined,!ci => daemon
56
58
  // option=true,env=true => daemon
57
59
  // option=false,env=true => daemon
58
60
  try {
59
61
  if ((useDaemonProcessOption === undefined && env === undefined) ||
60
62
  (useDaemonProcessOption === true && env === 'false') ||
61
63
  (useDaemonProcessOption === false && env === undefined) ||
62
- (useDaemonProcessOption === false && env === 'false')) {
64
+ (useDaemonProcessOption === false && env === 'false') ||
65
+ (useDaemonProcessOption === true && env === undefined && (0, is_ci_1.isCI)())) {
63
66
  return projectGraphAdapter('5.0', projectGraphVersion, yield (0, build_project_graph_1.buildProjectGraph)());
64
67
  }
65
68
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
@@ -27,7 +27,7 @@ function setTargetDependencies(host) {
27
27
  bodyLines: [
28
28
  `Nx has deprecated strictlyOrderedTargets in favour of targetDependencies.`,
29
29
  `Based on your configuration the migration has configured targetDependencies for the following targets: ${updatedStrictlyOrderedTargets.join(', ')}.`,
30
- `Read more here: https://nx.dev/core-concepts/configuration`,
30
+ `Read more here: https://nx.dev/configuration/projectjson`,
31
31
  ],
32
32
  });
33
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"add-target-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-12-5-0/add-target-dependencies.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAgD;AAEhD,SAAsB,qBAAqB,CAAC,IAAU;;;QACpD,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAChD,MAAM,sBAAsB,GAAG,CAAA,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,0CAC1E,sBAAsB,KAAI,CAAC,OAAO,CAAC,CAAC;QACjC,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,+CAClD,sBAAsB,CAAC;QAC3B,MAAM,CAAC,kBAAkB,GAAG,MAAA,MAAM,CAAC,kBAAkB,mCAAI,EAAE,CAAC;QAE5D,MAAM,6BAA6B,GAAG,EAAE,CAAC;QACzC,sBAAsB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;gBACtC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG;oBAClC,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE;iBACrC,CAAC;gBACF,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,IAAA,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3C,IAAI,6BAA6B,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5C,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,kDAAkD;gBACzD,SAAS,EAAE;oBACT,2EAA2E;oBAC3E,0GAA0G,6BAA6B,CAAC,IAAI,CAC1I,IAAI,CACL,GAAG;oBACJ,4DAA4D;iBAC7D;aACF,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjCD,sDAiCC;AAED,kBAAe,qBAAqB,CAAC"}
1
+ {"version":3,"file":"add-target-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-12-5-0/add-target-dependencies.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAgD;AAEhD,SAAsB,qBAAqB,CAAC,IAAU;;;QACpD,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAChD,MAAM,sBAAsB,GAAG,CAAA,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,0CAC1E,sBAAsB,KAAI,CAAC,OAAO,CAAC,CAAC;QACjC,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,+CAClD,sBAAsB,CAAC;QAC3B,MAAM,CAAC,kBAAkB,GAAG,MAAA,MAAM,CAAC,kBAAkB,mCAAI,EAAE,CAAC;QAE5D,MAAM,6BAA6B,GAAG,EAAE,CAAC;QACzC,sBAAsB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;gBACtC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG;oBAClC,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE;iBACrC,CAAC;gBACF,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,IAAA,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3C,IAAI,6BAA6B,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5C,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,kDAAkD;gBACzD,SAAS,EAAE;oBACT,2EAA2E;oBAC3E,0GAA0G,6BAA6B,CAAC,IAAI,CAC1I,IAAI,CACL,GAAG;oBACJ,0DAA0D;iBAC3D;aACF,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjCD,sDAiCC;AAED,kBAAe,qBAAqB,CAAC"}
@@ -17,7 +17,7 @@ function setDefaultBaseIfNotSet(host) {
17
17
  bodyLines: [
18
18
  `Nx is moving to "main" as the default branch.`,
19
19
  `To avoid your current defaults changing, defaultBase has been set to "master" in nx.json`,
20
- `Read more here: https://nx.dev/core-concepts/configuration`,
20
+ `Read more here: https://nx.dev/using-nx/affected`,
21
21
  ],
22
22
  });
23
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"set-default-base-if-not-set.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-0-0/set-default-base-if-not-set.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAgD;AAEhD,SAAsB,sBAAsB,CAAC,IAAU;;;;QACrD,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,CAAA,EAAE;YACjC,MAAA,MAAM,CAAC,QAAQ,oCAAf,MAAM,CAAC,QAAQ,GAAK,EAAE,EAAC;YACvB,YAAA,MAAM,CAAC,QAAQ,EAAC,WAAW,uCAAX,WAAW,GAAK,QAAQ,EAAC;YAEzC,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,sCAAsC;gBAC7C,SAAS,EAAE;oBACT,+CAA+C;oBAC/C,0FAA0F;oBAC1F,4DAA4D;iBAC7D;aACF,CAAC,CAAC;SACJ;QACD,IAAA,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjBD,wDAiBC;AAED,kBAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"set-default-base-if-not-set.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-0-0/set-default-base-if-not-set.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAgD;AAEhD,SAAsB,sBAAsB,CAAC,IAAU;;;;QACrD,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,CAAA,EAAE;YACjC,MAAA,MAAM,CAAC,QAAQ,oCAAf,MAAM,CAAC,QAAQ,GAAK,EAAE,EAAC;YACvB,YAAA,MAAM,CAAC,QAAQ,EAAC,WAAW,uCAAX,WAAW,GAAK,QAAQ,EAAC;YAEzC,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,sCAAsC;gBAC7C,SAAS,EAAE;oBACT,+CAA+C;oBAC/C,0FAA0F;oBAC1F,kDAAkD;iBACnD;aACF,CAAC,CAAC;SACJ;QACD,IAAA,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjBD,wDAiBC;AAED,kBAAe,sBAAsB,CAAC"}
@@ -15,6 +15,7 @@ export declare class Cache {
15
15
  cachePath: string;
16
16
  terminalOutputsDir: string;
17
17
  latestOutputsHashesDir: string;
18
+ useFsExtraToCopyAndRemove: boolean;
18
19
  constructor(options: DefaultTasksRunnerOptions);
19
20
  removeOldCacheRecords(): void;
20
21
  get(task: Task): Promise<CachedResult>;
@@ -23,6 +24,8 @@ export declare class Cache {
23
24
  temporaryOutputPath(task: Task): string;
24
25
  removeRecordedOutputsHashes(outputs: string[]): Promise<void>;
25
26
  shouldCopyOutputsFromCache(taskWithCachedResult: TaskWithCachedResult, outputs: string[]): Promise<boolean>;
27
+ private copy;
28
+ private remove;
26
29
  private recordOutputsHash;
27
30
  private areLatestOutputsHashesDifferentThanTaskHash;
28
31
  private getLatestRecordedHashForTask;
@@ -20,6 +20,7 @@ class Cache {
20
20
  this.cachePath = this.createCacheDir();
21
21
  this.terminalOutputsDir = this.createTerminalOutputsDir();
22
22
  this.latestOutputsHashesDir = this.ensureLatestOutputsHashesDir();
23
+ this.useFsExtraToCopyAndRemove = false;
23
24
  }
24
25
  removeOldCacheRecords() {
25
26
  /**
@@ -64,7 +65,7 @@ class Cache {
64
65
  const tdCommit = (0, path_1.join)(this.cachePath, `${task.hash}.commit`);
65
66
  // might be left overs from partially-completed cache invocations
66
67
  yield (0, fs_extra_1.remove)(tdCommit);
67
- yield (0, fs_extra_1.remove)(td);
68
+ yield this.remove(td);
68
69
  yield (0, fs_extra_1.mkdir)(td);
69
70
  yield (0, fs_extra_1.writeFile)((0, path_1.join)(td, 'terminalOutput'), terminalOutput !== null && terminalOutput !== void 0 ? terminalOutput : 'no terminal output');
70
71
  yield (0, fs_extra_1.mkdir)((0, path_1.join)(td, 'outputs'));
@@ -72,11 +73,9 @@ class Cache {
72
73
  const src = (0, path_1.join)(this.root, f);
73
74
  if (yield existsAsync(src)) {
74
75
  const cached = (0, path_1.join)(td, 'outputs', f);
75
- // Ensure parent directory is created if src is a file
76
- const isFile = (yield lstatAsync(src)).isFile();
77
- const directory = isFile ? (0, path_1.resolve)(cached, '..') : cached;
76
+ const directory = (0, path_1.resolve)(cached, '..');
78
77
  yield (0, fs_extra_1.ensureDir)(directory);
79
- yield (0, fs_extra_1.copy)(src, cached);
78
+ yield this.copy(src, directory);
80
79
  }
81
80
  })));
82
81
  // we need this file to account for partial writes to the cache folder.
@@ -103,13 +102,11 @@ class Cache {
103
102
  yield Promise.all(outputs.map((f) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
104
103
  const cached = (0, path_1.join)(cachedResult.outputsPath, f);
105
104
  if (yield existsAsync(cached)) {
106
- const isFile = (yield lstatAsync(cached)).isFile();
107
105
  const src = (0, path_1.join)(this.root, f);
108
- yield (0, fs_extra_1.remove)(src);
109
- // Ensure parent directory is created if src is a file
110
- const directory = isFile ? (0, path_1.resolve)(src, '..') : src;
106
+ yield this.remove(src);
107
+ const directory = (0, path_1.resolve)(src, '..');
111
108
  yield (0, fs_extra_1.ensureDir)(directory);
112
- yield (0, fs_extra_1.copy)(cached, src);
109
+ yield this.copy(cached, directory);
113
110
  }
114
111
  })));
115
112
  yield this.recordOutputsHash(outputs, hash);
@@ -136,6 +133,38 @@ class Cache {
136
133
  (yield this.isAnyOutputMissing(taskWithCachedResult.cachedResult, outputs)));
137
134
  });
138
135
  }
136
+ copy(src, directory) {
137
+ if (this.useFsExtraToCopyAndRemove) {
138
+ return (0, fs_extra_1.copy)(src, directory);
139
+ }
140
+ return new Promise((res, rej) => {
141
+ (0, child_process_1.exec)(`cp -a "${src}" "${directory}"`, (error) => {
142
+ if (!error) {
143
+ res(null);
144
+ }
145
+ else {
146
+ this.useFsExtraToCopyAndRemove = true;
147
+ (0, fs_extra_1.copy)(src, directory).then(res, rej);
148
+ }
149
+ });
150
+ });
151
+ }
152
+ remove(folder) {
153
+ if (this.useFsExtraToCopyAndRemove) {
154
+ return (0, fs_extra_1.remove)(folder);
155
+ }
156
+ return new Promise((res, rej) => {
157
+ (0, child_process_1.exec)(`rm -rf "${folder}"`, (error) => {
158
+ if (!error) {
159
+ res(null);
160
+ }
161
+ else {
162
+ this.useFsExtraToCopyAndRemove = true;
163
+ (0, fs_extra_1.remove)(folder).then(res, rej);
164
+ }
165
+ });
166
+ });
167
+ }
139
168
  recordOutputsHash(outputs, hash) {
140
169
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
141
170
  for (const output of outputs) {
@@ -1 +1 @@
1
- {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,12 @@
1
1
  import type { Task } from '@nrwl/devkit';
2
2
  import { TaskStatus } from './tasks-runner';
3
3
  import { TaskCacheStatus } from '../utilities/output';
4
+ export interface TaskResult {
5
+ task: Task;
6
+ status: TaskStatus;
7
+ code: number;
8
+ terminalOutput?: string;
9
+ }
4
10
  export interface TaskMetadata {
5
11
  groupId: number;
6
12
  }
@@ -21,11 +27,7 @@ export interface LifeCycle {
21
27
  */
22
28
  endTask?(task: Task, code: number): void;
23
29
  startTasks?(task: Task[], metadata: TaskMetadata): void;
24
- endTasks?(taskResults: Array<{
25
- task: Task;
26
- status: TaskStatus;
27
- code: number;
28
- }>, metadata: TaskMetadata): void;
30
+ endTasks?(taskResults: TaskResult[], metadata: TaskMetadata): void;
29
31
  printTaskTerminalOutput?(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
30
32
  }
31
33
  export declare class CompositeLifeCycle implements LifeCycle {
@@ -37,10 +39,6 @@ export declare class CompositeLifeCycle implements LifeCycle {
37
39
  startTask(task: Task): void;
38
40
  endTask(task: Task, code: number): void;
39
41
  startTasks(tasks: Task[], metadata: TaskMetadata): void;
40
- endTasks(taskResults: Array<{
41
- task: Task;
42
- status: TaskStatus;
43
- code: number;
44
- }>, metadata: TaskMetadata): void;
42
+ endTasks(taskResults: TaskResult[], metadata: TaskMetadata): void;
45
43
  printTaskTerminalOutput(task: Task, cacheStatus: TaskCacheStatus, output: string): void;
46
44
  }
@@ -1 +1 @@
1
- {"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":";;;AA2CA,MAAa,kBAAkB;IAC7B,YAA6B,UAAuB;QAAvB,eAAU,GAAV,UAAU,CAAa;IAAG,CAAC;IAExD,YAAY;QACV,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,EAAE,CAAC;aAClB;SACF;IACH,CAAC;IAED,UAAU;QACR,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,EAAE,CAAC;aAChB;SACF;IACH,CAAC;IAED,YAAY,CAAC,IAAU;QACrB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aACtB;SACF;IACH,CAAC;IAED,SAAS,CAAC,IAAU;QAClB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,SAAS,EAAE;gBACf,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACnB;SACF;IACH,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,IAAY;QAC9B,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,OAAO,EAAE;gBACb,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACvB;SACF;IACH,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,QAAsB;QAC9C,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;aAC/B;iBAAM,IAAI,CAAC,CAAC,SAAS,EAAE;gBACtB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;SACF;IACH,CAAC;IAED,QAAQ,CACN,WAAoE,EACpE,QAAsB;QAEtB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACd,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;aACnC;iBAAM,IAAI,CAAC,CAAC,OAAO,EAAE;gBACpB,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aACvD;SACF;IACH,CAAC;IAED,uBAAuB,CACrB,IAAU,EACV,WAA4B,EAC5B,MAAc;QAEd,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,uBAAuB,EAAE;gBAC7B,CAAC,CAAC,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;aACtD;SACF;IACH,CAAC;CACF;AA7ED,gDA6EC"}
1
+ {"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":";;;AA+CA,MAAa,kBAAkB;IAC7B,YAA6B,UAAuB;QAAvB,eAAU,GAAV,UAAU,CAAa;IAAG,CAAC;IAExD,YAAY;QACV,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,EAAE,CAAC;aAClB;SACF;IACH,CAAC;IAED,UAAU;QACR,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,EAAE,CAAC;aAChB;SACF;IACH,CAAC;IAED,YAAY,CAAC,IAAU;QACrB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aACtB;SACF;IACH,CAAC;IAED,SAAS,CAAC,IAAU;QAClB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,SAAS,EAAE;gBACf,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACnB;SACF;IACH,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,IAAY;QAC9B,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,OAAO,EAAE;gBACb,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACvB;SACF;IACH,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,QAAsB;QAC9C,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;aAC/B;iBAAM,IAAI,CAAC,CAAC,SAAS,EAAE;gBACtB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;SACF;IACH,CAAC;IAED,QAAQ,CAAC,WAAyB,EAAE,QAAsB;QACxD,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACd,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;aACnC;iBAAM,IAAI,CAAC,CAAC,OAAO,EAAE;gBACpB,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aACvD;SACF;IACH,CAAC;IAED,uBAAuB,CACrB,IAAU,EACV,WAA4B,EAC5B,MAAc;QAEd,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,uBAAuB,EAAE;gBAC7B,CAAC,CAAC,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;aACtD;SACF;IACH,CAAC;CACF;AA1ED,gDA0EC"}
@@ -0,0 +1,4 @@
1
+ /**
2
+ * All credit to https://github.com/jonschlinkert/pretty-time
3
+ */
4
+ export declare function prettyTime(time: any, smallest?: any, digits?: any): string;
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ /**
3
+ * All credit to https://github.com/jonschlinkert/pretty-time
4
+ */
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.prettyTime = void 0;
7
+ const nano = (time) => +time[0] * 1e9 + +time[1];
8
+ const scale = {
9
+ w: 6048e11,
10
+ d: 864e11,
11
+ h: 36e11,
12
+ m: 6e10,
13
+ s: 1e9,
14
+ ms: 1e6,
15
+ μs: 1e3,
16
+ ns: 1,
17
+ };
18
+ const regex = {
19
+ w: /^(w((ee)?k)?s?)$/,
20
+ d: /^(d(ay)?s?)$/,
21
+ h: /^(h((ou)?r)?s?)$/,
22
+ m: /^(min(ute)?s?|m)$/,
23
+ s: /^((sec(ond)?)s?|s)$/,
24
+ ms: /^(milli(second)?s?|ms)$/,
25
+ μs: /^(micro(second)?s?|μs)$/,
26
+ ns: /^(nano(second)?s?|ns?)$/,
27
+ };
28
+ const isSmallest = function (uom, unit) {
29
+ return regex[uom].test(unit);
30
+ };
31
+ const round = function (num, digits) {
32
+ const n = Math.abs(num);
33
+ return /[0-9]/.test(digits) ? Number(n.toFixed(digits)) : Math.round(n);
34
+ };
35
+ function prettyTime(time, smallest, digits) {
36
+ const isNumber = /^[0-9]+$/.test(time);
37
+ if (!isNumber && !Array.isArray(time)) {
38
+ throw new TypeError('expected an array or number in nanoseconds');
39
+ }
40
+ if (Array.isArray(time) && time.length !== 2) {
41
+ throw new TypeError('expected an array from process.hrtime()');
42
+ }
43
+ if (/^[0-9]+$/.test(smallest)) {
44
+ digits = smallest;
45
+ smallest = null;
46
+ }
47
+ let num = isNumber ? time : nano(time);
48
+ let res = '';
49
+ let prev;
50
+ for (const uom of Object.keys(scale)) {
51
+ const step = scale[uom];
52
+ let inc = num / step;
53
+ if (smallest && isSmallest(uom, smallest)) {
54
+ inc = round(inc, digits);
55
+ if (prev && inc === prev / step)
56
+ --inc;
57
+ res += inc + uom;
58
+ return res.trim();
59
+ }
60
+ if (inc < 1)
61
+ continue;
62
+ if (!smallest) {
63
+ inc = round(inc, digits);
64
+ res += inc + uom;
65
+ return res;
66
+ }
67
+ prev = step;
68
+ inc = Math.floor(inc);
69
+ num -= inc * step;
70
+ res += inc + uom + ' ';
71
+ }
72
+ return res.trim();
73
+ }
74
+ exports.prettyTime = prettyTime;
75
+ //# sourceMappingURL=pretty-time.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pretty-time.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/neo-output/pretty-time.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ import type { Task } from '../tasks-runner';
2
+ import { LifeCycle } from '@nrwl/workspace/src/tasks-runner/life-cycle';
3
+ export declare function createOutputRenderer({ projectNames, tasks, args, }: {
4
+ projectNames: string[];
5
+ tasks: Task[];
6
+ args: {
7
+ target?: string;
8
+ configuration?: string;
9
+ };
10
+ }): Promise<{
11
+ lifeCycle: LifeCycle;
12
+ renderIsDone: Promise<void>;
13
+ }>;