@nrwl/workspace 13.8.5 → 13.8.8-beta.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (64) hide show
  1. package/LICENSE +22 -0
  2. package/package.json +8 -5
  3. package/src/command-line/affected.js +2 -2
  4. package/src/command-line/affected.js.map +1 -1
  5. package/src/command-line/format.js +5 -2
  6. package/src/command-line/format.js.map +1 -1
  7. package/src/command-line/run-one.js +1 -1
  8. package/src/command-line/run-one.js.map +1 -1
  9. package/src/command-line/utils.js +1 -1
  10. package/src/command-line/utils.js.map +1 -1
  11. package/src/command-line/workspace-integrity-checks.js +2 -2
  12. package/src/command-line/workspace-integrity-checks.js.map +1 -1
  13. package/src/core/affected-project-graph/locators/tsconfig-json-changes.js +6 -1
  14. package/src/core/affected-project-graph/locators/tsconfig-json-changes.js.map +1 -1
  15. package/src/core/hasher/hasher.d.ts +1 -1
  16. package/src/core/hasher/hasher.js +33 -15
  17. package/src/core/hasher/hasher.js.map +1 -1
  18. package/src/core/project-graph/build-project-graph.js +4 -6
  19. package/src/core/project-graph/build-project-graph.js.map +1 -1
  20. package/src/core/project-graph/daemon/client/client.js +6 -4
  21. package/src/core/project-graph/daemon/client/client.js.map +1 -1
  22. package/src/core/target-project-locator.js +9 -11
  23. package/src/core/target-project-locator.js.map +1 -1
  24. package/src/generators/init/files/root/tools/tsconfig.tools.json__tmpl__ +1 -1
  25. package/src/generators/init/init.js +5 -8
  26. package/src/generators/init/init.js.map +1 -1
  27. package/src/generators/library/files/lib/tsconfig.json +1 -1
  28. package/src/generators/library/library.js +4 -2
  29. package/src/generators/library/library.js.map +1 -1
  30. package/src/generators/move/lib/update-imports.js +2 -1
  31. package/src/generators/move/lib/update-imports.js.map +1 -1
  32. package/src/generators/remove/lib/update-tsconfig.js +2 -1
  33. package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
  34. package/src/init/init.d.ts +1 -0
  35. package/src/init/init.js +13 -0
  36. package/src/init/init.js.map +1 -0
  37. package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js +3 -3
  38. package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js.map +1 -1
  39. package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +5 -5
  40. package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
  41. package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js +4 -4
  42. package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js.map +1 -1
  43. package/src/tasks-runner/run-command.js +1 -1
  44. package/src/tasks-runner/run-command.js.map +1 -1
  45. package/src/tasks-runner/task-orchestrator.js +1 -1
  46. package/src/tasks-runner/task-orchestrator.js.map +1 -1
  47. package/src/tasks-runner/tasks-schedule.d.ts +6 -5
  48. package/src/tasks-runner/tasks-schedule.js +13 -7
  49. package/src/tasks-runner/tasks-schedule.js.map +1 -1
  50. package/src/tslint/nxEnforceModuleBoundariesRule.js +24 -8
  51. package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
  52. package/src/utilities/output.js +3 -3
  53. package/src/utilities/output.js.map +1 -1
  54. package/src/utilities/typescript.d.ts +6 -1
  55. package/src/utilities/typescript.js +32 -2
  56. package/src/utilities/typescript.js.map +1 -1
  57. package/src/utils/ast-utils.d.ts +1 -1
  58. package/src/utils/graph-utils.d.ts +2 -1
  59. package/src/utils/graph-utils.js +18 -6
  60. package/src/utils/graph-utils.js.map +1 -1
  61. package/src/utils/runtime-lint-utils.d.ts +23 -3
  62. package/src/utils/runtime-lint-utils.js +57 -7
  63. package/src/utils/runtime-lint-utils.js.map +1 -1
  64. package/src/utils/versions.js +1 -1
@@ -2,11 +2,11 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TargetProjectLocator = void 0;
4
4
  const typescript_1 = require("../utilities/typescript");
5
- const file_utils_1 = require("./file-utils");
6
5
  const devkit_1 = require("@nrwl/devkit");
7
6
  const fileutils_1 = require("../utilities/fileutils");
8
7
  const path_1 = require("path");
9
8
  const app_root_1 = require("@nrwl/tao/src/utils/app-root");
