nx 22.0.0-beta.4 → 22.0.0-beta.6

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 (86) hide show
  1. package/migrations.json +5 -0
  2. package/package.json +11 -11
  3. package/release/changelog-renderer/index.d.ts +1 -0
  4. package/release/changelog-renderer/index.d.ts.map +1 -1
  5. package/release/changelog-renderer/index.js +46 -15
  6. package/schemas/nx-schema.json +165 -10
  7. package/src/command-line/init/implementation/angular/index.d.ts.map +1 -1
  8. package/src/command-line/init/implementation/angular/index.js +4 -6
  9. package/src/command-line/migrate/migrate.d.ts.map +1 -1
  10. package/src/command-line/migrate/migrate.js +25 -12
  11. package/src/command-line/nx-commands.js +1 -1
  12. package/src/command-line/release/changelog.d.ts.map +1 -1
  13. package/src/command-line/release/changelog.js +18 -18
  14. package/src/command-line/release/config/config.d.ts +6 -2
  15. package/src/command-line/release/config/config.d.ts.map +1 -1
  16. package/src/command-line/release/config/config.js +119 -70
  17. package/src/command-line/release/utils/git.d.ts +2 -2
  18. package/src/command-line/release/utils/git.d.ts.map +1 -1
  19. package/src/command-line/release/utils/git.js +5 -5
  20. package/src/command-line/release/utils/release-graph.d.ts +1 -1
  21. package/src/command-line/release/utils/release-graph.d.ts.map +1 -1
  22. package/src/command-line/release/utils/release-graph.js +6 -6
  23. package/src/command-line/release/utils/shared.js +11 -11
  24. package/src/command-line/release/version/release-group-processor.d.ts.map +1 -1
  25. package/src/command-line/release/version/release-group-processor.js +9 -1
  26. package/src/config/nx-json.d.ts +129 -70
  27. package/src/config/nx-json.d.ts.map +1 -1
  28. package/src/core/graph/main.js +1 -1
  29. package/src/daemon/client/client.d.ts +4 -0
  30. package/src/daemon/client/client.d.ts.map +1 -1
  31. package/src/daemon/client/client.js +23 -0
  32. package/src/daemon/message-types/register-project-graph-listener.d.ts +6 -0
  33. package/src/daemon/message-types/register-project-graph-listener.d.ts.map +1 -0
  34. package/src/daemon/message-types/register-project-graph-listener.js +11 -0
  35. package/src/daemon/server/project-graph-incremental-recomputation.d.ts +3 -1
  36. package/src/daemon/server/project-graph-incremental-recomputation.d.ts.map +1 -1
  37. package/src/daemon/server/project-graph-incremental-recomputation.js +13 -5
  38. package/src/daemon/server/project-graph-listener-sockets.d.ts +8 -0
  39. package/src/daemon/server/project-graph-listener-sockets.d.ts.map +1 -0
  40. package/src/daemon/server/project-graph-listener-sockets.js +24 -0
  41. package/src/daemon/server/server.d.ts.map +1 -1
  42. package/src/daemon/server/server.js +9 -2
  43. package/src/devkit-internals.d.ts +1 -0
  44. package/src/devkit-internals.d.ts.map +1 -1
  45. package/src/devkit-internals.js +3 -1
  46. package/src/migrations/update-22-0-0/consolidate-release-tag-config.d.ts +3 -0
  47. package/src/migrations/update-22-0-0/consolidate-release-tag-config.d.ts.map +1 -0
  48. package/src/migrations/update-22-0-0/consolidate-release-tag-config.js +100 -0
  49. package/src/native/nx.wasm32-wasi.wasm +0 -0
  50. package/src/plugins/js/lock-file/lock-file.d.ts.map +1 -1
  51. package/src/plugins/js/lock-file/lock-file.js +1 -1
  52. package/src/plugins/js/lock-file/pnpm-parser.d.ts +1 -1
  53. package/src/plugins/js/lock-file/pnpm-parser.d.ts.map +1 -1
  54. package/src/plugins/js/lock-file/pnpm-parser.js +12 -4
  55. package/src/plugins/js/lock-file/project-graph-pruning.d.ts +2 -2
  56. package/src/plugins/js/lock-file/project-graph-pruning.d.ts.map +1 -1
  57. package/src/plugins/js/lock-file/project-graph-pruning.js +22 -9
  58. package/src/plugins/js/package-json/create-package-json.d.ts.map +1 -1
  59. package/src/plugins/js/package-json/create-package-json.js +17 -5
  60. package/src/tasks-runner/is-tui-enabled.d.ts.map +1 -1
  61. package/src/tasks-runner/is-tui-enabled.js +0 -1
  62. package/src/tasks-runner/run-command.d.ts.map +1 -1
  63. package/src/tasks-runner/run-command.js +3 -0
  64. package/src/utils/catalog/index.d.ts +10 -0
  65. package/src/utils/catalog/index.d.ts.map +1 -0
  66. package/src/utils/catalog/index.js +38 -0
  67. package/src/utils/catalog/manager-factory.d.ts +6 -0
  68. package/src/utils/catalog/manager-factory.d.ts.map +1 -0
  69. package/src/utils/catalog/manager-factory.js +17 -0
  70. package/src/utils/catalog/manager.d.ts +40 -0
  71. package/src/utils/catalog/manager.d.ts.map +1 -0
  72. package/src/utils/catalog/manager.js +2 -0
  73. package/src/utils/catalog/pnpm-manager.d.ts +22 -0
  74. package/src/utils/catalog/pnpm-manager.d.ts.map +1 -0
  75. package/src/utils/catalog/pnpm-manager.js +257 -0
  76. package/src/utils/catalog/types.d.ts +5 -0
  77. package/src/utils/catalog/types.d.ts.map +1 -0
  78. package/src/utils/catalog/types.js +2 -0
  79. package/src/utils/package-json.d.ts +79 -0
  80. package/src/utils/package-json.d.ts.map +1 -1
  81. package/src/utils/package-json.js +81 -2
  82. package/src/utils/package-manager.d.ts.map +1 -1
  83. package/src/utils/package-manager.js +24 -9
  84. package/src/utils/pnpm-workspace.d.ts +9 -0
  85. package/src/utils/pnpm-workspace.d.ts.map +1 -0
  86. package/src/utils/pnpm-workspace.js +2 -0
