nx 14.1.9 → 14.2.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (174) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/bin/{init.d.ts → compute-project-graph.d.ts} +0 -0
  3. package/bin/{init.js → compute-project-graph.js} +1 -1
  4. package/bin/compute-project-graph.js.map +1 -0
  5. package/bin/nx.js +9 -1
  6. package/bin/nx.js.map +1 -1
  7. package/bin/run-executor.js +15 -2
  8. package/bin/run-executor.js.map +1 -1
  9. package/migrations.json +6 -0
  10. package/package.json +18 -8
  11. package/presets/core.json +13 -8
  12. package/presets/npm.json +13 -7
  13. package/src/adapter/compat.js +4 -4
  14. package/src/adapter/compat.js.map +1 -1
  15. package/src/adapter/ngcli-adapter.d.ts +4 -4
  16. package/src/adapter/ngcli-adapter.js +3 -0
  17. package/src/adapter/ngcli-adapter.js.map +1 -1
  18. package/src/command-line/affected.js +8 -2
  19. package/src/command-line/affected.js.map +1 -1
  20. package/src/command-line/connect-to-nx-cloud.js +3 -3
  21. package/src/command-line/connect-to-nx-cloud.js.map +1 -1
  22. package/src/command-line/dep-graph.js +7 -7
  23. package/src/command-line/dep-graph.js.map +1 -1
  24. package/src/command-line/format.d.ts +2 -2
  25. package/src/command-line/format.js +4 -3
  26. package/src/command-line/format.js.map +1 -1
  27. package/src/command-line/generate.js +137 -45
  28. package/src/command-line/generate.js.map +1 -1
  29. package/src/command-line/init.d.ts +1 -0
  30. package/src/command-line/init.js +39 -0
  31. package/src/command-line/init.js.map +1 -0
  32. package/src/command-line/lint.js +2 -2
  33. package/src/command-line/lint.js.map +1 -1
  34. package/src/command-line/list.js +2 -2
  35. package/src/command-line/list.js.map +1 -1
  36. package/src/command-line/migrate.js +9 -0
  37. package/src/command-line/migrate.js.map +1 -1
  38. package/src/command-line/nx-commands.js +60 -9
  39. package/src/command-line/nx-commands.js.map +1 -1
  40. package/src/command-line/print-affected.js +10 -10
  41. package/src/command-line/print-affected.js.map +1 -1
  42. package/src/command-line/read-environment.js +3 -3
  43. package/src/command-line/read-environment.js.map +1 -1
  44. package/src/command-line/report.js +3 -3
  45. package/src/command-line/report.js.map +1 -1
  46. package/src/command-line/run-many.js +2 -2
  47. package/src/command-line/run-many.js.map +1 -1
  48. package/src/command-line/run-one.js +4 -6
  49. package/src/command-line/run-one.js.map +1 -1
  50. package/src/command-line/run.d.ts +2 -2
  51. package/src/command-line/run.js.map +1 -1
  52. package/src/command-line/workspace-generators.js +2 -2
  53. package/src/command-line/workspace-generators.js.map +1 -1
  54. package/src/config/configuration.d.ts +11 -0
  55. package/src/config/configuration.js +26 -0
  56. package/src/config/configuration.js.map +1 -0
  57. package/src/config/misc-interfaces.d.ts +3 -3
  58. package/src/config/workspace-json-project-json.d.ts +8 -4
  59. package/src/config/workspaces.d.ts +11 -7
  60. package/src/config/workspaces.js +29 -23
  61. package/src/config/workspaces.js.map +1 -1
  62. package/src/core/dep-graph/main.esm.js +1 -1
  63. package/src/daemon/client/client.js +3 -3
  64. package/src/daemon/client/client.js.map +1 -1
  65. package/src/daemon/server/project-graph-incremental-recomputation.js +3 -3
  66. package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
  67. package/src/daemon/server/server.js +7 -7
  68. package/src/daemon/server/server.js.map +1 -1
  69. package/src/daemon/server/shutdown-utils.js +2 -2
  70. package/src/daemon/server/shutdown-utils.js.map +1 -1
  71. package/src/daemon/server/watcher.js +10 -10
  72. package/src/daemon/server/watcher.js.map +1 -1
  73. package/src/generators/utils/project-configuration.d.ts +3 -3
  74. package/src/generators/utils/project-configuration.js.map +1 -1
  75. package/src/hasher/file-hasher-base.js +4 -4
  76. package/src/hasher/file-hasher-base.js.map +1 -1
  77. package/src/hasher/file-hasher.js +2 -2
  78. package/src/hasher/file-hasher.js.map +1 -1
  79. package/src/hasher/git-based-file-hasher.js +5 -5
  80. package/src/hasher/git-based-file-hasher.js.map +1 -1
  81. package/src/hasher/hasher.js +4 -4
  82. package/src/hasher/hasher.js.map +1 -1
  83. package/src/hasher/node-based-file-hasher.js +6 -6
  84. package/src/hasher/node-based-file-hasher.js.map +1 -1
  85. package/src/migrations/update-14-2-0/remove-default-collection.d.ts +2 -0
  86. package/src/migrations/update-14-2-0/remove-default-collection.js +19 -0
  87. package/src/migrations/update-14-2-0/remove-default-collection.js.map +1 -0
  88. package/src/project-graph/affected/affected-project-graph.d.ts +2 -2
  89. package/src/project-graph/affected/affected-project-graph.js +2 -1
  90. package/src/project-graph/affected/affected-project-graph.js.map +1 -1
  91. package/src/project-graph/build-nodes/npm-packages.js +2 -2
  92. package/src/project-graph/build-nodes/npm-packages.js.map +1 -1
  93. package/src/project-graph/build-nodes/workspace-projects.js +2 -2
  94. package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
  95. package/src/project-graph/build-project-graph.d.ts +2 -2
  96. package/src/project-graph/build-project-graph.js +5 -5
  97. package/src/project-graph/build-project-graph.js.map +1 -1
  98. package/src/project-graph/file-utils.d.ts +1 -17
  99. package/src/project-graph/file-utils.js +8 -48
  100. package/src/project-graph/file-utils.js.map +1 -1
  101. package/src/project-graph/nx-deps-cache.d.ts +2 -2
  102. package/src/project-graph/nx-deps-cache.js.map +1 -1
  103. package/src/project-graph/project-graph.js +2 -1
  104. package/src/project-graph/project-graph.js.map +1 -1
  105. package/src/tasks-runner/batch/run-batch.js +6 -6
  106. package/src/tasks-runner/batch/run-batch.js.map +1 -1
  107. package/src/tasks-runner/cache.js +2 -2
  108. package/src/tasks-runner/cache.js.map +1 -1
  109. package/src/tasks-runner/create-task-graph.d.ts +21 -0
  110. package/src/tasks-runner/create-task-graph.js +138 -0
  111. package/src/tasks-runner/create-task-graph.js.map +1 -0
  112. package/src/tasks-runner/default-tasks-runner.js +2 -5
  113. package/src/tasks-runner/default-tasks-runner.js.map +1 -1
  114. package/src/tasks-runner/forked-process-task-runner.js +10 -4
  115. package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
  116. package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +12 -12
  117. package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
  118. package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +1 -1
  119. package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
  120. package/src/tasks-runner/run-command.d.ts +0 -12
  121. package/src/tasks-runner/run-command.js +30 -193
  122. package/src/tasks-runner/run-command.js.map +1 -1
  123. package/src/tasks-runner/task-graph-utils.d.ts +3 -0
  124. package/src/tasks-runner/task-graph-utils.js +56 -0
  125. package/src/tasks-runner/task-graph-utils.js.map +1 -0
  126. package/src/tasks-runner/task-orchestrator.d.ts +3 -1
  127. package/src/tasks-runner/task-orchestrator.js +23 -11
  128. package/src/tasks-runner/task-orchestrator.js.map +1 -1
  129. package/src/tasks-runner/tasks-runner-v2.d.ts +2 -0
  130. package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
  131. package/src/tasks-runner/tasks-runner.d.ts +4 -1
  132. package/src/tasks-runner/tasks-schedule.js +0 -4
  133. package/src/tasks-runner/tasks-schedule.js.map +1 -1
  134. package/src/tasks-runner/utils.js +2 -2
  135. package/src/tasks-runner/utils.js.map +1 -1
  136. package/src/utils/add-command-prefix.d.ts +5 -0
  137. package/src/utils/add-command-prefix.js +59 -0
  138. package/src/utils/add-command-prefix.js.map +1 -0
  139. package/src/utils/cache-directory.js +2 -2
  140. package/src/utils/cache-directory.js.map +1 -1
  141. package/src/utils/command-line-utils.d.ts +6 -8
  142. package/src/utils/command-line-utils.js +9 -13
  143. package/src/utils/command-line-utils.js.map +1 -1
  144. package/src/utils/find-workspace-root.js +9 -7
  145. package/src/utils/find-workspace-root.js.map +1 -1
  146. package/src/utils/nx-plugin.js +10 -10
  147. package/src/utils/nx-plugin.js.map +1 -1
  148. package/src/utils/output.d.ts +1 -1
  149. package/src/utils/output.js +2 -2
  150. package/src/utils/output.js.map +1 -1
  151. package/src/utils/params.d.ts +2 -2
  152. package/src/utils/params.js.map +1 -1
  153. package/src/utils/plugins/models.d.ts +3 -14
  154. package/src/utils/plugins/plugin-capabilities.js +2 -2
  155. package/src/utils/plugins/plugin-capabilities.js.map +1 -1
  156. package/src/utils/register.d.ts +8 -1
  157. package/src/utils/register.js +81 -10
  158. package/src/utils/register.js.map +1 -1
  159. package/src/utils/target-project-locator.js +2 -2
  160. package/src/utils/target-project-locator.js.map +1 -1
  161. package/src/utils/typescript.js +5 -5
  162. package/src/utils/typescript.js.map +1 -1
  163. package/src/utils/versions.d.ts +6 -4
  164. package/src/utils/versions.js +7 -5
  165. package/src/utils/versions.js.map +1 -1
  166. package/src/utils/{app-root.d.ts → workspace-root.d.ts} +5 -4
  167. package/src/utils/workspace-root.js +41 -0
  168. package/src/utils/workspace-root.js.map +1 -0
  169. package/bin/init.js.map +0 -1
  170. package/src/tasks-runner/task-graph-creator.d.ts +0 -13
  171. package/src/tasks-runner/task-graph-creator.js +0 -71
  172. package/src/tasks-runner/task-graph-creator.js.map +0 -1
  173. package/src/utils/app-root.js +0 -39
  174. package/src/utils/app-root.js.map +0 -1
