nx 13.10.0-beta.9 → 13.10.0-rc.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 (347) hide show
  1. package/bin/init.js +1 -1
  2. package/bin/init.js.map +1 -1
  3. package/bin/nx.js +1 -1
  4. package/package.json +3 -3
  5. package/src/adapter/compat.js +5 -5
  6. package/src/adapter/compat.js.map +1 -1
  7. package/src/adapter/decorate-cli.js +1 -1
  8. package/src/adapter/decorate-cli.js.map +1 -1
  9. package/src/adapter/ngcli-adapter.d.ts +3 -3
  10. package/src/adapter/ngcli-adapter.js +13 -55
  11. package/src/adapter/ngcli-adapter.js.map +1 -1
  12. package/src/command-line/affected.d.ts +1 -1
  13. package/src/command-line/affected.js +9 -8
  14. package/src/command-line/affected.js.map +1 -1
  15. package/src/command-line/connect-to-nx-cloud.js +1 -1
  16. package/src/command-line/connect-to-nx-cloud.js.map +1 -1
  17. package/src/command-line/daemon.js +2 -2
  18. package/src/command-line/daemon.js.map +1 -1
  19. package/src/command-line/dep-graph.d.ts +1 -1
  20. package/src/command-line/dep-graph.js +7 -7
  21. package/src/command-line/dep-graph.js.map +1 -1
  22. package/src/command-line/format.d.ts +2 -2
  23. package/src/command-line/format.js +13 -13
  24. package/src/command-line/format.js.map +1 -1
  25. package/src/command-line/generate.js +8 -8
  26. package/src/command-line/generate.js.map +1 -1
  27. package/src/command-line/lint.js +3 -3
  28. package/src/command-line/lint.js.map +1 -1
  29. package/src/command-line/list.js +1 -1
  30. package/src/command-line/list.js.map +1 -1
  31. package/src/command-line/migrate.js +1 -1
  32. package/src/command-line/nx-commands.js +3 -3
  33. package/src/command-line/nx-commands.js.map +1 -1
  34. package/src/command-line/print-affected.d.ts +3 -3
  35. package/src/command-line/print-affected.js.map +1 -1
  36. package/src/{core/shared-interfaces.d.ts → command-line/read-environment.d.ts} +2 -1
  37. package/src/command-line/read-environment.js +11 -0
  38. package/src/command-line/read-environment.js.map +1 -0
  39. package/src/command-line/report.js +3 -3
  40. package/src/command-line/report.js.map +1 -1
  41. package/src/command-line/reset.js +1 -1
  42. package/src/command-line/reset.js.map +1 -1
  43. package/src/command-line/run-many.d.ts +1 -1
  44. package/src/command-line/run-many.js +5 -5
  45. package/src/command-line/run-many.js.map +1 -1
  46. package/src/command-line/run-one.js +9 -11
  47. package/src/command-line/run-one.js.map +1 -1
  48. package/src/command-line/run.d.ts +2 -1
  49. package/src/command-line/run.js +3 -3
  50. package/src/command-line/run.js.map +1 -1
  51. package/src/command-line/workspace-generators.js +4 -4
  52. package/src/command-line/workspace-generators.js.map +1 -1
  53. package/src/command-line/workspace-integrity-checks.d.ts +1 -1
  54. package/src/command-line/workspace-integrity-checks.js +1 -1
  55. package/src/command-line/workspace-integrity-checks.js.map +1 -1
  56. package/src/config/misc-interfaces.d.ts +85 -0
  57. package/src/{core/shared-interfaces.js → config/misc-interfaces.js} +1 -1
  58. package/src/config/misc-interfaces.js.map +1 -0
  59. package/src/{shared/nx.d.ts → config/nx-json.d.ts} +1 -1
  60. package/src/{shared/nx.js → config/nx-json.js} +1 -1
  61. package/src/config/nx-json.js.map +1 -0
  62. package/src/{shared → config}/project-graph.d.ts +1 -1
  63. package/src/{shared → config}/project-graph.js +0 -0
  64. package/src/{shared → config}/project-graph.js.map +1 -1
  65. package/src/{shared/tasks.d.ts → config/task-graph.d.ts} +0 -0
  66. package/src/{shared/tasks.js → config/task-graph.js} +1 -1
  67. package/src/config/task-graph.js.map +1 -0
  68. package/src/{shared → config}/tree.d.ts +0 -0
  69. package/src/{shared → config}/tree.js +0 -0
  70. package/src/{shared → config}/tree.js.map +1 -1
  71. package/src/config/workspace-json-project-json.d.ts +132 -0
  72. package/src/config/workspace-json-project-json.js +3 -0
  73. package/src/config/workspace-json-project-json.js.map +1 -0
  74. package/src/config/workspaces.d.ts +47 -0
  75. package/src/{shared/workspace.js → config/workspaces.js} +5 -2
  76. package/src/config/workspaces.js.map +1 -0
  77. package/src/core/dep-graph/index.html +16 -0
  78. package/src/core/dep-graph/main.esm.js +1 -1
  79. package/src/core/dep-graph/styles.css +1 -1
  80. package/src/{core/project-graph/daemon → daemon}/cache.d.ts +0 -0
  81. package/src/{core/project-graph/daemon → daemon}/cache.js +0 -0
  82. package/src/daemon/cache.js.map +1 -0
  83. package/src/{core/project-graph/daemon → daemon}/client/client.d.ts +1 -1
  84. package/src/{core/project-graph/daemon → daemon}/client/client.js +2 -2
  85. package/src/daemon/client/client.js.map +1 -0
  86. package/src/{core/project-graph/daemon → daemon}/client/exec-is-server-available.d.ts +0 -0
  87. package/src/{core/project-graph/daemon → daemon}/client/exec-is-server-available.js +0 -0
  88. package/src/daemon/client/exec-is-server-available.js.map +1 -0
  89. package/src/{core/project-graph/daemon → daemon}/client/generate-help-output.d.ts +0 -0
  90. package/src/{core/project-graph/daemon → daemon}/client/generate-help-output.js +0 -0
  91. package/src/daemon/client/generate-help-output.js.map +1 -0
  92. package/src/{core/project-graph/daemon → daemon}/server/logger.d.ts +0 -0
  93. package/src/{core/project-graph/daemon → daemon}/server/logger.js +0 -0
  94. package/src/daemon/server/logger.js.map +1 -0
  95. package/src/{core/project-graph/daemon → daemon}/server/project-graph-incremental-recomputation.d.ts +0 -0
  96. package/src/{core/project-graph/daemon → daemon}/server/project-graph-incremental-recomputation.js +7 -7
  97. package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -0
  98. package/src/{core/project-graph/daemon → daemon}/server/server.d.ts +0 -0
  99. package/src/{core/project-graph/daemon → daemon}/server/server.js +4 -4
  100. package/src/daemon/server/server.js.map +1 -0
  101. package/src/{core/project-graph/daemon → daemon}/server/shutdown-utils.d.ts +0 -0
  102. package/src/{core/project-graph/daemon → daemon}/server/shutdown-utils.js +1 -1
  103. package/src/daemon/server/shutdown-utils.js.map +1 -0
  104. package/src/{core/project-graph/daemon → daemon}/server/start.d.ts +0 -0
  105. package/src/{core/project-graph/daemon → daemon}/server/start.js +1 -1
  106. package/src/daemon/server/start.js.map +1 -0
  107. package/src/{core/project-graph/daemon → daemon}/server/stop.d.ts +0 -0
  108. package/src/{core/project-graph/daemon → daemon}/server/stop.js +1 -1
  109. package/src/daemon/server/stop.js.map +1 -0
  110. package/src/{core/project-graph/daemon → daemon}/server/watcher.d.ts +0 -0
  111. package/src/{core/project-graph/daemon → daemon}/server/watcher.js +3 -3
  112. package/src/daemon/server/watcher.js.map +1 -0
  113. package/src/{core/project-graph/daemon → daemon}/socket-utils.d.ts +1 -1
  114. package/src/{core/project-graph/daemon → daemon}/socket-utils.js +0 -0
  115. package/src/daemon/socket-utils.js.map +1 -0
  116. package/src/{core/project-graph/daemon → daemon}/tmp-dir.d.ts +0 -0
  117. package/src/{core/project-graph/daemon → daemon}/tmp-dir.js +1 -1
  118. package/src/daemon/tmp-dir.js.map +1 -0
  119. package/src/{core/hasher → hasher}/file-hasher-base.d.ts +1 -1
  120. package/src/{core/hasher → hasher}/file-hasher-base.js +3 -3
  121. package/src/hasher/file-hasher-base.js.map +1 -0
  122. package/src/{core/hasher → hasher}/file-hasher.d.ts +0 -0
  123. package/src/{core/hasher → hasher}/file-hasher.js +1 -1
  124. package/src/hasher/file-hasher.js.map +1 -0
  125. package/src/{core/hasher → hasher}/git-based-file-hasher.d.ts +0 -0
  126. package/src/{core/hasher → hasher}/git-based-file-hasher.js +1 -1
  127. package/src/hasher/git-based-file-hasher.js.map +1 -0
  128. package/src/{core/hasher → hasher}/git-hasher.d.ts +0 -0
  129. package/src/{core/hasher → hasher}/git-hasher.js +2 -2
  130. package/src/hasher/git-hasher.js.map +1 -0
  131. package/src/{core/hasher → hasher}/hasher.d.ts +3 -3
  132. package/src/{core/hasher → hasher}/hasher.js +6 -6
  133. package/src/hasher/hasher.js.map +1 -0
  134. package/src/{core/hasher → hasher}/hashing-impl.d.ts +0 -0
  135. package/src/{core/hasher → hasher}/hashing-impl.js +0 -0
  136. package/src/hasher/hashing-impl.js.map +1 -0
  137. package/src/{core/hasher → hasher}/node-based-file-hasher.d.ts +0 -0
  138. package/src/{core/hasher → hasher}/node-based-file-hasher.js +3 -3
  139. package/src/hasher/node-based-file-hasher.js.map +1 -0
  140. package/src/{core/affected-project-graph → project-graph/affected}/affected-project-graph-models.d.ts +2 -2
  141. package/src/{core/affected-project-graph → project-graph/affected}/affected-project-graph-models.js +0 -0
  142. package/src/project-graph/affected/affected-project-graph-models.js.map +1 -0
  143. package/src/{core/affected-project-graph → project-graph/affected}/affected-project-graph.d.ts +3 -3
  144. package/src/{core/affected-project-graph → project-graph/affected}/affected-project-graph.js +1 -1
  145. package/src/project-graph/affected/affected-project-graph.js.map +1 -0
  146. package/src/{core/affected-project-graph → project-graph/affected}/locators/implicit-json-changes.d.ts +0 -0
  147. package/src/{core/affected-project-graph → project-graph/affected}/locators/implicit-json-changes.js +0 -0
  148. package/src/project-graph/affected/locators/implicit-json-changes.js.map +1 -0
  149. package/src/{core/affected-project-graph → project-graph/affected}/locators/npm-packages.d.ts +0 -0
  150. package/src/{core/affected-project-graph → project-graph/affected}/locators/npm-packages.js +0 -0
  151. package/src/project-graph/affected/locators/npm-packages.js.map +1 -0
  152. package/src/{core/affected-project-graph → project-graph/affected}/locators/tsconfig-json-changes.d.ts +0 -0
  153. package/src/{core/affected-project-graph → project-graph/affected}/locators/tsconfig-json-changes.js +0 -0
  154. package/src/project-graph/affected/locators/tsconfig-json-changes.js.map +1 -0
  155. package/src/{core/affected-project-graph → project-graph/affected}/locators/workspace-json-changes.d.ts +0 -0
  156. package/src/{core/affected-project-graph → project-graph/affected}/locators/workspace-json-changes.js +0 -0
  157. package/src/project-graph/affected/locators/workspace-json-changes.js.map +1 -0
  158. package/src/{core/affected-project-graph → project-graph/affected}/locators/workspace-projects.d.ts +0 -0
  159. package/src/{core/affected-project-graph → project-graph/affected}/locators/workspace-projects.js +0 -0
  160. package/src/project-graph/affected/locators/workspace-projects.js.map +1 -0
  161. package/src/{core/project-graph → project-graph}/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +2 -2
  162. package/src/{core/project-graph → project-graph}/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +0 -0
  163. package/src/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -0
  164. package/src/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts +3 -0
  165. package/src/{core/project-graph → project-graph}/build-dependencies/explicit-package-json-dependencies.js +3 -3
  166. package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -0
  167. package/src/project-graph/build-dependencies/explicit-project-dependencies.d.ts +3 -0
  168. package/src/{core/project-graph → project-graph}/build-dependencies/explicit-project-dependencies.js +1 -1
  169. package/src/project-graph/build-dependencies/explicit-project-dependencies.js.map +1 -0
  170. package/src/{core/project-graph → project-graph}/build-dependencies/implicit-project-dependencies.d.ts +1 -1
  171. package/src/{core/project-graph → project-graph}/build-dependencies/implicit-project-dependencies.js +1 -1
  172. package/src/project-graph/build-dependencies/implicit-project-dependencies.js.map +1 -0
  173. package/src/{core/project-graph → project-graph}/build-dependencies/index.d.ts +0 -0
  174. package/src/{core/project-graph → project-graph}/build-dependencies/index.js +0 -0
  175. package/src/project-graph/build-dependencies/index.js.map +1 -0
  176. package/src/{core/project-graph → project-graph}/build-dependencies/typescript-import-locator.d.ts +1 -1
  177. package/src/{core/project-graph → project-graph}/build-dependencies/typescript-import-locator.js +4 -4
  178. package/src/project-graph/build-dependencies/typescript-import-locator.js.map +1 -0
  179. package/src/{core/project-graph → project-graph}/build-nodes/index.d.ts +0 -0
  180. package/src/{core/project-graph → project-graph}/build-nodes/index.js +0 -0
  181. package/src/project-graph/build-nodes/index.js.map +1 -0
  182. package/src/{core/project-graph → project-graph}/build-nodes/npm-packages.d.ts +0 -0
  183. package/src/{core/project-graph → project-graph}/build-nodes/npm-packages.js +0 -0
  184. package/src/project-graph/build-nodes/npm-packages.js.map +1 -0
  185. package/src/{core/project-graph → project-graph}/build-nodes/workspace-projects.d.ts +1 -1
  186. package/src/{core/project-graph → project-graph}/build-nodes/workspace-projects.js +0 -0
  187. package/src/project-graph/build-nodes/workspace-projects.js.map +1 -0
  188. package/src/{core/project-graph → project-graph}/build-project-graph.d.ts +4 -4
  189. package/src/{core/project-graph → project-graph}/build-project-graph.js +10 -10
  190. package/src/project-graph/build-project-graph.js.map +1 -0
  191. package/src/{core → project-graph}/file-map-utils.d.ts +1 -1
  192. package/src/{core → project-graph}/file-map-utils.js +0 -0
  193. package/src/project-graph/file-map-utils.js.map +1 -0
  194. package/src/{core → project-graph}/file-utils.d.ts +4 -6
  195. package/src/{core → project-graph}/file-utils.js +6 -12
  196. package/src/project-graph/file-utils.js.map +1 -0
  197. package/src/{core → project-graph}/normalize-nx-json.d.ts +1 -1
  198. package/src/{core → project-graph}/normalize-nx-json.js +0 -0
  199. package/src/project-graph/normalize-nx-json.js.map +1 -0
  200. package/src/{core/nx-deps → project-graph}/nx-deps-cache.d.ts +3 -3
  201. package/src/{core/nx-deps → project-graph}/nx-deps-cache.js +3 -3
  202. package/src/project-graph/nx-deps-cache.js.map +1 -0
  203. package/src/{core/project-graph → project-graph}/operators.d.ts +1 -1
  204. package/src/{core/project-graph → project-graph}/operators.js +0 -0
  205. package/src/project-graph/operators.js.map +1 -0
  206. package/src/{core/project-graph → project-graph}/project-graph-builder.d.ts +1 -1
  207. package/src/{core/project-graph → project-graph}/project-graph-builder.js +1 -1
  208. package/src/project-graph/project-graph-builder.js.map +1 -0
  209. package/src/{core/project-graph → project-graph}/project-graph-worker.d.ts +0 -0
  210. package/src/{core/project-graph → project-graph}/project-graph-worker.js +0 -0
  211. package/src/project-graph/project-graph-worker.js.map +1 -0
  212. package/src/{core/project-graph → project-graph}/project-graph.d.ts +1 -1
  213. package/src/{core/project-graph → project-graph}/project-graph.js +7 -7
  214. package/src/project-graph/project-graph.js.map +1 -0
  215. package/src/tasks-runner/batch/batch-messages.d.ts +1 -1
  216. package/src/tasks-runner/batch/run-batch.js +5 -5
  217. package/src/tasks-runner/batch/run-batch.js.map +1 -1
  218. package/src/tasks-runner/cache.d.ts +1 -1
  219. package/src/tasks-runner/cache.js +1 -1
  220. package/src/tasks-runner/cache.js.map +1 -1
  221. package/src/tasks-runner/default-tasks-runner.js +1 -1
  222. package/src/tasks-runner/default-tasks-runner.js.map +1 -1
  223. package/src/tasks-runner/forked-process-task-runner.d.ts +1 -1
  224. package/src/tasks-runner/forked-process-task-runner.js +1 -1
  225. package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
  226. package/src/tasks-runner/life-cycle.d.ts +1 -1
  227. package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.d.ts +1 -1
  228. package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +19 -7
  229. package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
  230. package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.d.ts +1 -1
  231. package/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.d.ts +1 -1
  232. package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.d.ts +1 -1
  233. package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.d.ts +1 -1
  234. package/src/tasks-runner/life-cycles/task-profiling-life-cycle.d.ts +1 -1
  235. package/src/tasks-runner/life-cycles/task-profiling-life-cycle.js +1 -1
  236. package/src/tasks-runner/life-cycles/task-profiling-life-cycle.js.map +1 -1
  237. package/src/tasks-runner/life-cycles/task-timings-life-cycle.d.ts +1 -1
  238. package/src/tasks-runner/run-command.d.ts +8 -7
  239. package/src/tasks-runner/run-command.js +2 -2
  240. package/src/tasks-runner/run-command.js.map +1 -1
  241. package/src/tasks-runner/task-graph-creator.d.ts +3 -3
  242. package/src/tasks-runner/task-graph-creator.js.map +1 -1
  243. package/src/tasks-runner/task-orchestrator.d.ts +3 -3
  244. package/src/tasks-runner/task-orchestrator.js +3 -3
  245. package/src/tasks-runner/task-orchestrator.js.map +1 -1
  246. package/src/tasks-runner/tasks-runner-v2.d.ts +3 -3
  247. package/src/tasks-runner/tasks-runner.d.ts +3 -3
  248. package/src/tasks-runner/tasks-schedule.d.ts +4 -4
  249. package/src/tasks-runner/utils.d.ts +5 -4
  250. package/src/tasks-runner/utils.js +1 -1
  251. package/src/tasks-runner/utils.js.map +1 -1
  252. package/src/{core → utils}/assert-workspace-validity.d.ts +1 -1
  253. package/src/{core → utils}/assert-workspace-validity.js +1 -1
  254. package/src/utils/assert-workspace-validity.js.map +1 -0
  255. package/src/utils/cache-directory.js +2 -2
  256. package/src/utils/cache-directory.js.map +1 -1
  257. package/src/{command-line/utils.d.ts → utils/command-line-utils.d.ts} +1 -1
  258. package/src/{command-line/utils.js → utils/command-line-utils.js} +4 -4
  259. package/src/utils/command-line-utils.js.map +1 -0
  260. package/src/utils/json-diff.d.ts +1 -1
  261. package/src/utils/logger.js +2 -2
  262. package/src/utils/logger.js.map +1 -1
  263. package/src/utils/nx-plugin.d.ts +2 -2
  264. package/src/utils/nx-plugin.js +3 -3
  265. package/src/utils/nx-plugin.js.map +1 -1
  266. package/src/utils/output.d.ts +1 -1
  267. package/src/utils/package-json.d.ts +5 -2
  268. package/src/utils/package-json.js.map +1 -1
  269. package/src/utils/params.d.ts +2 -2
  270. package/src/utils/params.js +3 -6
  271. package/src/utils/params.js.map +1 -1
  272. package/src/utils/plugins/installed-plugins.js +1 -1
  273. package/src/utils/plugins/installed-plugins.js.map +1 -1
  274. package/src/utils/plugins/plugin-capabilities.js +2 -2
  275. package/src/utils/plugins/plugin-capabilities.js.map +1 -1
  276. package/src/utils/print-help.js +1 -1
  277. package/src/utils/print-help.js.map +1 -1
  278. package/src/utils/project-graph-utils.d.ts +2 -2
  279. package/src/utils/project-graph-utils.js +4 -4
  280. package/src/utils/project-graph-utils.js.map +1 -1
  281. package/src/{core → utils}/target-project-locator.d.ts +1 -1
  282. package/src/{core → utils}/target-project-locator.js +4 -4
  283. package/src/utils/target-project-locator.js.map +1 -0
  284. package/src/utils/typescript.js +1 -1
  285. package/src/utils/typescript.js.map +1 -1
  286. package/src/utils/versions.js +1 -1
  287. package/src/command-line/utils.js.map +0 -1
  288. package/src/core/affected-project-graph/affected-project-graph-models.js.map +0 -1
  289. package/src/core/affected-project-graph/affected-project-graph.js.map +0 -1
  290. package/src/core/affected-project-graph/index.d.ts +0 -2
  291. package/src/core/affected-project-graph/index.js +0 -6
  292. package/src/core/affected-project-graph/index.js.map +0 -1
  293. package/src/core/affected-project-graph/locators/implicit-json-changes.js.map +0 -1
  294. package/src/core/affected-project-graph/locators/npm-packages.js.map +0 -1
  295. package/src/core/affected-project-graph/locators/tsconfig-json-changes.js.map +0 -1
  296. package/src/core/affected-project-graph/locators/workspace-json-changes.js.map +0 -1
  297. package/src/core/affected-project-graph/locators/workspace-projects.js.map +0 -1
  298. package/src/core/assert-workspace-validity.js.map +0 -1
  299. package/src/core/file-map-utils.js.map +0 -1
  300. package/src/core/file-utils.js.map +0 -1
  301. package/src/core/hasher/file-hasher-base.js.map +0 -1
  302. package/src/core/hasher/file-hasher.js.map +0 -1
  303. package/src/core/hasher/git-based-file-hasher.js.map +0 -1
  304. package/src/core/hasher/git-hasher.js.map +0 -1
  305. package/src/core/hasher/hasher.js.map +0 -1
  306. package/src/core/hasher/hashing-impl.js.map +0 -1
  307. package/src/core/hasher/node-based-file-hasher.js.map +0 -1
  308. package/src/core/normalize-nx-json.js.map +0 -1
  309. package/src/core/nx-deps/nx-deps-cache.js.map +0 -1
  310. package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +0 -1
  311. package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts +0 -3
  312. package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +0 -1
  313. package/src/core/project-graph/build-dependencies/explicit-project-dependencies.d.ts +0 -3
  314. package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js.map +0 -1
  315. package/src/core/project-graph/build-dependencies/implicit-project-dependencies.js.map +0 -1
  316. package/src/core/project-graph/build-dependencies/index.js.map +0 -1
  317. package/src/core/project-graph/build-dependencies/typescript-import-locator.js.map +0 -1
  318. package/src/core/project-graph/build-nodes/index.js.map +0 -1
  319. package/src/core/project-graph/build-nodes/npm-packages.js.map +0 -1
  320. package/src/core/project-graph/build-nodes/workspace-projects.js.map +0 -1
  321. package/src/core/project-graph/build-project-graph.js.map +0 -1
  322. package/src/core/project-graph/daemon/cache.js.map +0 -1
  323. package/src/core/project-graph/daemon/client/client.js.map +0 -1
  324. package/src/core/project-graph/daemon/client/exec-is-server-available.js.map +0 -1
  325. package/src/core/project-graph/daemon/client/generate-help-output.js.map +0 -1
  326. package/src/core/project-graph/daemon/server/logger.js.map +0 -1
  327. package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +0 -1
  328. package/src/core/project-graph/daemon/server/server.js.map +0 -1
  329. package/src/core/project-graph/daemon/server/shutdown-utils.js.map +0 -1
  330. package/src/core/project-graph/daemon/server/start.js.map +0 -1
  331. package/src/core/project-graph/daemon/server/stop.js.map +0 -1
  332. package/src/core/project-graph/daemon/server/watcher.js.map +0 -1
  333. package/src/core/project-graph/daemon/socket-utils.js.map +0 -1
  334. package/src/core/project-graph/daemon/tmp-dir.js.map +0 -1
  335. package/src/core/project-graph/operators.js.map +0 -1
  336. package/src/core/project-graph/project-graph-builder.js.map +0 -1
  337. package/src/core/project-graph/project-graph-worker.js.map +0 -1
  338. package/src/core/project-graph/project-graph.js.map +0 -1
  339. package/src/core/shared-interfaces.js.map +0 -1
  340. package/src/core/target-project-locator.js.map +0 -1
  341. package/src/shared/nx.js.map +0 -1
  342. package/src/shared/tasks.js.map +0 -1
  343. package/src/shared/workspace.d.ts +0 -259
  344. package/src/shared/workspace.js.map +0 -1
  345. package/src/tasks-runner/reporter.d.ts +0 -14
  346. package/src/tasks-runner/reporter.js +0 -11
  347. package/src/tasks-runner/reporter.js.map +0 -1