@@ -43,6 +43,10 @@ export declare class DaemonClient {
43
43
  changedProjects: string[];
44
44
  changedFiles: ChangedFile[];
45
45
  } | null) => void): Promise<UnregisterCallback>;
46
+ registerProjectGraphRecomputationListener(callback: (error: Error | null | 'closed', data: {
47
+ projectGraph: ProjectGraph;
48
+ sourceMaps: ConfigurationSourceMaps;
49
+ } | null) => void): Promise<UnregisterCallback>;
46
50
  processInBackground(requirePath: string, data: any): Promise<any>;
47
51
  recordOutputsHash(outputs: string[], hash: string): Promise<any>;
48
52
  outputsHashesMatch(outputs: string[], hash: string): Promise<any>;
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
@@ -31,6 +31,7 @@ const update_workspace_context_1 = require("../message-types/update-workspace-co
31
31
  const flush_sync_generator_changes_to_disk_1 = require("../message-types/flush-sync-generator-changes-to-disk");
32
32
  const delayed_spinner_1 = require("../../utils/delayed-spinner");
33
33
  const run_tasks_execution_hooks_1 = require("../message-types/run-tasks-execution-hooks");
34
+ const register_project_graph_listener_1 = require("../message-types/register-project-graph-listener");
34
35
  const DAEMON_ENV_SETTINGS = {
35
36
  NX_PROJECT_GLOB_CACHE: 'false',
36
37
  NX_CACHE_PROJECTS_CONFIG: 'false',
@@ -184,6 +185,28 @@ class DaemonClient {
184
185
  messenger?.close();
185
186
  };
186
187
  }
188
+ async registerProjectGraphRecomputationListener(callback) {
189
+ let messenger;
190
+ await this.queue.sendToQueue(() => {
191
+ messenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)((0, socket_utils_1.getFullOsSocketPath)())).listen((message) => {
192
+ try {
193
+ const parsedMessage = JSON.parse(message);
194
+ callback(null, parsedMessage);
195
+ }
196
+ catch (e) {
197
+ callback(e, null);
198
+ }
199
+ }, () => {
200
+ callback('closed', null);
201
+ }, (err) => callback(err, null));
202
+ return messenger.sendMessage({
203
+ type: register_project_graph_listener_1.REGISTER_PROJECT_GRAPH_LISTENER,
204
+ });
205
+ });
206
+ return () => {
207
+ messenger?.close();
208
+ };
209
+ }
187
210
  processInBackground(requirePath, data) {
188
211
  return this.sendToDaemonViaQueue({
189
212
  type: 'PROCESS_IN_BACKGROUND',
@@ -0,0 +1,6 @@
1
+ export declare const REGISTER_PROJECT_GRAPH_LISTENER = "REGISTER_PROJECT_GRAPH_LISTENER";
2
+ export type RegisterProjectGraphListenerMessage = {
3
+ type: typeof REGISTER_PROJECT_GRAPH_LISTENER;
4
+ };
5
+ export declare function isRegisterProjectGraphListenerMessage(message: unknown): message is RegisterProjectGraphListenerMessage;
6
+ //# sourceMappingURL=register-project-graph-listener.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"register-project-graph-listener.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/message-types/register-project-graph-listener.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,+BAA+B,oCACT,CAAC;AAEpC,MAAM,MAAM,mCAAmC,GAAG;IAChD,IAAI,EAAE,OAAO,+BAA+B,CAAC;CAC9C,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,OAAO,EAAE,OAAO,GACf,OAAO,IAAI,mCAAmC,CAOhD"}
@@ -0,0 +1,11 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.REGISTER_PROJECT_GRAPH_LISTENER = void 0;
4
+ exports.isRegisterProjectGraphListenerMessage = isRegisterProjectGraphListenerMessage;
5
+ exports.REGISTER_PROJECT_GRAPH_LISTENER = 'REGISTER_PROJECT_GRAPH_LISTENER';
6
+ function isRegisterProjectGraphListenerMessage(message) {
7
+ return (typeof message === 'object' &&
8
+ message !== null &&
9
+ 'type' in message &&
10
+ message['type'] === exports.REGISTER_PROJECT_GRAPH_LISTENER);
11
+ }
@@ -1,6 +1,7 @@
1
1
  import { FileData, FileMap, ProjectGraph } from '../../config/project-graph';
2
2
  import { FileMapCache } from '../../project-graph/nx-deps-cache';
3
3
  import { NxWorkspaceFilesExternals } from '../../native';
4
+ import { ConfigurationSourceMaps } from '../../project-graph/utils/project-configuration-utils';
4
5
  interface SerializedProjectGraph {
5
6
  error: Error | null;
6
7
  projectGraph: ProjectGraph | null;
@@ -9,6 +10,7 @@ interface SerializedProjectGraph {
9
10
  allWorkspaceFiles: FileData[] | null;
10
11
  serializedProjectGraph: string | null;
11
12
  serializedSourceMaps: string | null;
13
+ sourceMaps: ConfigurationSourceMaps | null;
12
14
  rustReferences: NxWorkspaceFilesExternals | null;
13
15
  }
14
16
  export declare let fileMapWithFiles: {
@@ -20,6 +22,6 @@ export declare let currentProjectFileMapCache: FileMapCache | undefined;
20
22
  export declare let currentProjectGraph: ProjectGraph | undefined;
21
23
  export declare function getCachedSerializedProjectGraphPromise(): Promise<SerializedProjectGraph>;
22
24
  export declare function addUpdatedAndDeletedFiles(createdFiles: string[], updatedFiles: string[], deletedFiles: string[]): void;
23
- export declare function registerProjectGraphRecomputationListener(listener: (projectGraph: ProjectGraph) => void): void;
25
+ export declare function registerProjectGraphRecomputationListener(listener: (projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps) => void): void;
24
26
  export {};
25
27
  //# sourceMappingURL=project-graph-incremental-recomputation.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"project-graph-incremental-recomputation.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,OAAO,EACP,YAAY,EAEb,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,YAAY,EAIb,MAAM,mCAAmC,CAAC;AAa3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAUzD,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,mBAAmB,EAAE,YAAY,GAAG,IAAI,CAAC;IACzC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,iBAAiB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACrC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,cAAc,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAClD;AAGD,eAAO,IAAI,gBAAgB,EACvB;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,QAAQ,EAAE,CAAC;IAC9B,cAAc,EAAE,yBAAyB,CAAC;CAC3C,GACD,SAAS,CAAC;AACd,eAAO,IAAI,0BAA0B,EAAE,YAAY,GAAG,SAAS,CAAC;AAChE,eAAO,IAAI,mBAAmB,EAAE,YAAY,GAAG,SAAS,CAAC;AAYzD,wBAAsB,sCAAsC,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAoD9F;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,QAsCvB;AAED,wBAAgB,yCAAyC,CACvD,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI,QAG/C"}
1
+ {"version":3,"file":"project-graph-incremental-recomputation.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,OAAO,EACP,YAAY,EAEb,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,YAAY,EAIb,MAAM,mCAAmC,CAAC;AAc3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAEL,uBAAuB,EACxB,MAAM,uDAAuD,CAAC;AAS/D,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,mBAAmB,EAAE,YAAY,GAAG,IAAI,CAAC;IACzC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,iBAAiB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACrC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,uBAAuB,GAAG,IAAI,CAAC;IAC3C,cAAc,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAClD;AAGD,eAAO,IAAI,gBAAgB,EACvB;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,QAAQ,EAAE,CAAC;IAC9B,cAAc,EAAE,yBAAyB,CAAC;CAC3C,GACD,SAAS,CAAC;AACd,eAAO,IAAI,0BAA0B,EAAE,YAAY,GAAG,SAAS,CAAC;AAChE,eAAO,IAAI,mBAAmB,EAAE,YAAY,GAAG,SAAS,CAAC;AAYzD,wBAAsB,sCAAsC,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAwD9F;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,QAuCvB;AAED,wBAAgB,yCAAyC,CACvD,QAAQ,EAAE,CACR,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,uBAAuB,KAChC,IAAI,QAGV"}
@@ -15,6 +15,7 @@ const fileutils_1 = require("../../utils/fileutils");
15
15
  const workspace_context_1 = require("../../utils/workspace-context");
16
16
  const workspace_root_1 = require("../../utils/workspace-root");
17
17
  const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
18
+ const project_graph_listener_sockets_1 = require("./project-graph-listener-sockets");
18
19
  const logger_1 = require("./logger");
19
20
  const error_types_1 = require("../../project-graph/error-types");
20
21
  const get_plugins_1 = require("../../project-graph/plugins/get-plugins");
@@ -56,7 +57,7 @@ async function getCachedSerializedProjectGraphPromise() {
56
57
  }
57
58
  const result = await cachedSerializedProjectGraphPromise;
58
59
  if (wasScheduled) {
59
- notifyProjectGraphRecomputationListeners(result.projectGraph);
60
+ notifyProjectGraphRecomputationListeners(result.projectGraph, result.sourceMaps);
60
61
  }
61
62
  return result;
62
63
  }
@@ -65,6 +66,7 @@ async function getCachedSerializedProjectGraphPromise() {
65
66
  error: e,
66
67
  serializedProjectGraph: null,
67
68
  serializedSourceMaps: null,
69
+ sourceMaps: null,
68
70
  projectGraph: null,
69
71
  projectFileMapCache: null,
70
72
  fileMap: null,
@@ -96,11 +98,11 @@ function addUpdatedAndDeletedFiles(createdFiles, updatedFiles, deletedFiles) {
96
98
  }
97
99
  cachedSerializedProjectGraphPromise =
98
100
  processFilesAndCreateAndSerializeProjectGraph(await (0, get_plugins_1.getPlugins)());
99
- const { projectGraph } = await cachedSerializedProjectGraphPromise;
101
+ const { projectGraph, sourceMaps } = await cachedSerializedProjectGraphPromise;
100
102
  if (createdFiles.length > 0) {
101
103
  (0, file_watcher_sockets_1.notifyFileWatcherSockets)(createdFiles, null, null);
102
104
  }
103
- notifyProjectGraphRecomputationListeners(projectGraph);
105
+ notifyProjectGraphRecomputationListeners(projectGraph, sourceMaps);
104
106
  }, waitPeriod);
105
107
  }
106
108
  }
@@ -191,6 +193,7 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
191
193
  allWorkspaceFiles: null,
192
194
  serializedProjectGraph: null,
193
195
  serializedSourceMaps: null,
196
+ sourceMaps: null,
194
197
  };