@@ -1,22 +1,11 @@
1
- export interface PluginGenerator {
2
- factory: string;
3
- schema: string;
4
- description: string;
5
- aliases: string;
6
- hidden: boolean;
7
- }
8
- export interface PluginExecutor {
9
- implementation: string;
10
- schema: string;
11
- description: string;
12
- }
1
+ import { ExecutorsJsonEntry, GeneratorsJsonEntry } from '../../config/misc-interfaces';
13
2
  export interface PluginCapabilities {
14
3
  name: string;
15
4
  executors: {
16
- [name: string]: PluginExecutor;
5
+ [name: string]: ExecutorsJsonEntry;
17
6
  };
18
7
  generators: {
19
- [name: string]: PluginGenerator;
8
+ [name: string]: GeneratorsJsonEntry;
20
9
  };
21
10
  }
22
11
  export interface CorePlugin {
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.listPluginCapabilities = exports.getPluginCapabilities = void 0;
4
- const app_root_1 = require("../app-root");
4
+ const workspace_root_1 = require("../workspace-root");
5
5
  const chalk = require("chalk");
6
6
  const path_1 = require("path");
7
7
  const output_1 = require("../output");
@@ -40,7 +40,7 @@ function getPluginCapabilities(workspaceRoot, pluginName) {
40
40
  }
41
41
  exports.getPluginCapabilities = getPluginCapabilities;
42
42
  function listPluginCapabilities(pluginName) {
43
- const plugin = getPluginCapabilities(app_root_1.workspaceRoot, pluginName);
43
+ const plugin = getPluginCapabilities(workspace_root_1.workspaceRoot, pluginName);
44
44
  if (!plugin) {
45
45
  const pmc = (0, package_manager_1.getPackageManagerCommand)();
46
46
  output_1.output.note({
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/plugins/plugin-capabilities.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/plugins/plugin-capabilities.ts"],"names":[],"mappings":"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"}
@@ -5,5 +5,12 @@
5
5
  * If ts-node and tsconfig-paths are not available, the user can still provide an index.js file in
6
6
  * the root of their project and the fundamentals will still work (but
7
7
  * workspace path mapping will not, for example).
8
+ *
9
+ * @returns cleanup function
10
+ */
11
+ export declare const registerTsProject: (path: string, configFilename?: string) => (() => void);
12
+ /**
13
+ * @param tsConfigPath Adds the paths from a tsconfig file into node resolutions
14
+ * @returns cleanup function
8
15
  */
9
- export declare const registerTsProject: (path: string, configFilename?: string) => () => void;
16
+ export declare function registerTsConfigPaths(tsConfigPath: any): () => void;
@@ -1,7 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.registerTsProject = void 0;
3
+ exports.registerTsConfigPaths = exports.registerTsProject = void 0;
4
4
  const path_1 = require("path");
5
+ const logger_1 = require("./logger");
5
6
  /**
6
7
  * Optionally, if swc-node and tsconfig-paths are available in the current workspace, apply the require
7
8
  * register hooks so that .ts files can be used for writing custom workspace projects.
@@ -9,15 +10,62 @@ const path_1 = require("path");
9
10
  * If ts-node and tsconfig-paths are not available, the user can still provide an index.js file in
10
11
  * the root of their project and the fundamentals will still work (but
11
12
  * workspace path mapping will not, for example).
13
+ *
14
+ * @returns cleanup function
12
15
  */
13
16
  const registerTsProject = (path, configFilename = 'tsconfig.json') => {
14
- // These are requires to prevent it from registering when it shouldn't
15
- const { register } = require('@swc-node/register/register');
16
- const { readDefaultTsConfig, } = require('@swc-node/register/read-default-tsconfig');
17
- try {
18
- const tsConfigPath = (0, path_1.join)(path, configFilename);
17
+ // Function to register transpiler that returns cleanup function
18
+ let registerTranspiler;
19
+ const tsConfigPath = (0, path_1.join)(path, configFilename);
20
+ const cleanupFunctions = [registerTsConfigPaths(tsConfigPath)];
21
+ const swcNodeInstalled = packageIsInstalled('@swc-node/register');
22
+ if (swcNodeInstalled) {
23
+ // These are requires to prevent it from registering when it shouldn't
24
+ const { register } = require('@swc-node/register/register');
25
+ const { readDefaultTsConfig, } = require('@swc-node/register/read-default-tsconfig');
19
26
  const tsConfig = readDefaultTsConfig(tsConfigPath);
20
- register(tsConfig);
27
+ registerTranspiler = () => register(tsConfig);
28
+ }
29
+ else {
30
+ // We can fall back on ts-node if its available
31
+ const tsNodeInstalled = packageIsInstalled('ts-node/register');
32
+ if (tsNodeInstalled) {
33
+ warnTsNodeUsage();
34
+ const { register } = require('ts-node');
35
+ // ts-node doesn't provide a cleanup method
36
+ registerTranspiler = () => {
37
+ register({
38
+ project: tsConfigPath,
39
+ transpileOnly: true,
40
+ compilerOptions: {
41
+ module: 'commonjs',
42
+ },
43
+ });
44
+ return () => { };
45
+ };
46
+ }
47
+ }
48
+ if (registerTranspiler) {
49
+ cleanupFunctions.push(registerTranspiler());
50
+ }
51
+ else {
52
+ warnNoTranspiler();
53
+ }
54
+ // Overall cleanup method cleans up tsconfig path resolution
55
+ // as well as ts transpiler
56
+ return () => {
57
+ for (const f of cleanupFunctions) {
58
+ f();
59
+ }
60
+ };
61
+ };
62
+ exports.registerTsProject = registerTsProject;
63
+ /**
64
+ * @param tsConfigPath Adds the paths from a tsconfig file into node resolutions
65
+ * @returns cleanup function
66
+ */
67
+ function registerTsConfigPaths(tsConfigPath) {
68
+ try {
21
69
  /**
22
70
  * Load the ts config from the source project
23
71
  */
@@ -34,8 +82,31 @@ const registerTsProject = (path, configFilename = 'tsconfig.json') => {
34
82
  });
35
83
  }
36
84
  }
37
- catch (err) { }
85
+ catch (err) {
86
+ warnNoTsconfigPaths();
87
+ }
38
88
  return () => { };
39
- };
40
- exports.registerTsProject = registerTsProject;
89
+ }
90
+ exports.registerTsConfigPaths = registerTsConfigPaths;
91
+ function warnTsNodeUsage() {
92
+ logger_1.logger.warn((0, logger_1.stripIndent)(`${logger_1.NX_PREFIX} Falling back to ts-node for local typescript execution. This may be a little slower.
93
+ - To fix this, ensure @swc-node/register and @swc/core have been installed`));
94
+ }
95
+ function warnNoTsconfigPaths() {
96
+ logger_1.logger.warn((0, logger_1.stripIndent)(`${logger_1.NX_PREFIX} Unable to load tsconfig-paths, workspace libraries may be inaccessible.
97
+ - To fix this, install tsconfig-paths with npm/yarn/pnpm`));
98
+ }
99
+ function warnNoTranspiler() {
100
+ logger_1.logger.warn((0, logger_1.stripIndent)(`${logger_1.NX_PREFIX} Unable to locate swc-node or ts-node. Nx will be unable to run local ts files without transpiling.
101
+ - To fix this, ensure @swc-node/register and @swc/core have been installed`));
102
+ }
103
+ function packageIsInstalled(m) {
104
+ try {
105
+ const p = require.resolve(m);
106
+ return true;
107
+ }
108
+ catch (_a) {
109
+ return false;
110
+ }
111
+ }
41
112
  //# sourceMappingURL=register.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/register.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAE5B;;;;;;;GAOG;AACI,MAAM,iBAAiB,GAAG,CAC/B,IAAY,EACZ,cAAc,GAAG,eAAe,EAChC,EAAE;IACF,sEAAsE;IACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC5D,MAAM,EACJ,mBAAmB,GACpB,GAAG,OAAO,CAAC,0CAA0C,CAAC,CAAC;IAExD,IAAI;QACF,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACnD,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEnB;;WAEG;QACH,MAAM,aAAa,GAAoC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACjF,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAC9D;;;WAGG;QACH,IAAI,cAAc,CAAC,UAAU,KAAK,SAAS,EAAE;YAC3C,OAAO,aAAa,CAAC,QAAQ,CAAC;gBAC5B,OAAO,EAAE,cAAc,CAAC,eAAe;gBACvC,KAAK,EAAE,cAAc,CAAC,KAAK;aAC5B,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,GAAG,EAAE,GAAE;IAChB,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AAClB,CAAC,CAAC;AAhCW,QAAA,iBAAiB,qBAgC5B"}
1
+ {"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/register.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ exports.findMatchingProjectForPath = exports.TargetProjectLocator = void 0;
4
4
  const typescript_1 = require("./typescript");
5
5
  const fileutils_1 = require("./fileutils");
6
6
  const path_1 = require("path");
7
- const app_root_1 = require("./app-root");
7
+ const workspace_root_1 = require("./workspace-root");
8
8
  const fs_1 = require("fs");
9
9
  const json_1 = require("./json");
10
10
  class TargetProjectLocator {
@@ -119,7 +119,7 @@ class TargetProjectLocator {
119
119
  return importedProject ? importedProject.name : void 0;
120
120
  }
121
121
  getAbsolutePath(path) {
122
- return (0, path_1.join)(app_root_1.workspaceRoot, path);
122
+ return (0, path_1.join)(workspace_root_1.workspaceRoot, path);
123
123
  }
124
124
  getRootTsConfig() {
125
125
  const path = (0, typescript_1.getRootTsConfigFileName)();
@@ -1 +1 @@
1
- {"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/target-project-locator.ts"],"names":[],"mappings":";;;AAAA,6CAA8E;AAC9E,2CAA6C;AAC7C,+BAA4C;AAC5C,yCAA2C;AAC3C,2BAAkC;AAKlC,iCAAmC;AAEnC,MAAa,oBAAoB;IAU/B,YACmB,KAA8C,EAC9C,aAAuD;;QADvD,UAAK,GAAL,KAAK,CAAyC;QAC9C,kBAAa,GAAb,aAAa,CAA0C;QAXlE,wBAAmB,GAAG,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5D,gBAAW,GAAG,IAAI,CAAC,aAAa;YACtC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACnC,CAAC,CAAC,EAAE,CAAC;QACC,aAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAClC,UAAK,GAAG,MAAA,MAAA,IAAI,CAAC,QAAQ,CAAC,MAAM,0CAAE,eAAe,0CAAE,KAAK,CAAC;QACrD,8BAAyB,GAAG,IAAI,GAAG,EAAyB,CAAC;QAC7D,uBAAkB,GAAG,IAAI,GAAG,EAAyB,CAAC;IAK3D,CAAC;IAEJ;;;;;OAKG;IACH,qBAAqB,CAAC,UAAkB,EAAE,QAAgB;QACxD,MAAM,oBAAoB,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,IAAI,IAAA,0BAAc,EAAC,oBAAoB,CAAC,EAAE;YACxC,MAAM,cAAc,GAAG,YAAK,CAAC,IAAI,CAC/B,IAAA,cAAO,EAAC,QAAQ,CAAC,EACjB,oBAAoB,CACrB,CAAC;YACF,OAAO,IAAI,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;SACzD;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QACnD,IAAI,KAAK,EAAE;YACT,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,MAAM,oBAAoB,GAAG,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC;gBACjE,IAAI,oBAAoB,EAAE;oBACxB,OAAO,oBAAoB,CAAC;iBAC7B;aACF;SACF;QAED,uEAAuE;QACvE,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;QAC7D,IAAI,UAAU,EAAE;YACd,OAAO,UAAU,CAAC;SACnB;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACxB,mDAAmD;YACnD,8DAA8D;YAC9D,uFAAuF;YACvF,MAAM,eAAe,GAAG,IAAI,CAAC,2BAA2B,CACtD,oBAAoB,EACpB,QAAQ,CACT,CAAC;YACF,IAAI,eAAe,EAAE;gBACnB,OAAO,eAAe,CAAC;aACxB;SACF;QAED,iCAAiC;QACjC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,oBAA4B;QACpC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,OAAO,SAAS,CAAC;SAClB;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;YACpC,OAAO,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAC/C,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnB,CAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACvD,oBAAoB,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CACxD,CAAC;QACF,IAAI,YAAY,EAAE;YAChB,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SACjC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,2BAA2B,CACjC,oBAA4B,EAC5B,QAAgB;QAEhB,IAAI,cAAsB,CAAC;QAC3B,IAAI,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;YAC5D,cAAc,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SAC3E;aAAM;YACL,cAAc,GAAG,IAAA,kCAAqB,EACpC,oBAAoB,EACpB,QAAQ,EACR,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC3B,CAAC;YACF,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAChC,oBAAoB,EACpB,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CACvC,CAAC;SACH;QAED,4FAA4F;QAC5F,IAAI,cAAc,IAAI,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE;YACpE,MAAM,eAAe,GAAG,IAAI,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;YACzE,IAAI,eAAe,EAAE;gBACnB,OAAO,eAAe,CAAC;aACxB;SACF;QACD,OAAO;IACT,CAAC;IAEO,cAAc,CAAC,SAAiB;QACtC,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;SAC/C;aAAM;YACL,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAC/B,CAAC,GAAG,EAAE,EAAE,CACN,SAAS,KAAK,GAAG,CAAC,IAAI,CAAC,WAAW;gBAClC,SAAS,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,CACnD,CAAC;YACF,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjD,OAAO,GAAG,CAAC,IAAI,CAAC;aACjB;SACF;IACH,CAAC;IAEO,2BAA2B,CACjC,cAAsB;QAEtB,MAAM,wBAAwB,GAAG,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC;YAC9D,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7B,CAAC,CAAC,cAAc,CAAC;QACnB,MAAM,eAAe,GAAG,IAAI,CAAC,wBAAwB,CACnD,wBAAwB,CACzB,CAAC;QACF,OAAO,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC;IAEO,eAAe,CAAC,IAAY;QAClC,OAAO,IAAA,WAAI,EAAC,wBAAa,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAEO,eAAe;QACrB,MAAM,IAAI,GAAG,IAAA,oCAAuB,GAAE,CAAC;QACvC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,YAAY,EAAE,IAAI;gBAClB,MAAM,EAAE,IAAI;aACb,CAAC;SACH;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO;YACL,YAAY;YACZ,IAAI;YACJ,MAAM,EAAE,IAAA,gBAAS,EAAC,IAAA,iBAAY,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACtD,CAAC;IACJ,CAAC;IAEO,wBAAwB,CAAC,IAAY;QAC3C,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;CACF;AA5KD,oDA4KC;AAED,SAAS,yBAAyB,CAChC,KAA8C;IAE9C,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACtD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAC1C,mBAAmB,CAAC,GAAG,CACrB,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EACtE,WAAW,CACZ,CAAC;KACH;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CACxC,QAAgB,EAChB,cAAmC;IAEnC,KACE,IAAI,WAAW,GAAG,QAAQ,EAC1B,WAAW,IAAI,IAAA,cAAO,EAAC,WAAW,CAAC,EACnC,WAAW,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,EAClC;QACA,MAAM,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,EAAE;YACL,OAAO,CAAC,CAAC;SACV;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAfD,gEAeC"}
1
+ {"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/target-project-locator.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getRootTsConfigPath = exports.getRootTsConfigFileName = exports.resolveModuleByImport = exports.readTsConfig = void 0;
4
- const app_root_1 = require("./app-root");
4
+ const workspace_root_1 = require("./workspace-root");
5
5
  const fs_1 = require("fs");
6
6
  const path_1 = require("path");
7
- const normalizedAppRoot = app_root_1.workspaceRoot.replace(/\\/g, '/');
7
+ const normalizedAppRoot = workspace_root_1.workspaceRoot.replace(/\\/g, '/');
8
8
  let tsModule;
9
9
  function readTsConfig(tsConfigPath) {
10
10
  if (!tsModule) {
@@ -49,12 +49,12 @@ exports.resolveModuleByImport = resolveModuleByImport;
49
49
  function getCompilerHost(tsConfigPath) {
50
50
  const options = readTsConfigOptions(tsConfigPath);
51
51
  const host = tsModule.createCompilerHost(options, true);
52
- const moduleResolutionCache = tsModule.createModuleResolutionCache(app_root_1.workspaceRoot, host.getCanonicalFileName);
52
+ const moduleResolutionCache = tsModule.createModuleResolutionCache(workspace_root_1.workspaceRoot, host.getCanonicalFileName);
53
53
  return { options, host, moduleResolutionCache };
54
54
  }
55
55
  function getRootTsConfigFileName() {
56
56
  for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
57
- const tsConfigPath = (0, path_1.join)(app_root_1.workspaceRoot, tsConfigName);
57
+ const tsConfigPath = (0, path_1.join)(workspace_root_1.workspaceRoot, tsConfigName);
58
58
  if ((0, fs_1.existsSync)(tsConfigPath)) {
59
59
  return tsConfigName;
60
60
  }
@@ -64,7 +64,7 @@ function getRootTsConfigFileName() {
64
64
  exports.getRootTsConfigFileName = getRootTsConfigFileName;
65
65
  function getRootTsConfigPath() {
66
66
  const tsConfigFileName = getRootTsConfigFileName();
67
- return tsConfigFileName ? (0, path_1.join)(app_root_1.workspaceRoot, tsConfigFileName) : null;
67
+ return tsConfigFileName ? (0, path_1.join)(workspace_root_1.workspaceRoot, tsConfigFileName) : null;
68
68
  }
69
69
  exports.getRootTsConfigPath = getRootTsConfigPath;
70
70
  //# sourceMappingURL=typescript.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/typescript.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/typescript.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,10 @@
1
1
  export declare const nxVersion: any;
2
- export declare const angularCliVersion = "~13.2.0";
3
- export declare const typescriptVersion = "~4.5.2";
2
+ export declare const angularCliVersion = "~14.0.0-rc.2";
3
+ export declare const typescriptVersion = "~4.6.2";
4
4
  export declare const prettierVersion = "^2.5.1";
5
5
  export declare const tslintVersion = "~6.1.0";
6
- export declare const typescriptESLintVersion = "~5.18.0";
7
- export declare const eslintVersion = "~8.12.0";
6
+ export declare const typescriptESLintVersion = "~5.24.0";
7
+ export declare const eslintVersion = "~8.15.0";
8
8
  export declare const eslintConfigPrettierVersion = "8.1.0";
9
+ export declare const swcNodeVersion = "^1.4.2";
10
+ export declare const swcCoreVersion = "^1.2.173";
@@ -1,12 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
3
+ exports.swcCoreVersion = exports.swcNodeVersion = exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
4
4
  exports.nxVersion = require('../../package.json').version;
5
- exports.angularCliVersion = '~13.2.0';
6
- exports.typescriptVersion = '~4.5.2';
5
+ exports.angularCliVersion = '~14.0.0-rc.2';
6
+ exports.typescriptVersion = '~4.6.2';
7
7
  exports.prettierVersion = '^2.5.1';
8
8
  exports.tslintVersion = '~6.1.0';
9
- exports.typescriptESLintVersion = '~5.18.0';
10
- exports.eslintVersion = '~8.12.0';
9
+ exports.typescriptESLintVersion = '~5.24.0';
10
+ exports.eslintVersion = '~8.15.0';
11
11
  exports.eslintConfigPrettierVersion = '8.1.0';
12
+ exports.swcNodeVersion = '^1.4.2';
13
+ exports.swcCoreVersion = '^1.2.173';
12
14
  //# sourceMappingURL=versions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,cAAc,CAAC;AACnC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC;AACtC,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,cAAc,GAAG,UAAU,CAAC"}
@@ -1,11 +1,12 @@
1
+ /**
2
+ * The root of the workspace
3
+ */
4
+ export declare const workspaceRoot: string;
1
5
  /**
2
6
  * The root of the workspace.
3
7
  *
4
8
  * @deprecated use workspaceRoot instead
5
9
  */
6
10
  export declare const appRootPath: string;
7
- /**
8
- * The root of the workspace
9
- */
10
- export declare const workspaceRoot: string;
11
+ export declare function workspaceRootInner(dir: string, candidateRoot: string | null): string;
11
12
  export declare function fileExists(filePath: string): boolean;
@@ -0,0 +1,41 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.fileExists = exports.workspaceRootInner = exports.appRootPath = exports.workspaceRoot = void 0;
4
+ const path = require("path");
5
+ const fs_1 = require("fs");
6
+ /**
7
+ * The root of the workspace
8
+ */
9
+ exports.workspaceRoot = workspaceRootInner(__dirname, null);
10
+ /**
11
+ * The root of the workspace.
12
+ *
13
+ * @deprecated use workspaceRoot instead
14
+ */
15
+ exports.appRootPath = exports.workspaceRoot;
16
+ function workspaceRootInner(dir, candidateRoot) {
17
+ if (process.env.NX_WORKSPACE_ROOT_PATH)
18
+ return process.env.NX_WORKSPACE_ROOT_PATH;
19
+ if (path.dirname(dir) === dir)
20
+ return candidateRoot || process.cwd();
21
+ if (fileExists(path.join(dir, 'nx.json'))) {
22
+ return dir;
23
+ }
24
+ else if (fileExists(path.join(dir, 'node_modules', 'nx', 'package.json'))) {
25
+ return workspaceRootInner(path.dirname(dir), dir);
26
+ }
27
+ else {
28
+ return workspaceRootInner(path.dirname(dir), candidateRoot);
29
+ }
30
+ }
31
+ exports.workspaceRootInner = workspaceRootInner;
32
+ function fileExists(filePath) {
33
+ try {
34
+ return (0, fs_1.statSync)(filePath).isFile();
35
+ }
36
+ catch (err) {
37
+ return false;
38
+ }
39
+ }
40
+ exports.fileExists = fileExists;
41
+ //# sourceMappingURL=workspace-root.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"workspace-root.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/workspace-root.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,2BAA8B;AAE9B;;GAEG;AACU,QAAA,aAAa,GAAG,kBAAkB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAEjE;;;;GAIG;AACU,QAAA,WAAW,GAAG,qBAAa,CAAC;AAEzC,SAAgB,kBAAkB,CAChC,GAAW,EACX,aAA4B;IAE5B,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;QACpC,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;QAAE,OAAO,aAAa,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACrE,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,EAAE;QACzC,OAAO,GAAG,CAAC;KACZ;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;QAC3E,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;KACnD;SAAM;QACL,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,CAAC;KAC7D;AACH,CAAC;AAdD,gDAcC;AAED,SAAgB,UAAU,CAAC,QAAgB;IACzC,IAAI;QACF,OAAO,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAND,gCAMC"}
package/bin/init.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init.ts"],"names":[],"mappings":";;;AAAA,sEAA6E;AAE7E,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"}
@@ -1,13 +0,0 @@
1
- import { ProjectGraph } from '../config/project-graph';
2
- import { Task, TaskGraph } from '../config/task-graph';
3
- import { TargetDependencyConfig } from '../config/workspace-json-project-json';
4
- export declare class TaskGraphCreator {
5
- private readonly projectGraph;
6
- private readonly defaultTargetDependencies;
7
- constructor(projectGraph: ProjectGraph, defaultTargetDependencies: Record<string, (TargetDependencyConfig | string)[]>);
8
- createTaskGraph(tasks: Task[]): TaskGraph;
9
- private addTaskDependencies;
10
- private addDependencies;
11
- private findTask;
12
- private addTaskToGraph;
13
- }
@@ -1,71 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.TaskGraphCreator = void 0;
4
- const utils_1 = require("./utils");
5
- class TaskGraphCreator {
6
- constructor(projectGraph, defaultTargetDependencies) {
7
- this.projectGraph = projectGraph;
8
- this.defaultTargetDependencies = defaultTargetDependencies;
9
- }
10
- createTaskGraph(tasks) {
11
- const graph = {
12
- roots: [],
13
- tasks: {},
14
- dependencies: {},
15
- };
16
- for (const task of tasks) {
17
- this.addTaskToGraph(task, graph);
18
- const dependencyConfigs = (0, utils_1.getDependencyConfigs)(task.target, this.defaultTargetDependencies, this.projectGraph);
19
- if (!dependencyConfigs) {
20
- continue;
21
- }
22
- this.addTaskDependencies(task, dependencyConfigs, tasks, graph);
23
- }
24
- graph.roots = Object.keys(graph.dependencies).filter((k) => graph.dependencies[k].length === 0);
25
- return graph;
26
- }
27
- addTaskDependencies(task, dependencyConfigs, tasks, graph) {
28
- for (const dependencyConfig of dependencyConfigs) {
29
- if (dependencyConfig.projects === 'self') {
30
- for (const t of tasks) {
31
- if (t.target.project === task.target.project &&
32
- t.target.target === dependencyConfig.target) {
33
- graph.dependencies[task.id].push(t.id);
34
- }
35
- }
36
- }
37
- else if (dependencyConfig.projects === 'dependencies') {
38
- const seen = new Set();
39
- this.addDependencies(task.target.project, dependencyConfig.target, tasks, graph, task.id, seen);
40
- }
41
- }
42
- }
43
- addDependencies(project, target, tasks, graph, taskId, seen) {
44
- seen.add(project);
45
- const dependencies = this.projectGraph.dependencies[project];
46
- if (dependencies) {
47
- const projectDependencies = dependencies.map((dependency) => dependency.target);
48
- for (const projectDependency of projectDependencies) {
49
- if (seen.has(projectDependency)) {
50
- continue;
51
- }
52
- const dependency = this.findTask({ project: projectDependency, target }, tasks);
53
- if (dependency) {
54
- graph.dependencies[taskId].push(dependency.id);
55
- }
56
- else {
57
- this.addDependencies(projectDependency, target, tasks, graph, taskId, seen);
58
- }
59
- }
60
- }
61
- }
62
- findTask({ project, target }, tasks) {
63
- return tasks.find((t) => t.target.project === project && t.target.target === target);
64
- }
65
- addTaskToGraph(task, graph) {
66
- graph.tasks[task.id] = task;
67
- graph.dependencies[task.id] = [];
68
- }
69
- }
70
- exports.TaskGraphCreator = TaskGraphCreator;
71
- //# sourceMappingURL=task-graph-creator.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"task-graph-creator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-graph-creator.ts"],"names":[],"mappings":"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"}
@@ -1,39 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.fileExists = exports.workspaceRoot = exports.appRootPath = void 0;
4
- const path = require("path");
5
- const fs_1 = require("fs");
6
- /**
7
- * The root of the workspace.
8
- *
9
- * @deprecated use workspaceRoot instead
10
- */
11
- exports.appRootPath = pathInner(__dirname);
12
- /**
13
- * The root of the workspace
14
- */
15
- exports.workspaceRoot = exports.appRootPath;
16
- function pathInner(dir) {
17
- if (process.env.NX_WORKSPACE_ROOT_PATH)
18
- return process.env.NX_WORKSPACE_ROOT_PATH;
19
- if (path.dirname(dir) === dir)
20
- return process.cwd();
21
- if (fileExists(path.join(dir, 'workspace.json')) ||
22
- fileExists(path.join(dir, 'nx.json')) ||
23
- fileExists(path.join(dir, 'angular.json'))) {
24
- return dir;
25
- }
26
- else {
27
- return pathInner(path.dirname(dir));
28
- }
29
- }
30
- function fileExists(filePath) {
31
- try {
32
- return (0, fs_1.statSync)(filePath).isFile();
33
- }
34
- catch (err) {
35
- return false;
36
- }
37
- }
38
- exports.fileExists = fileExists;
39
- //# sourceMappingURL=app-root.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"app-root.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/app-root.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,2BAA8B;AAE9B;;;;GAIG;AACU,QAAA,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAEhD;;GAEG;AACU,QAAA,aAAa,GAAG,mBAAW,CAAC;AAEzC,SAAS,SAAS,CAAC,GAAW;IAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;QACpC,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;QAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;IACpD,IACE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC5C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACrC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAC1C;QACA,OAAO,GAAG,CAAC;KACZ;SAAM;QACL,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;KACrC;AACH,CAAC;AAED,SAAgB,UAAU,CAAC,QAAgB;IACzC,IAAI;QACF,OAAO,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAND,gCAMC"}