9
+ const fs_1 = require("fs");
10
10
  class TargetProjectLocator {
11
11
  constructor(nodes, externalNodes) {
12
12
  var _a, _b;
@@ -122,22 +122,20 @@ class TargetProjectLocator {
122
122
  return (0, path_1.join)(app_root_1.appRootPath, path);
123
123
  }
124
124
  getRootTsConfig() {
125
- let path = 'tsconfig.base.json';
126
- let absolutePath = this.getAbsolutePath(path);
127
- let content = (0, file_utils_1.readFileIfExisting)(absolutePath);
128
- if (!content) {
129
- path = 'tsconfig.json';
130
- absolutePath = this.getAbsolutePath(path);
131
- content = (0, file_utils_1.readFileIfExisting)(absolutePath);
132
- }
133
- if (!content) {
125
+ const path = (0, typescript_1.getRootTsConfigFileName)();
126
+ if (!path) {
134
127
  return {
135
128
  path: null,
136
129
  absolutePath: null,
137
130
  config: null,
138
131
  };
139
132
  }
140
- return { path, absolutePath, config: (0, devkit_1.parseJson)(content) };
133
+ const absolutePath = this.getAbsolutePath(path);
134
+ return {
135
+ absolutePath,
136
+ path,
137
+ config: (0, devkit_1.parseJson)((0, fs_1.readFileSync)(absolutePath, 'utf8')),
138
+ };
141
139
  }
142
140
  findMatchingProjectFiles(file) {
143
141
  for (let currentPath = file; currentPath != (0, path_1.dirname)(currentPath); currentPath = (0, path_1.dirname)(currentPath)) {
@@ -1 +1 @@
1
- {"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/target-project-locator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/target-project-locator.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  {
2
- "extends": "../tsconfig.base.json",
2
+ "extends": "../<%= rootTsConfigPath %>",
3
3
  "compilerOptions": {
4
4
  "outDir": "../dist/out-tsc/tools",
5
5
  "rootDir": ".",
@@ -9,6 +9,7 @@ const prettier_1 = require("../../utilities/prettier");
9
9
  const default_base_1 = require("../../utilities/default-base");
10
10
  const versions_1 = require("../../utils/versions");
11
11
  const workspace_1 = require("../workspace/workspace");
12
+ const typescript_1 = require("../../utilities/typescript");
12
13
  function updatePackageJson(tree) {
13
14
  (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
14
15
  var _a, _b;
@@ -32,11 +33,6 @@ function updatePackageJson(tree) {
32
33
  return packageJson;
33
34
  });
34
35
  }
35
- function getRootTsConfigPath(host) {
36
- return host.exists('tsconfig.base.json')
37
- ? 'tsconfig.base.json'
38
- : 'tsconfig.json';
39
- }
40
36
  function convertPath(name, originalPath) {
41
37
  return `apps/${name}/${originalPath}`;
42
38
  }
@@ -210,7 +206,7 @@ function updateTsConfig(host) {
210
206
  json.implicitDependencies['tsconfig.base.json'] = '*';
211
207
  return json;
212
208
  });
213
- (0, devkit_1.writeJson)(host, 'tsconfig.base.json', setUpCompilerOptions((0, devkit_1.readJson)(host, getRootTsConfigPath(host))));
209
+ (0, devkit_1.writeJson)(host, 'tsconfig.base.json', setUpCompilerOptions((0, devkit_1.readJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host))));
214
210
  if (host.exists('tsconfig.json')) {
215
211
  host.delete('tsconfig.json');
216
212
  }
@@ -218,7 +214,7 @@ function updateTsConfig(host) {
218
214
  function updateTsConfigsJson(host, options) {
219
215
  const app = (0, devkit_1.readProjectConfiguration)(host, options.name);
220
216
  const e2eProject = getE2eProject(host);
221
- const tsConfigPath = getRootTsConfigPath(host);
217
+ const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(host);
222
218
  const appOffset = (0, devkit_1.offsetFromRoot)(app.root);
223
219
  (0, devkit_1.updateJson)(host, app.targets.build.options.tsConfig, (json) => {
224
220
  json.extends = `${appOffset}${tsConfigPath}`;
@@ -536,7 +532,7 @@ function createNxJson(host) {
536
532
  throw new Error(`The schematic can only be used with Angular CLI workspaces with a single application.`);
537
533
  }
538
534
  const name = Object.keys(projects)[0];
539
- const tsConfigPath = getRootTsConfigPath(host);
535
+ const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(host);
540
536
  (0, devkit_1.writeJson)(host, 'nx.json', {
541
537
  npmScope: name,
542
538
  implicitDependencies: {
@@ -583,6 +579,7 @@ function addFiles(host) {
583
579
  (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/root'), '.', {
584
580
  tmpl: '',
585
581
  dot: '.',
582
+ rootTsConfigPath: (0, typescript_1.getRootTsConfigPathInTree)(host),
586
583
  });
587
584
  if (!host.exists('.prettierignore')) {
588
585
  (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/prettier'), '.', {
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/init/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/init/init.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  {
2
- "extends": "<%= offsetFromRoot %>tsconfig.base.json",<% if (js) { %>
2
+ "extends": "<%= rootTsConfigPath %>",<% if (js) { %>
3
3
  "compilerOptions": {
4
4
  "allowJs": true
5
5
  },<% } %>
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
6
  const path_1 = require("path");
7
7
  const run_tasks_in_serial_1 = require("../../utilities/run-tasks-in-serial");
8
+ const typescript_1 = require("../../utilities/typescript");
8
9
  const versions_1 = require("../../utils/versions");
9
10
  // nx-ignore-next-line
10
11
  const { jestProjectGenerator } = require('@nrwl/jest');
@@ -58,7 +59,7 @@ function updateTsConfig(tree, options) {
58
59
  });
59
60
  }
60
61
  function updateRootTsConfig(host, options) {
61
- (0, devkit_1.updateJson)(host, 'tsconfig.base.json', (json) => {
62
+ (0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
62
63
  const c = json.compilerOptions;
63
64
  c.paths = c.paths || {};
64
65
  delete c.paths[options.name];
@@ -73,9 +74,10 @@ function updateRootTsConfig(host, options) {
73
74
  }
74
75
  function createFiles(tree, options) {
75
76
  const { className, name, propertyName } = (0, devkit_1.names)(options.name);
77
+ const rootOffset = (0, devkit_1.offsetFromRoot)(options.projectRoot);
76
78
  (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { dot: '.', className,
77
79
  name,
78
- propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), hasUnitTestRunner: options.unitTestRunner !== 'none' }));
80
+ propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: rootOffset, rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(tree, options.projectRoot), hasUnitTestRunner: options.unitTestRunner !== 'none' }));
79
81
  if (options.unitTestRunner === 'none') {
80
82
  tree.delete((0, path_1.join)(options.projectRoot, 'src/lib', `${options.fileName}.spec.ts`));
81
83
  }
@@ -1 +1 @@
1
- {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/library/library.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateImports = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const ts = require("typescript");
6
+ const typescript_1 = require("../../../utilities/typescript");
6
7
  const find_nodes_1 = require("../../../utilities/typescript/find-nodes");
7
8
  const utils_1 = require("./utils");
8
9
  /**
@@ -19,7 +20,7 @@ function updateImports(tree, schema, project) {
19
20
  const projects = (0, devkit_1.getProjects)(tree);
20
21
  // use the source root to find the from location
21
22
  // this attempts to account for libs that have been created with --importPath
22
- const tsConfigPath = 'tsconfig.base.json';
23
+ const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(tree);
23
24
  let tsConfig;
24
25
  let fromPath;
25
26
  if (tree.exists(tsConfigPath)) {
@@ -1 +1 @@
1
- {"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AACtB,iCAAiC;AACjC,yEAAqE;AAErE,mCAA2C;AAE3C;;;;GAIG;AACH,SAAgB,aAAa,CAC3B,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,wCAAwC;QACxC,OAAO;KACR;IAED,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,gDAAgD;IAChD,6EAA6E;IAC7E,MAAM,YAAY,GAAG,oBAAoB,CAAC;IAC1C,IAAI,QAAa,CAAC;IAClB,IAAI,QAAgB,CAAC;IACrB,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACjE,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACnE,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CACjC,CACF,CAAC;KACH;IAED,MAAM,UAAU,GAAG;QACjB,IAAI,EACF,QAAQ;YACR,IAAA,wBAAgB,EACd,IAAI,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAC1D;QACH,EAAE,EAAE,MAAM,CAAC,UAAU;KACtB,CAAC;IAEF,IAAI,MAAM,CAAC,gBAAgB,EAAE;QAC3B,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAE3D,KAAK,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE;YAC/D,IAAI,IAAI,KAAK,MAAM,CAAC,WAAW,EAAE;gBAC/B,SAAS;aACV;YAED,IAAA,6BAAoB,EAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;gBACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC1C,iBAAiB,CAAC,SAAS,GAAG,CAAC,CAAC;gBAChC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;oBACrC,OAAO;iBACR;gBAED,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;SACJ;KACF;IAED,MAAM,WAAW,GAAG;QAClB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7C,EAAE,EAAE,MAAM,CAAC,WAAW;KACvB,CAAC;IAEF,IAAI,QAAQ,EAAE;QACZ,MAAM,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAa,CAAC;QACzE,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CACb;gBACE,mBAAmB,UAAU,CAAC,IAAI,MAAM;gBACxC,GAAG,YAAY,wBAAwB;aACxC,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAC;SACH;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACjC,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAC7D,CAAC;QAEF,IAAI,MAAM,CAAC,gBAAgB,EAAE;YAC3B,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC;YAC5D,OAAO,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC;SAC/D;QAED,IAAA,kBAAS,EAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;KACzC;AACH,CAAC;AApFD,sCAoFC;AAED;;GAEG;AACH,SAAS,iBAAiB,CAAC,IAAU,EAAE,IAAY,EAAE,IAAY,EAAE,EAAU;IAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,IAAI,EACJ,QAAQ,EACR,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,gDAAgD;IAChD,MAAM,WAAW,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QACjD,GAAG,wBAAwB,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;QACjD,GAAG,oBAAoB,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;KAC9C,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AAChC,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAC/B,UAAyB,EACzB,IAAY,EACZ,EAAU;IAEV,MAAM,WAAW,GAAG,IAAA,sBAAS,EAC3B,UAAU,EACV,EAAE,CAAC,UAAU,CAAC,iBAAiB,CACN,CAAC;IAE5B,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,KAAK,MAAM,EAAE,eAAe,EAAE,IAAI,WAAW,EAAE;QAC7C,IAAI,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE;YACvC,OAAO,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;SACnE;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,oBAAoB,CAC3B,UAAyB,EACzB,IAAY,EACZ,EAAU;IAEV,MAAM,WAAW,GAAG,IAAA,sBAAS,EAC3B,UAAU,EACV,EAAE,CAAC,UAAU,CAAC,cAAc,CACN,CAAC;IAEzB,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,KAAK,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,WAAW,EAAE;QACzD,MAAM,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAEhC,mCAAmC;QACnC,IACE,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa;YAC/C,eAAe;YACf,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC,EACnC;YACA,OAAO,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;SACnE;QAED,4BAA4B;QAC5B,IACE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC;YAC3B,UAAU,CAAC,IAAI,KAAK,SAAS;YAC7B,eAAe;YACf,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC,EACnC;YACA,OAAO,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;SACnE;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAC5B,eAAiC,EACjC,IAAY,EACZ,EAAU;IAEV,IACE,eAAe,CAAC,IAAI,KAAK,IAAI;QAC7B,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAC3C;QACA,OAAO;YACL;gBACE,IAAI,EAAE,mBAAU,CAAC,MAAM;gBACvB,KAAK,EAAE,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC;gBACrC,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,MAAM;aACpC;YACD;gBACE,IAAI,EAAE,mBAAU,CAAC,MAAM;gBACvB,KAAK,EAAE,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC;gBACrC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;aAC9D;SACF,CAAC;KACH;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC"}
1
+ {"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateTsconfig = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
+ const typescript_1 = require("../../../utilities/typescript");
5
6
  /**
6
7
  * Updates the tsconfig paths to remove the project.
7
8
  *
@@ -9,7 +10,7 @@ const devkit_1 = require("@nrwl/devkit");
9
10
  */
10
11
  function updateTsconfig(tree, schema, project) {
11
12
  const { appsDir, libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
12
- const tsConfigPath = 'tsconfig.base.json';
13
+ const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(tree);
13
14
  if (tree.exists(tsConfigPath)) {
14
15
  (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
15
16
  delete json.compilerOptions.paths[`@${npmScope}/${project.root.substr(project.projectType === 'application'
@@ -1 +1 @@
1
- {"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,YAAY,GAAG,oBAAoB,CAAC;IAC1C,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;YACtC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAC/B,IAAI,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CACjC,OAAO,CAAC,WAAW,KAAK,aAAa;gBACnC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBACpB,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CACvB,EAAE,CACJ,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AArBD,wCAqBC"}
1
+ {"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,8DAA0E;AAG1E;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,YAAY,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC;IACrD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;YACtC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAC/B,IAAI,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CACjC,OAAO,CAAC,WAAW,KAAK,aAAa;gBACnC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBACpB,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CACvB,EAAE,CACJ,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AArBD,wCAqBC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ const project_graph_1 = require("../core/project-graph/project-graph");
5
+ (() => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
6
+ try {
7
+ yield (0, project_graph_1.createProjectGraphAsync)();
8
+ }
9
+ catch (e) {
10
+ // Do not error since this runs in a postinstall
11
+ }
12
+ }))();
13
+ //# sourceMappingURL=init.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/init/init.ts"],"names":[],"mappings":";;;AAAA,uEAA8E;AAE9E,CAAC,GAAS,EAAE;IACV,IAAI;QACF,MAAM,IAAA,uCAAuB,GAAE,CAAC;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,gDAAgD;KACjD;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
@@ -86,7 +86,7 @@ function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, args, ove
86
86
  switch (state) {
87
87
  case 'EXECUTING_DEPENDENT_TARGETS':
88
88
  if (totalFailedTasks === 0) {
89
- linesToRender.push(` ${output_1.output.colors.cyan(cli_spinners_1.dots.frames[dependentTargetsCurrentFrame])} ${output_1.output.colors.white.dim(`Nx is waiting on ${remainingDependentTasksNotFromInitiatingProject} dependent project tasks before running tasks from`)} ${output_1.output.colors.white(`${initiatingProject}`)}...`);
89
+ linesToRender.push(` ${output_1.output.colors.cyan(cli_spinners_1.dots.frames[dependentTargetsCurrentFrame])} ${output_1.output.dim(`Nx is waiting on ${remainingDependentTasksNotFromInitiatingProject} dependent project tasks before running tasks from`)} ${initiatingProject}${output_1.output.dim('...')}`);
90
90
  if (totalSuccessfulTasks > 0) {
91
91
  linesToRender.push('');
92
92
  }
@@ -191,7 +191,7 @@ function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, args, ove
191
191
  .forEach((arg) => taskOverridesLines.push(arg));
192
192
  }
193
193
  const pinnedFooterLines = [
194
- output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim.white(` (${timeTakenText})`)),
194
+ output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim(` (${timeTakenText})`)),
195
195
  ...taskOverridesLines,
196
196
  ];
197
197
  if (totalCachedTasks > 0) {
@@ -215,7 +215,7 @@ function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, args, ove
215
215
  .forEach((arg) => taskOverridesLines.push(arg));
216
216
  }
217
217
  renderLines([
218
- output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim.white(` (${timeTakenText})`)),
218
+ output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim(` (${timeTakenText})`)),
219
219
  ...taskOverridesLines,
220
220
  '',
221
221
  ` ${output_1.output.colors.red(figures.cross)} ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
@@ -1 +1 @@
1
- {"version":3,"file":"dynamic-run-one-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dynamic-run-one-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.ts"],"names":[],"mappings":";;;;AAAA,wCAAwC;AACxC,+CAAoC;AACpC,2BAAyB;AACzB,qCAAqC;AACrC,mDAAgD;AAGhD,+CAA2C;AAc3C;;;;;;;;;GASG;AACH,SAAsB,iCAAiC,CAAC,EACtD,iBAAiB,EACjB,KAAK,EACL,IAAI,EACJ,SAAS,GAMV;;QACC,SAAS,CAAC,IAAI,EAAE,CAAC;QACjB,IAAI,0BAAiD,CAAC;QACtD,MAAM,YAAY,GAAG,IAAI,OAAO,CAC9B,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,0BAA0B,GAAG,OAAO,CAAC,CACpD,CAAC,IAAI,CAAC,GAAG,EAAE;YACV,mBAAmB,EAAE,CAAC;YACtB,SAAS,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,SAAS,mBAAmB;YAC1B,IAAI,gCAAgC,EAAE;gBACpC,aAAa,CAAC,gCAAgC,CAAC,CAAC;aACjD;QACH,CAAC;QAED,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAChD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAClD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACnD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAElD,MAAM,SAAS,GAAG,EAAwB,CAAC;QAE3C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,2CAAa,SAAS,EAAC,CAAC;QAExC,IAAI,KAAK,GAAU,6BAA6B,CAAC;QAEjD,MAAM,sBAAsB,GAA2B,EAAE,CAAC;QAC1D,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;QAChC,MAAM,mBAAmB,GAAG,UAAU,GAAG,CAAC,CAAC;QAC3C,MAAM,+BAA+B,GAAG,KAAK,CAAC,MAAM,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,iBAAiB,CAC9C,CAAC,MAAM,CAAC;QACT,uFAAuF;QACvF,MAAM,2CAA2C,GAC/C,UAAU,GAAG,+BAA+B,CAAC;QAE/C,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;QAE/B,IAAI,wBAAwB,GAAG,CAAC,CAAC;QACjC,IAAI,mBAAmB,GAAG,CAAC,CAAC;QAC5B,IAAI,oBAAoB,GAAG,CAAC,CAAC;QAC7B,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,IAAI,gBAAgB,GAAG,CAAC,CAAC;QAEzB,+CAA+C;QAC/C,IAAI,4BAA4B,GAAG,CAAC,CAAC;QACrC,IAAI,gCAA4D,CAAC;QAEjE,MAAM,qBAAqB,GAAG,GAAG,EAAE;YACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,EAAE,CAAC,EAAE,EAAE;gBACjD,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC3C,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;aACvC;QACH,CAAC,CAAC;QAEF,MAAM,WAAW,GAAG,CAClB,KAAe,EACf,YAAY,GAAG,MAAM,EACrB,aAAa,GAAG,IAAI,EACpB,WAAW,GAAG,KAAK,EACnB,EAAE;YACF,IAAI,eAAe,GAAG,CAAC,CAAC;YACxB,IAAI,aAAa,EAAE;gBACjB,eAAM,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;gBAC1C,eAAe,IAAI,CAAC,CAAC;aACtB;YACD,IAAI,aAAa,EAAE;gBACjB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAChB;YACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAM,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,QAAG,CAAC,CAAC;aAC1E;YACD,wBAAwB,GAAG,KAAK,CAAC,MAAM,GAAG,eAAe,CAAC;QAC5D,CAAC,CAAC;QAEF,MAAM,sBAAsB,GAAG,CAAC,aAAa,GAAG,IAAI,EAAE,EAAE;YACtD,IAAI,2CAA2C,IAAI,CAAC,EAAE;gBACpD,OAAO;aACR;YACD,MAAM,GAAG,GAAG,mBAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,4BAA4B,CAAC;YAC1C,4BAA4B,GAAG,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;YAE1D,MAAM,aAAa,GAAa,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,+CAA+C,GACnD,2CAA2C,GAAG,mBAAmB,CAAC;YAEpE,QAAQ,KAAK,EAAE;gBACb,KAAK,6BAA6B;oBAChC,IAAI,gBAAgB,KAAK,CAAC,EAAE;wBAC1B,aAAa,CAAC,IAAI,CAChB,MAAM,eAAM,CAAC,MAAM,CAAC,IAAI,CACtB,mBAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAC1C,OAAO,eAAM,CAAC,GAAG,CAChB,oBAAoB,+CAA+C,oDAAoD,CACxH,IAAI,iBAAiB,GAAG,eAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAC7C,CAAC;wBACF,IAAI,oBAAoB,GAAG,CAAC,EAAE;4BAC5B,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;yBACxB;qBACF;oBACD,MAAM;aACT;YAED,IAAI,gBAAgB,GAAG,CAAC,EAAE;gBACxB,aAAa,CAAC,IAAI,CAChB,eAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CACnB,MAAM,eAAM,CAAC,MAAM,CAAC,GAAG,CACrB,OAAO,CAAC,KAAK,CACd,OAAO,gBAAgB,GAAG,IAAI,mBAAmB,EAAE,6CAA6C,CAClG,CACF,CAAC;aACH;YAED,IAAI,oBAAoB,GAAG,CAAC,EAAE;gBAC5B,aAAa,CAAC,IAAI,CAChB,eAAM,CAAC,GAAG,CACR,MAAM,eAAM,CAAC,GAAG,CACd,OAAO,CAAC,IAAI,CACb,OAAO,oBAAoB,GAAG,IAAI,mBAAmB,EAAE,sCAAsC,eAAM,CAAC,GAAG,CACtG,IAAI,gBAAgB,mBAAmB,CACxC,EAAE,CACJ,CACF,CAAC;aACH;YAED,qBAAqB,EAAE,CAAC;YAExB,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,WAAW,CACT,aAAa,EACb,MAAM,EACN,aAAa,IAAI,KAAK,KAAK,6BAA6B,EACxD,IAAI,CACL,CAAC;aACH;iBAAM;gBACL,WAAW,CAAC,EAAE,CAAC,CAAC;aACjB;QACH,CAAC,CAAC;QAEF,SAAS,CAAC,YAAY,GAAG,GAAG,EAAE;YAC5B,sBAAsB,EAAE,CAAC;QAC3B,CAAC,CAAC;QAEF,SAAS,CAAC,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE;YACvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,kFAAkF;gBAClF,IACE,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,iBAAiB;oBACzC,KAAK,KAAK,qCAAqC,EAC/C;oBACA,KAAK,GAAG,qCAAqC,CAAC;oBAC9C,mBAAmB,EAAE,CAAC;oBACtB,sBAAsB,CAAC,KAAK,CAAC,CAAC;oBAC9B,IAAI,2CAA2C,GAAG,CAAC,EAAE;wBACnD,eAAM,CAAC,UAAU,EAAE,CAAC;wBACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,MAAM,eAAM,CAAC,GAAG,CACd,oCAAoC,CACrC,cAAc,eAAM,CAAC,GAAG,CACvB,2CAA2C,CAC5C,EAAE,GAAG,QAAG,CACV,CAAC;wBACF,eAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;qBACrC;iBACF;aACF;YACD,IACE,CAAC,gCAAgC;gBACjC,KAAK,KAAK,6BAA6B,EACvC;gBACA,gCAAgC,GAAG,WAAW,CAC5C,sBAAsB,EACtB,GAAG,CACJ,CAAC;aACH;QACH,CAAC,CAAC;QAEF,SAAS,CAAC,uBAAuB,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE;YACxE,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,iBAAiB,EAAE;gBAC7C,eAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;gBACxC,eAAM,CAAC,UAAU,EAAE,CAAC;gBACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;aACtC;iBAAM;gBACL,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC;aAClD;QACH,CAAC,CAAC;QAEF,SAAS,CAAC,QAAQ,GAAG,CAAC,WAAW,EAAE,EAAE;YACnC,KAAK,IAAI,CAAC,IAAI,WAAW,EAAE;gBACzB,mBAAmB,EAAE,CAAC;gBAEtB,QAAQ,CAAC,CAAC,MAAM,EAAE;oBAChB,KAAK,cAAc,CAAC;oBACpB,KAAK,aAAa,CAAC;oBACnB,KAAK,2BAA2B;wBAC9B,gBAAgB,EAAE,CAAC;wBACnB,oBAAoB,EAAE,CAAC;wBACvB,MAAM;oBACR,KAAK,SAAS;wBACZ,oBAAoB,EAAE,CAAC;wBACvB,MAAM;oBACR,KAAK,SAAS;wBACZ,gBAAgB,EAAE,CAAC;wBACnB;;;2BAGG;wBACH,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,iBAAiB,EAAE;4BAC/C,mBAAmB,EAAE,CAAC;4BACtB,sBAAsB,CAAC,KAAK,CAAC,CAAC;4BAC9B,eAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;4BACnC,eAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;4BACvC,eAAM,CAAC,UAAU,EAAE,CAAC;4BACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;yBACzD;wBACD,MAAM;iBACT;gBACD,OAAO,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC1C;QACH,CAAC,CAAC;QAEF,SAAS,CAAC,UAAU,GAAG,GAAG,EAAE;YAC1B,mBAAmB,EAAE,CAAC;YACtB,MAAM,aAAa,GAAG,IAAA,wBAAU,EAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAExD,IAAI,oBAAoB,KAAK,UAAU,EAAE;gBACvC,KAAK,GAAG,wBAAwB,CAAC;gBAEjC,IAAI,IAAI,GAAG,2BAA2B,eAAM,CAAC,IAAI,CAC/C,UAAU,CACX,gBAAgB,eAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAClD,IAAI,mBAAmB,GAAG,CAAC,EAAE;oBAC3B,IAAI,IAAI,QAAQ,eAAM,CAAC,IAAI,CACzB,mBAAmB,CACpB,wBAAwB,CAAC;iBAC3B;gBAED,MAAM,kBAAkB,GAAG,EAAE,CAAC;gBAC9B,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBACrC,MAAM,WAAW,GAAG,GAAG,eAAM,CAAC,SAAS,SAAS,CAAC;oBACjD,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC5B,kBAAkB,CAAC,IAAI,CACrB,GAAG,WAAW,GAAG,eAAM,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,CAC9D,CAAC;oBACF,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;yBACtB,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CACrB,eAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,WAAW,OAAO,IAAI,IAAI,KAAK,EAAE,CAAC,CACvD;yBACA,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;iBACnD;gBAED,MAAM,iBAAiB,GAAG;oBACxB,eAAM,CAAC,aAAa,CAClB,OAAO,EACP,eAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,eAAM,CAAC,GAAG,CAAC,KAAK,aAAa,GAAG,CAAC,CAC9D;oBACD,GAAG,kBAAkB;iBACtB,CAAC;gBACF,IAAI,gBAAgB,GAAG,CAAC,EAAE;oBACxB,iBAAiB,CAAC,IAAI,CACpB,eAAM,CAAC,GAAG,CACR,GAAG,QAAG,2EAA2E,gBAAgB,WAAW,UAAU,SAAS,CAChI,CACF,CAAC;iBACH;gBACD,WAAW,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;aACzC;iBAAM;gBACL,KAAK,GAAG,uBAAuB,CAAC;gBAEhC,IAAI,IAAI,GAAG,cAAc,eAAM,CAAC,IAAI,CAClC,UAAU,CACX,gBAAgB,eAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAClD,IAAI,mBAAmB,GAAG,CAAC,EAAE;oBAC3B,IAAI,IAAI,QAAQ,eAAM,CAAC,IAAI,CACzB,mBAAmB,CACpB,wBAAwB,CAAC;iBAC3B;gBAED,MAAM,kBAAkB,GAAG,EAAE,CAAC;gBAC9B,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;oBACrC,MAAM,WAAW,GAAG,GAAG,eAAM,CAAC,SAAS,SAAS,CAAC;oBACjD,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC5B,kBAAkB,CAAC,IAAI,CACrB,GAAG,WAAW,GAAG,eAAM,CAAC,GAAG,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,CAC5D,CAAC;oBACF,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;yBACtB,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CACrB,eAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,OAAO,IAAI,IAAI,KAAK,EAAE,CAAC,CACrD;yBACA,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;iBACnD;gBAED,WAAW,CACT;oBACE,eAAM,CAAC,aAAa,CAClB,KAAK,EACL,eAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,eAAM,CAAC,GAAG,CAAC,KAAK,aAAa,GAAG,CAAC,CAC5D;oBACD,GAAG,kBAAkB;oBACrB,EAAE;oBACF,MAAM,eAAM,CAAC,MAAM,CAAC,GAAG,CACrB,OAAO,CAAC,KAAK,CACd,OAAO,gBAAgB,GAAG,IAAI,mBAAmB,EAAE,SAAS;oBAC7D,MAAM,eAAM,CAAC,GAAG,CACd,OAAO,CAAC,IAAI,CACb,OAAO,oBAAoB,GAAG,IAAI,mBAAmB,EAAE,cAAc,eAAM,CAAC,GAAG,CAC9E,IAAI,gBAAgB,mBAAmB,CACxC,EAAE;iBACJ,EACD,KAAK,CACN,CAAC;aACH;YACD,0BAA0B,EAAE,CAAC;QAC/B,CAAC,CAAC;QAEF,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;IACrC,CAAC;CAAA;AAzUD,8EAyUC"}
@@ -30,10 +30,10 @@ class StaticRunManyTerminalOutputLifeCycle {
30
30
  output_1.output.logSingleLine(`No projects ${description} were run`);
31
31
  return;
32
32
  }
33
- const bodyLines = this.projectNames.map((affectedProject) => ` ${output_1.output.colors.gray('-')} ${affectedProject}`);
33
+ const bodyLines = this.projectNames.map((affectedProject) => ` ${output_1.output.dim('-')} ${affectedProject}`);
34
34
  if (Object.keys(this.taskOverrides).length > 0) {
35
35
  bodyLines.push('');
36
- bodyLines.push(`${output_1.output.colors.gray('With flags:')}`);
36
+ bodyLines.push(`${output_1.output.dim('With flags:')}`);
37
37
  Object.entries(this.taskOverrides)
38
38
  .map(([flag, value]) => ` --${flag}=${value}`)
39
39
  .forEach((arg) => bodyLines.push(arg));
@@ -57,7 +57,7 @@ class StaticRunManyTerminalOutputLifeCycle {
57
57
  output_1.output.addVerticalSeparatorWithoutNewLines('green');
58
58
  const bodyLines = this.cachedTasks.length > 0
59
59
  ? [
60
- output_1.output.colors.gray(`Nx read the output from the cache instead of running the command for ${this.cachedTasks.length} out of ${this.tasks.length} tasks.`),
60
+ output_1.output.dim(`Nx read the output from the cache instead of running the command for ${this.cachedTasks.length} out of ${this.tasks.length} tasks.`),
61
61
  ]
62
62
  : [];
63
63
  output_1.output.success({
@@ -70,9 +70,9 @@ class StaticRunManyTerminalOutputLifeCycle {
70
70
  const bodyLines = [];
71
71
  const skippedTasks = this.skippedTasks();
72
72
  if (skippedTasks.length > 0) {
73
- bodyLines.push(output_1.output.colors.gray('Tasks not run because their dependencies failed:'), '', ...skippedTasks.map((task) => `${output_1.output.colors.gray('-')} ${task.id}`), '');
73
+ bodyLines.push(output_1.output.dim('Tasks not run because their dependencies failed:'), '', ...skippedTasks.map((task) => `${output_1.output.dim('-')} ${task.id}`), '');
74
74
  }
75
- bodyLines.push(output_1.output.colors.gray('Failed tasks:'), '', ...[...this.failedTasks.values()].map((task) => `${output_1.output.colors.gray('-')} ${task.id}`));
75
+ bodyLines.push(output_1.output.dim('Failed tasks:'), '', ...[...this.failedTasks.values()].map((task) => `${output_1.output.dim('-')} ${task.id}`));
76
76
  output_1.output.error({
77
77
  title: `Running target "${this.args.target}" failed`,
78
78
  bodyLines,
@@ -1 +1 @@
1
- {"version":3,"file":"static-run-many-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"static-run-many-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.ts"],"names":[],"mappings":"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"}
@@ -43,7 +43,7 @@ class StaticRunOneTerminalOutputLifeCycle {
43
43
  output_1.output.addVerticalSeparatorWithoutNewLines('green');
44
44
  const bodyLines = this.cachedTasks.length > 0
45
45
  ? [
46
- output_1.output.colors.gray(`Nx read the output from the cache instead of running the command for ${this.cachedTasks.length} out of ${this.tasks.length} tasks.`),
46
+ output_1.output.dim(`Nx read the output from the cache instead of running the command for ${this.cachedTasks.length} out of ${this.tasks.length} tasks.`),
47
47
  ]
48
48
  : [];
49
49
  output_1.output.success({
@@ -54,11 +54,11 @@ class StaticRunOneTerminalOutputLifeCycle {
54
54
  else {
55
55
  output_1.output.addVerticalSeparatorWithoutNewLines('red');
56
56
  const bodyLines = [
57
- output_1.output.colors.gray('Failed tasks:'),
57
+ output_1.output.dim('Failed tasks:'),
58
58
  '',
59
- ...this.failedTasks.map((task) => `${output_1.output.colors.gray('-')} ${task.id}`),
59
+ ...this.failedTasks.map((task) => `${output_1.output.dim('-')} ${task.id}`),
60
60
  '',
61
- `${output_1.output.colors.gray('Hint: run the command with')} --verbose ${output_1.output.colors.gray('for more details.')}`,
61
+ `${output_1.output.dim('Hint: run the command with')} --verbose ${output_1.output.dim('for more details.')}`,
62
62
  ];
63
63
  output_1.output.error({
64
64
  title: `Running target "${this.initiatingProject}:${this.args.target}" failed`,
@@ -1 +1 @@
1
- {"version":3,"file":"static-run-one-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"static-run-one-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.ts"],"names":[],"mappings":"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"}
@@ -21,7 +21,7 @@ const is_ci_1 = require("../utilities/is_ci");
21
21
  const dynamic_run_one_terminal_output_life_cycle_1 = require("./life-cycles/dynamic-run-one-terminal-output-life-cycle");
22
22
  function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, projectNames, tasks, nxArgs, overrides, runnerOptions) {
23
23
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
24
- const showVerboseOutput = !!overrides.verbose;
24
+ const showVerboseOutput = !!overrides.verbose || process.env.NX_VERBOSE_LOGGING === 'true';
25
25
  if (terminalOutputStrategy === 'run-one') {
26
26
  if (shouldUseDynamicLifeCycle(tasks, runnerOptions) &&
27
27
  !showVerboseOutput &&