195
198
  }
196
199
  }
@@ -205,6 +208,7 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
205
208
  allWorkspaceFiles: null,
206
209
  serializedProjectGraph: null,
207
210
  serializedSourceMaps: null,
211
+ sourceMaps: null,
208
212
  };
209
213
  }
210
214
  else {
@@ -221,6 +225,7 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
221
225
  allWorkspaceFiles: null,
222
226
  serializedProjectGraph: null,
223
227
  serializedSourceMaps: null,
228
+ sourceMaps: null,
224
229
  };
225
230
  }
226
231
  }
@@ -261,6 +266,7 @@ async function createAndSerializeProjectGraph({ projects, sourceMaps, }) {
261
266
  allWorkspaceFiles,
262
267
  serializedProjectGraph,
263
268
  serializedSourceMaps,
269
+ sourceMaps,
264
270
  rustReferences,
265
271
  };
266
272
  }
@@ -274,6 +280,7 @@ async function createAndSerializeProjectGraph({ projects, sourceMaps, }) {
274
280
  allWorkspaceFiles: null,
275
281
  serializedProjectGraph: null,
276
282
  serializedSourceMaps: null,
283
+ sourceMaps: null,
277
284
  rustReferences: null,
278
285
  };
279
286
  }
@@ -298,8 +305,9 @@ async function resetInternalStateIfNxDepsMissing() {
298
305
  await resetInternalState();
299
306
  }