package/bin/init.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
- const project_graph_1 = require("../src/core/project-graph/project-graph");
4
+ const project_graph_1 = require("../src/project-graph/project-graph");
5
5
  (() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
6
6
  try {
7
7
  yield (0, project_graph_1.createProjectGraphAsync)();
package/bin/init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init.ts"],"names":[],"mappings":";;;AAAA,2EAAkF;AAElF,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
+ {"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"}
package/bin/nx.js CHANGED
@@ -5,7 +5,7 @@ const find_workspace_root_1 = require("../src/utils/find-workspace-root");
5
5
  const chalk = require("chalk");
6
6
  const init_local_1 = require("./init-local");
7
7
  const package_manager_1 = require("../src/utils/package-manager");
8
- const output_1 = require("nx/src/utils/output");
8
+ const output_1 = require("../src/utils/output");
9
9
  // new is a special case because there is no local workspace to load
10
10
  if (process.argv[2] === 'new' || process.argv[2] === '_migrate') {
11
11
  require('nx/src/command-line/nx-commands').commandsObject.argv;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nx",
3
- "version": "13.10.0-beta.9",
3
+ "version": "13.10.0-rc.2",
4
4
  "description": "Smart, Fast and Extensible Build System",
5
5
  "repository": {
6
6
  "type": "git",
@@ -60,8 +60,8 @@
60
60
  "minimatch": "3.0.4",
61
61
  "enquirer": "~2.3.6",
62
62
  "tslib": "^2.3.0",
63
- "@nrwl/cli": "13.10.0-beta.9",
64
- "@nrwl/tao": "13.10.0-beta.9"
63
+ "@nrwl/cli": "13.10.0-rc.2",
64
+ "@nrwl/tao": "13.10.0-rc.2"
65
65
  },
66
66
  "main": "./bin/nx.js",
67
67
  "typings": "./bin/nx.d.ts"
package/src/adapter/compat.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  const logger_1 = require("../utils/logger");
5
- const workspace_1 = require("../shared/workspace");
5
+ const workspaces_1 = require("../config/workspaces");
6
6
  const app_root_1 = require("../utils/app-root");
7
7
  /* eslint-disable */
8
8
  const Module = require('module');
@@ -20,7 +20,7 @@ if (!patched) {
20
20
  core._test_addWorkspaceFile('workspace.json', core.WorkspaceFormat.JSON);
21
21
  const originalReadWorkspace = core.readWorkspace;
22
22
  core.readWorkspace = (path, ...rest) => {
23
- const configFile = (0, workspace_1.workspaceConfigName)(app_root_1.workspaceRoot);
23
+ const configFile = (0, workspaces_1.workspaceConfigName)(app_root_1.workspaceRoot);
24
24
  if (!configFile) {
25
25
  path = 'workspace.json';
26
26
  }
@@ -28,7 +28,7 @@ if (!patched) {
28
28
  };
29
29
  const originalWriteWorkspace = core.writeWorkspace;
30
30
  core.writeWorkspace = (...args) => {
31
- const configFile = (0, workspace_1.workspaceConfigName)(app_root_1.workspaceRoot);
31
+ const configFile = (0, workspaces_1.workspaceConfigName)(app_root_1.workspaceRoot);
32
32
  if (!loggedWriteWorkspaceWarning) {
33
33
  if (configFile) {
34
34
  logger_1.logger.warn(`[NX] Angular devkit called \`writeWorkspace\`, this may have had unintended consequences in ${configFile}`);
@@ -54,9 +54,9 @@ if (!patched) {
54
54
  }
55
55
  catch (_a) {
56
56
  logger_1.logger.debug('[NX] Angular devkit readJsonWorkspace fell back to Nx workspaces logic');
57
- const w = new workspace_1.Workspaces(app_root_1.workspaceRoot);
57
+ const w = new workspaces_1.Workspaces(app_root_1.workspaceRoot);
58
58
  // Read our v1 workspace schema
59
- const workspaceConfiguration = (0, workspace_1.resolveOldFormatWithInlineProjects)(w.readWorkspaceConfiguration());
59
+ const workspaceConfiguration = (0, workspaces_1.resolveOldFormatWithInlineProjects)(w.readWorkspaceConfiguration());
60
60
  // readJsonWorkspace actually has AST parsing + more, so we
61
61
  // still need to call it rather than just return our file
62
62
  return originalReadJsonWorkspace.apply(this, [
package/src/adapter/compat.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}
package/src/adapter/decorate-cli.js CHANGED
@@ -6,7 +6,7 @@ function decorateCli() {
6
6
  const path = 'node_modules/@angular/cli/lib/cli/index.js';
7
7
  const angularCLIInit = (0, fs_1.readFileSync)(path, 'utf-8');
8
8
  const start = angularCLIInit.indexOf(`(options) {`) + 11;
9
- const newContent = `${angularCLIInit.substr(0, start)}
9
+ const newContent = `${angularCLIInit.slice(0, start)}
10
10
  if (!process.env['NX_CLI_SET']) {
11
11
  require('nx/bin/nx');
12
12
  return new Promise(function(res, rej) {});
package/src/adapter/decorate-cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"decorate-cli.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/decorate-cli.ts"],"names":[],"mappings":";;;AAAA,2BAAiD;AAEjD,SAAgB,WAAW;IACzB,MAAM,IAAI,GAAG,4CAA4C,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;IAEzD,MAAM,UAAU,GAAG,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;;;;;IAKnD,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC;CAClC,CAAC;IACA,IAAA,kBAAa,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAbD,kCAaC"}
1
+ {"version":3,"file":"decorate-cli.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/decorate-cli.ts"],"names":[],"mappings":";;;AAAA,2BAAiD;AAEjD,SAAgB,WAAW;IACzB,MAAM,IAAI,GAAG,4CAA4C,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;IAEzD,MAAM,UAAU,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;;;;;IAKlD,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC;CAClC,CAAC;IACA,IAAA,kBAAa,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAClC,CAAC;AAbD,kCAaC"}
package/src/adapter/ngcli-adapter.d.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  import { logging, Path, PathFragment, virtualFs } from '@angular-devkit/core';
2
2
  import { GenerateOptions } from '../command-line/generate';
3
- import { Tree } from '../shared/tree';
4
- import { RawWorkspaceJsonConfiguration, WorkspaceJsonConfiguration } from '../shared/workspace';
3
+ import { Tree } from '../config/tree';
5
4
  import { FileBuffer } from '@angular-devkit/core/src/virtual-fs/host/interface';
6
5
  import { Observable } from 'rxjs';
7
- import { NxJsonConfiguration } from '../shared/nx';
6
+ import { NxJsonConfiguration } from '../config/nx-json';
7
+ import { RawWorkspaceJsonConfiguration, WorkspaceJsonConfiguration } from '../config/workspace-json-project-json';
8
8
  export declare function scheduleTarget(root: string, opts: {
9
9
  project: string;
10
10
  target: string;
package/src/adapter/ngcli-adapter.js CHANGED
@@ -7,7 +7,7 @@ const core_1 = require("@angular-devkit/core");
7
7
  const chalk = require("chalk");
8
8
  const node_1 = require("@angular-devkit/core/node");
9
9
  const package_manager_1 = require("../utils/package-manager");
10
- const workspace_1 = require("../shared/workspace");
10
+ const workspaces_1 = require("../config/workspaces");
11
11
  const path_1 = require("path");
12
12
  const rxjs_1 = require("rxjs");
13
13
  const operators_1 = require("rxjs/operators");
@@ -20,7 +20,7 @@ function scheduleTarget(root, opts, verbose) {
20
20
  const { WorkspaceNodeModulesArchitectHost, } = require('@angular-devkit/architect/node');
21
21
  const logger = getTargetLogger(opts.executor, verbose);
22
22
  const fsHost = new NxScopedHost(root);
23
- const { workspace } = yield core_1.workspaces.readWorkspace((0, workspace_1.workspaceConfigName)(root), core_1.workspaces.createWorkspaceHost(fsHost));
23
+ const { workspace } = yield core_1.workspaces.readWorkspace((0, workspaces_1.workspaceConfigName)(root), core_1.workspaces.createWorkspaceHost(fsHost));
24
24
  const registry = new core_1.schema.CoreSchemaRegistry();
25
25
  registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
26
26
  const architectHost = new WorkspaceNodeModulesArchitectHost(workspace, root);
@@ -66,7 +66,7 @@ function createRecorder(host, record, logger) {
66
66
  const actualConfigName = yield host.workspaceConfigName();
67
67
  return (event) => {
68
68
  let eventPath = event.path.startsWith('/')
69
- ? event.path.substr(1)
69
+ ? event.path.slice(1)
70
70
  : event.path;
71
71
  if (eventPath === 'workspace.json' || eventPath === 'angular.json') {
72
72
  eventPath = actualConfigName;
@@ -142,8 +142,8 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
142
142
  .pipe((0, operators_1.map)((data) => (0, json_1.parseJson)(Buffer.from(data).toString())));
143
143
  }
144
144
  else {
145
- const staticProjects = (0, workspace_1.globForProjectFiles)(this.root);
146
- this.__nxInMemoryWorkspace = (0, workspace_1.buildWorkspaceConfigurationFromGlobs)(nxJson, staticProjects.filter((x) => (0, path_1.basename)(x) !== 'package.json'));
145
+ const staticProjects = (0, workspaces_1.globForProjectFiles)(this.root);
146
+ this.__nxInMemoryWorkspace = (0, workspaces_1.buildWorkspaceConfigurationFromGlobs)(nxJson, staticProjects.filter((x) => (0, path_1.basename)(x) !== 'package.json'));
147
147
  Object.entries(this.__nxInMemoryWorkspace.projects).forEach(([project, config]) => {
148
148
  this.__nxInMemoryWorkspace.projects[project] = config.root;
149
149
  });
@@ -178,7 +178,7 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
178
178
  (_b = angularJson.generators) !== null && _b !== void 0 ? _b : (angularJson.generators = nxJson === null || nxJson === void 0 ? void 0 : nxJson.generators);
179
179
  (_c = angularJson.defaultProject) !== null && _c !== void 0 ? _c : (angularJson.defaultProject = nxJson === null || nxJson === void 0 ? void 0 : nxJson.defaultProject);
180
180
  if (workspaceJson.version === 2) {
181
- const formatted = (0, workspace_1.toOldFormatOrNull)(workspaceJson);
181
+ const formatted = (0, workspaces_1.toOldFormatOrNull)(workspaceJson);
182
182
  return formatted
183
183
  ? Buffer.from((0, json_1.serializeJson)(formatted))
184
184
  : Buffer.from((0, json_1.serializeJson)(x));
@@ -287,7 +287,7 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
287
287
  if (context.isNewFormat) {
288
288
  try {
289
289
  const w = (0, json_1.parseJson)(Buffer.from(content).toString());
290
- const formatted = (0, workspace_1.toNewFormatOrNull)(w);
290
+ const formatted = (0, workspaces_1.toNewFormatOrNull)(w);
291
291
  if (formatted) {
292
292
  const { cli, generators, defaultProject } = formatted, workspaceJson = tslib_1.__rest(formatted, ["cli", "generators", "defaultProject"]);
293
293
  return (0, rxjs_1.merge)(this.writeWorkspaceConfigFiles(context, workspaceJson), cli || generators || defaultProject
@@ -406,8 +406,8 @@ class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
406
406
  ? (0, json_1.parseJson)(nxJsonChange.content.toString())
407
407
  : (0, json_1.parseJson)(this.host.read('nx.json').toString());
408
408
  const readJsonWithHost = (file) => (0, json_1.parseJson)(this.host.read(file).toString());
409
- const staticProjects = (0, workspace_1.buildWorkspaceConfigurationFromGlobs)(nxJsonInTree, (0, workspace_1.globForProjectFiles)(this.host.root).filter((x) => (0, path_1.basename)(x) !== 'package.json'), readJsonWithHost);
410
- const createdProjects = (0, workspace_1.buildWorkspaceConfigurationFromGlobs)(nxJsonInTree, createdProjectFiles.map((x) => x.path), readJsonWithHost).projects;
409
+ const staticProjects = (0, workspaces_1.buildWorkspaceConfigurationFromGlobs)(nxJsonInTree, (0, workspaces_1.globForProjectFiles)(this.host.root).filter((x) => (0, path_1.basename)(x) !== 'package.json'), readJsonWithHost);
410
+ const createdProjects = (0, workspaces_1.buildWorkspaceConfigurationFromGlobs)(nxJsonInTree, createdProjectFiles.map((x) => x.path), readJsonWithHost).projects;
411
411
  deletedProjectFiles.forEach((file) => {
412
412
  const matchingStaticProject = Object.entries(staticProjects.projects).find(([, config]) => config.root === (0, path_1.dirname)(file.path));
413
413
  if (matchingStaticProject) {
@@ -524,48 +524,6 @@ function isWorkspaceConfigPath(p) {
524
524
  p === 'workspace.json' ||
525
525
  p === '/workspace.json');
526
526
  }
527
- function processConfigWhenReading(content) {
528
- try {
529
- const json = (0, json_1.parseJson)(Buffer.from(content).toString());
530
- Object.values(json.projects).forEach((p) => {
531
- try {
532
- Object.values(p.architect || p.targets).forEach((e) => {
533
- if ((e.builder === '@nrwl/jest:jest' ||
534
- e.executor === '@nrwl/jest:jest') &&
535
- !e.options.tsConfig) {
536
- e.options.tsConfig = `${p.root}/tsconfig.spec.json`;
537
- }
538
- });
539
- }
540
- catch (e) { }
541
- });
542
- return Buffer.from((0, json_1.serializeJson)(json));
543
- }
544
- catch (e) {
545
- return content;
546
- }
547
- }
548
- function processConfigWhenWriting(content) {
549
- try {
550
- const json = (0, json_1.parseJson)(Buffer.from(content).toString());
551
- Object.values(json.projects).forEach((p) => {
552
- try {
553
- Object.values(p.architect || p.targets).forEach((e) => {
554
- if ((e.builder === '@nrwl/jest:jest' ||
555
- e.executor === '@nrwl/jest:jest') &&
556
- e.options.tsConfig) {
557
- delete e.options.tsConfig;
558
- }
559
- });
560
- }
561
- catch (e) { }
562
- });
563
- return Buffer.from((0, json_1.serializeJson)(json));
564
- }
565
- catch (e) {
566
- return content;
567
- }
568
- }
569
527
  function generate(root, opts, verbose) {
570
528
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
571
529
  const logger = (0, exports.getLogger)(verbose);
@@ -697,7 +655,7 @@ function convertEventTypeToHandleMultipleConfigNames(host, eventPath, content) {
697
655
  }
698
656
  catch (e) { }
699
657
  if (content && isNewFormat) {
700
- const formatted = (0, workspace_1.toNewFormat)((0, json_1.parseJson)(content.toString()));
658
+ const formatted = (0, workspaces_1.toNewFormat)((0, json_1.parseJson)(content.toString()));
701
659
  if (formatted) {
702
660
  return {
703
661
  eventPath: actualConfigName,
@@ -781,7 +739,7 @@ function wrapAngularDevkitSchematic(collectionName, generatorName) {
781
739
  emptyLogger.createChild = () => emptyLogger;
782
740
  const recorder = (event) => {
783
741
  let eventPath = event.path.startsWith('/')
784
- ? event.path.substr(1)
742
+ ? event.path.slice(1)
785
743
  : event.path;
786
744
  const r = convertEventTypeToHandleMultipleConfigNames(host, eventPath, event.content);
787
745
  if (event.kind === 'error') {
@@ -855,13 +813,13 @@ const loggerColors = {
855
813
  warn: (s) => chalk.bold(chalk.yellow(s)),
856
814
  error: (s) => {
857
815
  if (s.startsWith('NX ')) {
858
- return `\n${logger_1.NX_ERROR} ${chalk.bold(chalk.red(s.substr(3)))}\n`;
816
+ return `\n${logger_1.NX_ERROR} ${chalk.bold(chalk.red(s.slice(3)))}\n`;
859
817
  }
860
818
  return chalk.bold(chalk.red(s));
861
819
  },
862
820
  info: (s) => {
863
821
  if (s.startsWith('NX ')) {
864
- return `\n${logger_1.NX_PREFIX} ${chalk.bold(s.substr(3))}\n`;
822
+ return `\n${logger_1.NX_PREFIX} ${chalk.bold(s.slice(3))}\n`;
865
823
  }
866
824
  return chalk.white(s);
867
825
  },
package/src/adapter/ngcli-adapter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ngcli-adapter.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ngcli-adapter.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}
package/src/command-line/affected.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import * as yargs from 'yargs';
2
- import type { RawNxArgs } from './utils';
2
+ import type { RawNxArgs } from '../utils/command-line-utils';
3
3
  export declare function affected(command: 'apps' | 'libs' | 'graph' | 'print-affected' | 'affected', parsedArgs: yargs.Arguments & RawNxArgs): Promise<void>;
package/src/command-line/affected.js CHANGED
@@ -2,28 +2,29 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.affected = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const affected_project_graph_1 = require("../core/affected-project-graph");
6
- const file_utils_1 = require("../core/file-utils");
5
+ const file_utils_1 = require("../project-graph/file-utils");
7
6
  const run_command_1 = require("../tasks-runner/run-command");
8
7
  const output_1 = require("../utils/output");
9
8
  const dep_graph_1 = require("./dep-graph");
10
9
  const print_affected_1 = require("./print-affected");
11
10
  const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
12
- const utils_1 = require("./utils");
11
+ const command_line_utils_1 = require("../utils/command-line-utils");
13
12
  const perf_hooks_1 = require("perf_hooks");
14
- const project_graph_1 = require("nx/src/core/project-graph/project-graph");
15
- const operators_1 = require("nx/src/core/project-graph/operators");
13
+ const project_graph_1 = require("../project-graph/project-graph");
14
+ const operators_1 = require("../project-graph/operators");
16
15
  const project_graph_utils_1 = require("../utils/project-graph-utils");
16
+ const affected_project_graph_1 = require("../project-graph/affected/affected-project-graph");
17
+ const read_environment_1 = require("./read-environment");
17
18
  function affected(command, parsedArgs) {
18
19
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
19
20
  perf_hooks_1.performance.mark('command-execution-begins');
20
- const { nxArgs, overrides } = (0, utils_1.splitArgsIntoNxArgsAndOverrides)(parsedArgs, 'affected', {
21
+ const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(parsedArgs, 'affected', {
21
22
  printWarnings: command !== 'print-affected' && !parsedArgs.plain,
22
23
  });
23
24
  yield (0, connect_to_nx_cloud_1.connectToNxCloudUsingScan)(nxArgs.scan);
24
25
  const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
25
26
  const projects = projectsToRun(nxArgs, projectGraph);
26
- const env = (0, file_utils_1.readEnvironment)();
27
+ const env = (0, read_environment_1.readEnvironment)();
27
28
  try {
28
29
  switch (command) {
29
30
  case 'apps':
@@ -88,7 +89,7 @@ exports.affected = affected;
88
89
  function projectsToRun(nxArgs, projectGraph) {
89
90
  let affectedGraph = nxArgs.all
90
91
  ? projectGraph
91
- : (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, utils_1.parseFiles)(nxArgs).files, projectGraph.allWorkspaceFiles, nxArgs));
92
+ : (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_1.parseFiles)(nxArgs).files, projectGraph.allWorkspaceFiles, nxArgs));
92
93
  if (!nxArgs.all && nxArgs.withDeps) {
93
94
  affectedGraph = (0, operators_1.withDeps)(projectGraph, Object.values(affectedGraph.nodes));
94
95
  }
package/src/command-line/affected.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/affected.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/affected.ts"],"names":[],"mappings":"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"}
package/src/command-line/connect-to-nx-cloud.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.connectToNxCloudCommand = exports.connectToNxCloudUsingScan = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const file_utils_1 = require("../core/file-utils");
5
+ const file_utils_1 = require("../project-graph/file-utils");
6
6
  const output_1 = require("../utils/output");
7
7
  const package_manager_1 = require("../utils/package-manager");
8
8
  const child_process_1 = require("child_process");
package/src/command-line/connect-to-nx-cloud.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,mDAAgD;AAChD,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AAEzC,SAAsB,yBAAyB,CAAC,IAAa;;QAC3D,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACvE,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,IAAI,uCAAuC;YACnD,CAAC,CAAC,MAAM,IAAI,0BAA0B,CACzC,CAAC;QACF,IAAI,CAAC,mBAAmB;YAAE,OAAO;QAEjC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,4DAA4D;SACpE,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;YACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;YAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;gBAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;SACJ;aAAM;YACL,eAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC,CAAC;SAC/D;IACH,CAAC;CAAA;AAxBD,8DAwBC;AAED,SAAsB,uBAAuB;;QAC3C,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,kDAAkD;aAC1D,CAAC,CAAC;YACH,OAAO;SACR;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;QAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAnBD,0DAmBC;AAED,SAAe,sBAAsB;;QACnC,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,oEAAoE;gBAC7E,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,8EAA8E;qBACrF;oBACD;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,OAAO,EAAE,KAAY;aACtB;SACF,CAAC;aACD,IAAI,CAAC,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IACjE,CAAC;CAAA"}
1
+ {"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,4DAAyD;AACzD,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AAEzC,SAAsB,yBAAyB,CAAC,IAAa;;QAC3D,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACvE,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,IAAI,uCAAuC;YACnD,CAAC,CAAC,MAAM,IAAI,0BAA0B,CACzC,CAAC;QACF,IAAI,CAAC,mBAAmB;YAAE,OAAO;QAEjC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,4DAA4D;SACpE,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;YACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;YAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;gBAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;SACJ;aAAM;YACL,eAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC,CAAC;SAC/D;IACH,CAAC;CAAA;AAxBD,8DAwBC;AAED,SAAsB,uBAAuB;;QAC3C,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,kDAAkD;aAC1D,CAAC,CAAC;YACH,OAAO;SACR;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;QAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAnBD,0DAmBC;AAED,SAAe,sBAAsB;;QACnC,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,oEAAoE;gBAC7E,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,8EAA8E;qBACrF;oBACD;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,OAAO,EAAE,KAAY;aACtB;SACF,CAAC;aACD,IAAI,CAAC,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IACjE,CAAC;CAAA"}
package/src/command-line/daemon.js CHANGED
@@ -2,11 +2,11 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.daemonHandler = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const tmp_dir_1 = require("../core/project-graph/daemon/tmp-dir");
5
+ const tmp_dir_1 = require("../daemon/tmp-dir");
6
6
  const output_1 = require("../utils/output");
7
7
  function daemonHandler(args) {
8
8
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
- const { startInBackground, startInCurrentProcess } = yield Promise.resolve().then(() => require('../core/project-graph/daemon/client/client'));
9
+ const { startInBackground, startInCurrentProcess } = yield Promise.resolve().then(() => require('../daemon/client/client'));
10
10
  if (!args.background) {
11
11
  return startInCurrentProcess();
12
12
  }
package/src/command-line/daemon.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"daemon.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/daemon.ts"],"names":[],"mappings":";;;;AACA,kEAA8E;AAC9E,4CAAyC;AAEzC,SAAsB,aAAa,CAAC,IAAe;;QACjD,MAAM,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,GAAG,2CACnD,4CAA4C,EAC7C,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,qBAAqB,EAAE,CAAC;SAChC;QACD,MAAM,GAAG,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACtC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,oDAAoD;YAC3D,SAAS,EAAE;gBACT,GAAG,eAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,OAAO,GAAG,GAAG,eAAM,CAAC,GAAG,CACpE,sBAAsB,CACvB,IAAI,gCAAsB,IAAI;aAChC;SACF,CAAC,CAAC;IACL,CAAC;CAAA;AAhBD,sCAgBC"}
1
+ {"version":3,"file":"daemon.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/daemon.ts"],"names":[],"mappings":";;;;AACA,+CAA2D;AAC3D,4CAAyC;AAEzC,SAAsB,aAAa,CAAC,IAAe;;QACjD,MAAM,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,GAAG,2CACnD,yBAAyB,EAC1B,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,qBAAqB,EAAE,CAAC;SAChC;QACD,MAAM,GAAG,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACtC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,oDAAoD;YAC3D,SAAS,EAAE;gBACT,GAAG,eAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,OAAO,GAAG,GAAG,eAAM,CAAC,GAAG,CACpE,sBAAsB,CACvB,IAAI,gCAAsB,IAAI;aAChC;SACF,CAAC,CAAC;IACL,CAAC;CAAA;AAhBD,sCAgBC"}
package/src/command-line/dep-graph.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ProjectGraphDependency, ProjectGraphProjectNode } from 'nx/src/shared/project-graph';
1
+ import { ProjectGraphDependency, ProjectGraphProjectNode } from '../config/project-graph';
2
2
  export interface DepGraphClientResponse {
3
3
  hash: string;
4
4
  projects: ProjectGraphProjectNode[];
package/src/command-line/dep-graph.js CHANGED
@@ -13,13 +13,13 @@ const open = require("open");
13
13
  const path_1 = require("path");
14
14
  const perf_hooks_1 = require("perf_hooks");
15
15
  const url_1 = require("url");
16
- const file_utils_1 = require("../core/file-utils");
17
- const file_hasher_1 = require("../core/hasher/file-hasher");
16
+ const file_utils_1 = require("../project-graph/file-utils");
17
+ const file_hasher_1 = require("../hasher/file-hasher");
18
18
  const output_1 = require("../utils/output");
19
- const fileutils_1 = require("nx/src/utils/fileutils");
20
- const path_2 = require("nx/src/utils/path");
21
- const operators_1 = require("nx/src/core/project-graph/operators");
22
- const project_graph_1 = require("nx/src/core/project-graph/project-graph");
19
+ const fileutils_1 = require("../utils/fileutils");
20
+ const path_2 = require("../utils/path");
21
+ const operators_1 = require("../project-graph/operators");
22
+ const project_graph_1 = require("../project-graph/project-graph");
23
23
  // maps file extention to MIME types
24
24
  const mimeType = {
25
25
  '.ico': 'image/x-icon',
@@ -351,7 +351,7 @@ function createDepGraphClientResponse(affected = []) {
351
351
  data: {
352
352
  tags: project.data.tags,
353
353
  root: project.data.root,
354
- files: [],
354
+ files: project.data.files,
355
355
  },
356
356
  }));
357
357
  const dependencies = graph.dependencies;