300
307
  }
301
- function notifyProjectGraphRecomputationListeners(projectGraph) {
308
+ function notifyProjectGraphRecomputationListeners(projectGraph, sourceMaps) {
302
309
  for (const listener of projectGraphRecomputationListeners) {
303
- listener(projectGraph);
310
+ listener(projectGraph, sourceMaps);
304
311
  }
312
+ (0, project_graph_listener_sockets_1.notifyProjectGraphListenerSockets)(projectGraph, sourceMaps);
305
313
  }
@@ -0,0 +1,8 @@
1
+ import { Socket } from 'net';
2
+ import { ProjectGraph } from '../../config/project-graph';
3
+ import { ConfigurationSourceMaps } from '../../project-graph/utils/project-configuration-utils';
4
+ export declare let registeredProjectGraphListenerSockets: Socket[];
5
+ export declare function removeRegisteredProjectGraphListenerSocket(socket: Socket): void;
6
+ export declare function hasRegisteredProjectGraphListenerSockets(): boolean;
7
+ export declare function notifyProjectGraphListenerSockets(projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps): Promise<void>;
8
+ //# sourceMappingURL=project-graph-listener-sockets.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"project-graph-listener-sockets.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-listener-sockets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uDAAuD,CAAC;AAGhG,eAAO,IAAI,qCAAqC,EAAE,MAAM,EAAO,CAAC;AAEhE,wBAAgB,0CAA0C,CAAC,MAAM,EAAE,MAAM,QAGxE;AAED,wBAAgB,wCAAwC,YAEvD;AAED,wBAAsB,iCAAiC,CACrD,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,uBAAuB,iBAgBpC"}
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.registeredProjectGraphListenerSockets = void 0;
4
+ exports.removeRegisteredProjectGraphListenerSocket = removeRegisteredProjectGraphListenerSocket;
5
+ exports.hasRegisteredProjectGraphListenerSockets = hasRegisteredProjectGraphListenerSockets;
6
+ exports.notifyProjectGraphListenerSockets = notifyProjectGraphListenerSockets;
7
+ const server_1 = require("./server");
8
+ exports.registeredProjectGraphListenerSockets = [];
9
+ function removeRegisteredProjectGraphListenerSocket(socket) {
10
+ exports.registeredProjectGraphListenerSockets =
11
+ exports.registeredProjectGraphListenerSockets.filter((s) => s !== socket);
12
+ }
13
+ function hasRegisteredProjectGraphListenerSockets() {
14
+ return exports.registeredProjectGraphListenerSockets.length > 0;
15
+ }
16
+ async function notifyProjectGraphListenerSockets(projectGraph, sourceMaps) {
17
+ if (!hasRegisteredProjectGraphListenerSockets()) {
18
+ return;
19
+ }
20
+ await Promise.all(exports.registeredProjectGraphListenerSockets.map((socket) => (0, server_1.handleResult)(socket, 'PROJECT_GRAPH_UPDATED', () => Promise.resolve({
21
+ description: 'Project graph updated',
22
+ response: JSON.stringify({ projectGraph, sourceMaps }),
23
+ }))));
24
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAyInD,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,CAAa,CAAC;AAsLlD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,iBAqBnC;AAiMD,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAgEnD"}
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAkJnD,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,CAAa,CAAC;AAyLlD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,iBAqBnC;AAoMD,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAgEnD"}
@@ -17,6 +17,7 @@ const workspace_root_1 = require("../../utils/workspace-root");
17
17
  const cache_1 = require("../cache");
18
18
  const socket_utils_1 = require("../socket-utils");
19
19
  const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
20
+ const project_graph_listener_sockets_1 = require("./project-graph-listener-sockets");
20
21
  const handle_hash_tasks_1 = require("./handle-hash-tasks");
21
22
  const handle_outputs_tracking_1 = require("./handle-outputs-tracking");
22
23
  const handle_process_in_background_1 = require("./handle-process-in-background");
@@ -52,6 +53,7 @@ const flush_sync_generator_changes_to_disk_1 = require("../message-types/flush-s
52
53
  const handle_flush_sync_generator_changes_to_disk_1 = require("./handle-flush-sync-generator-changes-to-disk");
53
54
  const run_tasks_execution_hooks_1 = require("../message-types/run-tasks-execution-hooks");
54
55
  const handle_tasks_execution_hooks_1 = require("./handle-tasks-execution-hooks");
56
+ const register_project_graph_listener_1 = require("../message-types/register-project-graph-listener");
55
57
  let performanceObserver;
56
58
  let workspaceWatcherError;
57
59
  let outputsWatcherError;
@@ -82,6 +84,7 @@ const server = (0, net_1.createServer)(async (socket) => {
82
84
  exports.openSockets.delete(socket);
83
85
  logger_1.serverLogger.log(`Closed a connection. Number of open connections: ${numberOfOpenConnections}`);
84
86
  (0, file_watcher_sockets_1.removeRegisteredFileWatcherSocket)(socket);
87
+ (0, project_graph_listener_sockets_1.removeRegisteredProjectGraphListenerSocket)(socket);
85
88
  });
86
89
  });
87
90
  registerProcessTerminationListeners();
@@ -126,6 +129,9 @@ async function handleMessage(socket, data) {
126
129
  else if (payload.type === 'REGISTER_FILE_WATCHER') {
127
130
  file_watcher_sockets_1.registeredFileWatcherSockets.push({ socket, config: payload.config });
128
131
  }
132
+ else if ((0, register_project_graph_listener_1.isRegisterProjectGraphListenerMessage)(payload)) {
133
+ project_graph_listener_sockets_1.registeredProjectGraphListenerSockets.push(socket);
134
+ }
129
135
  else if ((0, glob_1.isHandleGlobMessage)(payload)) {
130
136
  await handleResult(socket, glob_1.GLOB, () => (0, handle_glob_1.handleGlob)(payload.globs, payload.exclude));
131
137
  }
@@ -201,8 +207,9 @@ async function handleResult(socket, type, hrFn) {
201
207
  logger_1.serverLogger.log(`Handled ${type}. Handling time: ${doneHandlingMark.getTime() - startMark.getTime()}. Response time: ${endMark.getTime() - doneHandlingMark.getTime()}.`);
202
208
  }
203
209
  function handleInactivityTimeout() {
204
- if ((0, file_watcher_sockets_1.hasRegisteredFileWatcherSockets)()) {
205
- logger_1.serverLogger.log(`There are open file watchers. Resetting inactivity timer.`);
210
+ if ((0, file_watcher_sockets_1.hasRegisteredFileWatcherSockets)() ||
211
+ (0, project_graph_listener_sockets_1.hasRegisteredProjectGraphListenerSockets)()) {
212
+ logger_1.serverLogger.log(`There are open file watchers or project graph listeners. Resetting inactivity timer.`);
206
213
  (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
207
214
  }
208
215
  else {
@@ -27,4 +27,5 @@ export { registerTsProject } from './plugins/js/utils/register';
27
27
  export { interpolate } from './tasks-runner/utils';
28
28
  export { isCI } from './utils/is-ci';
29
29
  export { isUsingPrettierInTree } from './utils/is-using-prettier';
30
+ export { readYamlFile } from './utils/fileutils';
30
31
  //# sourceMappingURL=devkit-internals.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC"}
1
+ {"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
3
+ exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  /**
6
6
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -59,3 +59,5 @@ var is_ci_1 = require("./utils/is-ci");
59
59
  Object.defineProperty(exports, "isCI", { enumerable: true, get: function () { return is_ci_1.isCI; } });
60
60
  var is_using_prettier_1 = require("./utils/is-using-prettier");
61
61
  Object.defineProperty(exports, "isUsingPrettierInTree", { enumerable: true, get: function () { return is_using_prettier_1.isUsingPrettierInTree; } });
62
+ var fileutils_1 = require("./utils/fileutils");
63
+ Object.defineProperty(exports, "readYamlFile", { enumerable: true, get: function () { return fileutils_1.readYamlFile; } });
@@ -0,0 +1,3 @@
1
+ import type { Tree } from '../../generators/tree';
2
+ export default function update(tree: Tree): Promise<void>;
3
+ //# sourceMappingURL=consolidate-release-tag-config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"consolidate-release-tag-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-22-0-0/consolidate-release-tag-config.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAKlD,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,iBA2G9C"}
@@ -0,0 +1,100 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.default = update;
4
+ const node_path_1 = require("node:path");
5
+ const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
6
+ const json_1 = require("../../generators/utils/json");
7
+ const nx_json_1 = require("../../generators/utils/nx-json");
8
+ const project_configuration_1 = require("../../generators/utils/project-configuration");
9
+ async function update(tree) {
10
+ const nxJson = (0, nx_json_1.readNxJson)(tree);
11
+ if (!nxJson) {
12
+ return;
13
+ }
14
+ function migrateReleaseTagConfig(config) {
15
+ if (!config) {
16
+ return;
17
+ }
18
+ // Check if any of the old properties exist
19
+ const hasOldProperties = 'releaseTagPattern' in config ||
20
+ 'releaseTagPatternCheckAllBranchesWhen' in config ||
21
+ 'releaseTagPatternRequireSemver' in config ||
22
+ 'releaseTagPatternPreferDockerVersion' in config ||
23
+ 'releaseTagPatternStrictPreid' in config;
24
+ if (!hasOldProperties) {
25
+ return;
26
+ }
27
+ // Create the new nested releaseTag object if it doesn't exist
28
+ if (!config.releaseTag) {
29
+ config.releaseTag = {};
30
+ }
31
+ // Migrate each property to the nested structure
32
+ // Only migrate if the new property doesn't already exist (new format takes precedence)
33
+ if ('releaseTagPattern' in config) {
34
+ if (!('pattern' in config.releaseTag)) {
35
+ config.releaseTag.pattern = config.releaseTagPattern;
36
+ }
37
+ delete config.releaseTagPattern;
38
+ }
39
+ if ('releaseTagPatternCheckAllBranchesWhen' in config) {
40
+ if (!('checkAllBranchesWhen' in config.releaseTag)) {
41
+ config.releaseTag.checkAllBranchesWhen =
42
+ config.releaseTagPatternCheckAllBranchesWhen;
43
+ }
44
+ delete config.releaseTagPatternCheckAllBranchesWhen;
45
+ }
46
+ if ('releaseTagPatternRequireSemver' in config) {
47
+ if (!('requireSemver' in config.releaseTag)) {
48
+ config.releaseTag.requireSemver = config.releaseTagPatternRequireSemver;
49
+ }
50
+ delete config.releaseTagPatternRequireSemver;
51
+ }
52
+ if ('releaseTagPatternPreferDockerVersion' in config) {
53
+ if (!('preferDockerVersion' in config.releaseTag)) {
54
+ config.releaseTag.preferDockerVersion =
55
+ config.releaseTagPatternPreferDockerVersion;
56
+ }
57
+ delete config.releaseTagPatternPreferDockerVersion;
58
+ }
59
+ if ('releaseTagPatternStrictPreid' in config) {
60
+ if (!('strictPreid' in config.releaseTag)) {
61
+ config.releaseTag.strictPreid = config.releaseTagPatternStrictPreid;
62
+ }
63
+ delete config.releaseTagPatternStrictPreid;
64
+ }
65
+ }
66
+ // Migrate top-level release configuration in nx.json
67
+ if (nxJson.release) {
68
+ migrateReleaseTagConfig(nxJson.release);
69
+ // Migrate release groups configuration
70
+ if (nxJson.release.groups) {
71
+ for (const group of Object.values(nxJson.release.groups)) {
72
+ migrateReleaseTagConfig(group);
73
+ }
74
+ }
75
+ }
76
+ // Migrate project-level configuration in project.json and package.json
77
+ const projects = (0, project_configuration_1.getProjects)(tree);
78
+ for (const project of projects.values()) {
79
+ // Check project.json
80
+ const projectJsonPath = (0, node_path_1.join)(project.root, 'project.json');
81
+ if (tree.exists(projectJsonPath)) {
82
+ const projectJson = (0, json_1.readJson)(tree, projectJsonPath);
83
+ if (projectJson.release) {
84
+ migrateReleaseTagConfig(projectJson.release);
85
+ (0, json_1.writeJson)(tree, projectJsonPath, projectJson);
86
+ }
87
+ }
88
+ // Check package.json
89
+ const packageJsonPath = (0, node_path_1.join)(project.root, 'package.json');
90
+ if (tree.exists(packageJsonPath)) {
91
+ const packageJson = (0, json_1.readJson)(tree, packageJsonPath);
92
+ if (packageJson.nx?.release) {
93
+ migrateReleaseTagConfig(packageJson.nx.release);
94
+ (0, json_1.writeJson)(tree, packageJsonPath, packageJson);
95
+ }
96
+ }
97
+ }
98
+ (0, nx_json_1.updateNxJson)(tree, nxJson);
99
+ await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
100
+ }
Binary file
@@ -1 +1 @@
1
- {"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/lock-file.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EACL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,cAAc,EACf,MAAM,gCAAgC,CAAC;AA8BxC,eAAO,MAAM,SAAS,UAMrB,CAAC;AAQF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAqC1C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,yBAAyB,GACjC,yBAAyB,EAAE,CA8B7B;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBtE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAiBtE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAgCtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,cAAoD,GACnE,MAAM,CA8CR"}
1
+ {"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/lock-file.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EACL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,cAAc,EACf,MAAM,gCAAgC,CAAC;AA8BxC,eAAO,MAAM,SAAS,UAMrB,CAAC;AAQF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAqC1C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,yBAAyB,GACjC,yBAAyB,EAAE,CA8B7B;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBtE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAiBtE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAgCtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,cAAoD,GACnE,MAAM,CAmDR"}
@@ -204,7 +204,7 @@ function createLockFile(packageJson, graph, packageManager = (0, package_manager
204
204
  }
205
205
  if (packageManager === 'pnpm') {
206
206
  const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);
207
- return (0, pnpm_parser_1.stringifyPnpmLockfile)(prunedGraph, content, normalizedPackageJson);
207
+ return (0, pnpm_parser_1.stringifyPnpmLockfile)(prunedGraph, content, normalizedPackageJson, workspace_root_1.workspaceRoot);
208
208
  }
209
209
  if (packageManager === 'npm') {
210
210
  const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);
@@ -4,5 +4,5 @@ import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-
4
4
  import { CreateDependenciesContext } from '../../../project-graph/plugins';
5
5
  export declare function getPnpmLockfileNodes(lockFileContent: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
6
6
  export declare function getPnpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
7
- export declare function stringifyPnpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson): string;
7
+ export declare function stringifyPnpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson, workspaceRoot: string): string;
8
8
  //# sourceMappingURL=pnpm-parser.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA0B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CA8BR"}
1
+ {"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA2B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAqCR"}
@@ -9,6 +9,7 @@ const object_sort_1 = require("../../../utils/object-sort");
9
9
  const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
10
10
  const project_graph_1 = require("../../../config/project-graph");
11
11
  const file_hasher_1 = require("../../../hasher/file-hasher");
12
+ const catalog_1 = require("../../../utils/catalog");
12
13
  const project_graph_pruning_1 = require("./project-graph-pruning");
13
14
  const path_1 = require("path");
14
15
  const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
@@ -278,10 +279,10 @@ function getDependencies(data, keyMap, isV5, ctx) {
278
279
  function parseBaseVersion(rawVersion, isV5) {
279
280
  return isV5 ? rawVersion.split('_')[0] : rawVersion.split('(')[0];
280
281
  }
281
- function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson) {
282
+ function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson, workspaceRoot) {
282
283
  const data = (0, pnpm_normalizer_1.parseAndNormalizePnpmLockfile)(rootLockFileContent);
283
284
  const { lockfileVersion, packages, importers } = data;
284
- const { snapshot: rootSnapshot, importers: requiredImporters } = mapRootSnapshot(packageJson, importers, packages, graph, +lockfileVersion);
285
+ const { snapshot: rootSnapshot, importers: requiredImporters } = mapRootSnapshot(packageJson, importers, packages, graph, +lockfileVersion, workspaceRoot);
285
286
  const snapshots = mapSnapshots(data.packages, graph.externalNodes, +lockfileVersion);
286
287
  const workspaceDependencyImporters = {};
287
288
  for (const [packageName, importerPath] of Object.entries(requiredImporters)) {
@@ -407,7 +408,7 @@ function versionIsAlias(key, versionExpr, lockfileVersion) {
407
408
  ? key.startsWith(`${packageName}/${version}`)
408
409
  : key.startsWith(`${packageName}@${version}`);
409
410
  }
410
- function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVersion) {
411
+ function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVersion, workspaceRoot) {
411
412
  const workspaceModules = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(graph);
412
413
  const snapshot = { specifiers: {} };
413
414
  const importers = {};
@@ -419,7 +420,14 @@ function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVe
419
420
  ].forEach((depType) => {
420
421
  if (packageJson[depType]) {
421
422
  Object.keys(packageJson[depType]).forEach((packageName) => {
422
- const version = packageJson[depType][packageName];
423
+ let version = packageJson[depType][packageName];
424
+ const manager = (0, catalog_1.getCatalogManager)(workspaceRoot);
425
+ if (manager?.isCatalogReference(version)) {
426
+ version = manager.resolveCatalogReference(packageName, version, workspaceRoot);
427
+ if (!version) {
428
+ throw new Error(`Could not resolve catalog reference for package ${packageName}@${version}.`);
429
+ }
430
+ }
423
431
  if (workspaceModules.has(packageName)) {
424
432
  for (const [importerPath, importerSnapshot] of Object.entries(rootImporters)) {
425
433
  const workspaceDep = importerSnapshot.dependencies &&
@@ -1,11 +1,11 @@
1
1
  import { ProjectGraph, ProjectGraphExternalNode, ProjectGraphProjectNode } from '../../../config/project-graph';
2
- import { PackageJson } from '../../../utils/package-json';
3
2
  import { ProjectGraphBuilder } from '../../../project-graph/project-graph-builder';
3
+ import { PackageJson } from '../../../utils/package-json';
4
4
  /**
5
5
  * Prune project graph's external nodes and their dependencies
6
6
  * based on the pruned package.json
7
7
  */
8
- export declare function pruneProjectGraph(graph: ProjectGraph, prunedPackageJson: PackageJson): ProjectGraph;
8
+ export declare function pruneProjectGraph(graph: ProjectGraph, prunedPackageJson: PackageJson, workspaceRootPath?: string): ProjectGraph;
9
9
  export declare function findNodeMatchingVersion(graph: ProjectGraph, packageName: string, versionExpr: string): ProjectGraphExternalNode;
10
10
  export declare function addNodesAndDependencies(graph: ProjectGraph, packageJsonDeps: Record<string, string>, workspacePackages: Map<string, ProjectGraphProjectNode>, builder: ProjectGraphBuilder): void;
11
11
  export declare function rehoistNodes(graph: ProjectGraph, packageJsonDeps: Record<string, string>, builder: ProjectGraphBuilder): void;
@@ -1 +1 @@
1
- {"version":3,"file":"project-graph-pruning.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAInF;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,YAAY,EACnB,iBAAiB,EAAE,WAAW,GAC7B,YAAY,CA0Bd;AAmDD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,4BAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACvD,OAAO,EAAE,mBAAmB,QAgB7B;AA+BD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,mBAAmB,QAiD7B"}
1
+ {"version":3,"file":"project-graph-pruning.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAI1D;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,YAAY,EACnB,iBAAiB,EAAE,WAAW,EAC9B,iBAAiB,GAAE,MAAsB,GACxC,YAAY,CA2Bd;AA0ED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,4BAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACvD,OAAO,EAAE,mBAAmB,QAgB7B;AA+BD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,mBAAmB,QAiD7B"}