nx 22.0.0 → 22.0.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 (89) hide show
  1. package/package.json +12 -12
  2. package/project.json +5 -1
  3. package/src/ai/utils.d.ts.map +1 -1
  4. package/src/ai/utils.js +3 -1
  5. package/src/command-line/init/ai-agent-prompts.d.ts.map +1 -1
  6. package/src/command-line/init/ai-agent-prompts.js +12 -11
  7. package/src/command-line/init/init-v2.d.ts.map +1 -1
  8. package/src/command-line/init/init-v2.js +4 -0
  9. package/src/command-line/release/config/config.d.ts +1 -1
  10. package/src/command-line/release/config/config.d.ts.map +1 -1
  11. package/src/command-line/release/config/config.js +39 -0
  12. package/src/command-line/release/version/release-group-processor.d.ts.map +1 -1
  13. package/src/command-line/release/version/release-group-processor.js +3 -2
  14. package/src/config/nx-json.d.ts +2 -0
  15. package/src/config/nx-json.d.ts.map +1 -1
  16. package/src/core/graph/main.js +1 -1
  17. package/src/daemon/client/client.d.ts.map +1 -1
  18. package/src/daemon/client/client.js +25 -19
  19. package/src/daemon/client/daemon-socket-messenger.d.ts +1 -1
  20. package/src/daemon/client/daemon-socket-messenger.d.ts.map +1 -1
  21. package/src/daemon/client/daemon-socket-messenger.js +5 -3
  22. package/src/daemon/is-v8-serializer-enabled.d.ts +6 -0
  23. package/src/daemon/is-v8-serializer-enabled.d.ts.map +1 -0
  24. package/src/daemon/is-v8-serializer-enabled.js +10 -0
  25. package/src/daemon/server/file-watching/file-watcher-sockets.d.ts.map +1 -1
  26. package/src/daemon/server/file-watching/file-watcher-sockets.js +1 -1
  27. package/src/daemon/server/handle-context-file-data.js +1 -1
  28. package/src/daemon/server/handle-flush-sync-generator-changes-to-disk.js +1 -1
  29. package/src/daemon/server/handle-get-files-in-directory.js +1 -1
  30. package/src/daemon/server/handle-get-registered-sync-generators.js +1 -1
  31. package/src/daemon/server/handle-get-sync-generator-changes.js +1 -1
  32. package/src/daemon/server/handle-glob.js +2 -2
  33. package/src/daemon/server/handle-hash-tasks.d.ts +1 -1
  34. package/src/daemon/server/handle-hash-tasks.d.ts.map +1 -1
  35. package/src/daemon/server/handle-hash-tasks.js +1 -1
  36. package/src/daemon/server/handle-nx-workspace-files.js +1 -1
  37. package/src/daemon/server/handle-outputs-tracking.js +1 -1
  38. package/src/daemon/server/handle-task-history.d.ts +2 -2
  39. package/src/daemon/server/handle-task-history.js +2 -2
  40. package/src/daemon/server/handle-tasks-execution-hooks.d.ts +1 -1
  41. package/src/daemon/server/handle-tasks-execution-hooks.js +1 -1
  42. package/src/daemon/server/project-graph-incremental-recomputation.d.ts.map +1 -1
  43. package/src/daemon/server/project-graph-incremental-recomputation.js +14 -1
  44. package/src/daemon/server/project-graph-listener-sockets.d.ts.map +1 -1
  45. package/src/daemon/server/project-graph-listener-sockets.js +3 -2
  46. package/src/daemon/server/server.d.ts +2 -2
  47. package/src/daemon/server/server.d.ts.map +1 -1
  48. package/src/daemon/server/server.js +49 -28
  49. package/src/daemon/server/shutdown-utils.d.ts.map +1 -1
  50. package/src/daemon/server/shutdown-utils.js +2 -1
  51. package/src/daemon/socket-utils.d.ts +11 -0
  52. package/src/daemon/socket-utils.d.ts.map +1 -1
  53. package/src/daemon/socket-utils.js +41 -0
  54. package/src/devkit-internals.d.ts +1 -0
  55. package/src/devkit-internals.d.ts.map +1 -1
  56. package/src/devkit-internals.js +3 -1
  57. package/src/native/nx.wasm32-wasi.wasm +0 -0
  58. package/src/plugins/js/index.d.ts.map +1 -1
  59. package/src/plugins/js/index.js +34 -20
  60. package/src/plugins/js/lock-file/pnpm-parser.d.ts.map +1 -1
  61. package/src/plugins/js/lock-file/pnpm-parser.js +5 -3
  62. package/src/plugins/js/lock-file/project-graph-pruning.js +1 -1
  63. package/src/project-graph/plugins/isolation/messaging.d.ts.map +1 -1
  64. package/src/project-graph/plugins/isolation/messaging.js +2 -1
  65. package/src/project-graph/plugins/isolation/plugin-pool.js +19 -5
  66. package/src/project-graph/plugins/loaded-nx-plugin.d.ts.map +1 -1
  67. package/src/project-graph/plugins/loaded-nx-plugin.js +2 -0
  68. package/src/project-graph/plugins/resolve-plugin.d.ts.map +1 -1
  69. package/src/project-graph/plugins/resolve-plugin.js +4 -2
  70. package/src/project-graph/utils/project-configuration-utils.d.ts +1 -1
  71. package/src/project-graph/utils/project-configuration-utils.d.ts.map +1 -1
  72. package/src/project-graph/utils/project-configuration-utils.js +7 -4
  73. package/src/tasks-runner/cache.d.ts.map +1 -1
  74. package/src/tasks-runner/cache.js +27 -14
  75. package/src/tasks-runner/fork.js +3 -1
  76. package/src/tasks-runner/is-tui-enabled.d.ts.map +1 -1
  77. package/src/tasks-runner/is-tui-enabled.js +1 -1
  78. package/src/tasks-runner/pseudo-ipc.d.ts.map +1 -1
  79. package/src/tasks-runner/pseudo-ipc.js +4 -4
  80. package/src/tasks-runner/run-command.d.ts.map +1 -1
  81. package/src/tasks-runner/run-command.js +4 -1
  82. package/src/utils/consume-messages-from-socket.d.ts +2 -0
  83. package/src/utils/consume-messages-from-socket.d.ts.map +1 -1
  84. package/src/utils/consume-messages-from-socket.js +27 -8
  85. package/src/utils/exit-codes.d.ts +1 -1
  86. package/src/utils/exit-codes.d.ts.map +1 -1
  87. package/src/utils/git-utils.js +1 -1
  88. package/src/utils/package-json.js +1 -1
  89. package/src/utils/package-manager.js +2 -2
@@ -54,6 +54,7 @@ const handle_flush_sync_generator_changes_to_disk_1 = require("./handle-flush-sy
54
54
  const run_tasks_execution_hooks_1 = require("../message-types/run-tasks-execution-hooks");
55
55
  const handle_tasks_execution_hooks_1 = require("./handle-tasks-execution-hooks");
56
56
  const register_project_graph_listener_1 = require("../message-types/register-project-graph-listener");
57
+ const v8_1 = require("v8");
57
58
  let performanceObserver;
58
59
  let workspaceWatcherError;
59
60
  let outputsWatcherError;
@@ -99,32 +100,41 @@ async function handleMessage(socket, data) {
99
100
  (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
100
101
  const unparsedPayload = data;
101
102
  let payload;
103
+ let mode = 'json';
102
104
  try {
103
- payload = JSON.parse(unparsedPayload);
105
+ // JSON Message
106
+ if ((0, consume_messages_from_socket_1.isJsonMessage)(unparsedPayload)) {
107
+ payload = JSON.parse(unparsedPayload);
108
+ }
109
+ else {
110
+ // V8 Serialized Message
111
+ payload = (0, v8_1.deserialize)(Buffer.from(unparsedPayload, 'binary'));
112
+ mode = 'v8';
113
+ }
104
114
  }
105
115
  catch (e) {
106
116
  await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
107
117
  }
108
118
  if (payload.type === 'PING') {
109
- await handleResult(socket, 'PING', () => Promise.resolve({ response: JSON.stringify(true), description: 'ping' }));
119
+ await handleResult(socket, 'PING', () => Promise.resolve({ response: true, description: 'ping' }), mode);
110
120
  }
111
121
  else if (payload.type === 'REQUEST_PROJECT_GRAPH') {
112
- await handleResult(socket, 'REQUEST_PROJECT_GRAPH', () => (0, handle_request_project_graph_1.handleRequestProjectGraph)());
122
+ await handleResult(socket, 'REQUEST_PROJECT_GRAPH', () => (0, handle_request_project_graph_1.handleRequestProjectGraph)(), mode);
113
123
  }
114
124
  else if (payload.type === 'HASH_TASKS') {
115
- await handleResult(socket, 'HASH_TASKS', () => (0, handle_hash_tasks_1.handleHashTasks)(payload));
125
+ await handleResult(socket, 'HASH_TASKS', () => (0, handle_hash_tasks_1.handleHashTasks)(payload), mode);
116
126
  }
117
127
  else if (payload.type === 'PROCESS_IN_BACKGROUND') {
118
- await handleResult(socket, 'PROCESS_IN_BACKGROUND', () => (0, handle_process_in_background_1.handleProcessInBackground)(payload));
128
+ await handleResult(socket, 'PROCESS_IN_BACKGROUND', () => (0, handle_process_in_background_1.handleProcessInBackground)(payload), mode);
119
129
  }
120
130
  else if (payload.type === 'RECORD_OUTPUTS_HASH') {
121
- await handleResult(socket, 'RECORD_OUTPUTS_HASH', () => (0, handle_outputs_tracking_1.handleRecordOutputsHash)(payload));
131
+ await handleResult(socket, 'RECORD_OUTPUTS_HASH', () => (0, handle_outputs_tracking_1.handleRecordOutputsHash)(payload), mode);
122
132
  }
123
133
  else if (payload.type === 'OUTPUTS_HASHES_MATCH') {
124
- await handleResult(socket, 'OUTPUTS_HASHES_MATCH', () => (0, handle_outputs_tracking_1.handleOutputsHashesMatch)(payload));
134
+ await handleResult(socket, 'OUTPUTS_HASHES_MATCH', () => (0, handle_outputs_tracking_1.handleOutputsHashesMatch)(payload), mode);
125
135
  }
126
136
  else if (payload.type === 'REQUEST_SHUTDOWN') {
127
- await handleResult(socket, 'REQUEST_SHUTDOWN', () => (0, handle_request_shutdown_1.handleRequestShutdown)(server, numberOfOpenConnections));
137
+ await handleResult(socket, 'REQUEST_SHUTDOWN', () => (0, handle_request_shutdown_1.handleRequestShutdown)(server, numberOfOpenConnections), mode);
128
138
  }
129
139
  else if (payload.type === 'REGISTER_FILE_WATCHER') {
130
140
  file_watcher_sockets_1.registeredFileWatcherSockets.push({ socket, config: payload.config });
@@ -133,61 +143,61 @@ async function handleMessage(socket, data) {
133
143
  project_graph_listener_sockets_1.registeredProjectGraphListenerSockets.push(socket);
134
144
  }
135
145
  else if ((0, glob_1.isHandleGlobMessage)(payload)) {
136
- await handleResult(socket, glob_1.GLOB, () => (0, handle_glob_1.handleGlob)(payload.globs, payload.exclude));
146
+ await handleResult(socket, glob_1.GLOB, () => (0, handle_glob_1.handleGlob)(payload.globs, payload.exclude), mode);
137
147
  }
138
148
  else if ((0, glob_1.isHandleMultiGlobMessage)(payload)) {
139
- await handleResult(socket, glob_1.MULTI_GLOB, () => (0, handle_glob_1.handleMultiGlob)(payload.globs, payload.exclude));
149
+ await handleResult(socket, glob_1.MULTI_GLOB, () => (0, handle_glob_1.handleMultiGlob)(payload.globs, payload.exclude), mode);
140
150
  }
141
151
  else if ((0, get_nx_workspace_files_1.isHandleNxWorkspaceFilesMessage)(payload)) {
142
- await handleResult(socket, get_nx_workspace_files_1.GET_NX_WORKSPACE_FILES, () => (0, handle_nx_workspace_files_1.handleNxWorkspaceFiles)(payload.projectRootMap));
152
+ await handleResult(socket, get_nx_workspace_files_1.GET_NX_WORKSPACE_FILES, () => (0, handle_nx_workspace_files_1.handleNxWorkspaceFiles)(payload.projectRootMap), mode);
143
153
  }
144
154
  else if ((0, get_files_in_directory_1.isHandleGetFilesInDirectoryMessage)(payload)) {
145
- await handleResult(socket, get_files_in_directory_1.GET_FILES_IN_DIRECTORY, () => (0, handle_get_files_in_directory_1.handleGetFilesInDirectory)(payload.dir));
155
+ await handleResult(socket, get_files_in_directory_1.GET_FILES_IN_DIRECTORY, () => (0, handle_get_files_in_directory_1.handleGetFilesInDirectory)(payload.dir), mode);
146
156
  }
147
157
  else if ((0, get_context_file_data_1.isHandleContextFileDataMessage)(payload)) {
148
- await handleResult(socket, get_context_file_data_1.GET_CONTEXT_FILE_DATA, () => (0, handle_context_file_data_1.handleContextFileData)());
158
+ await handleResult(socket, get_context_file_data_1.GET_CONTEXT_FILE_DATA, () => (0, handle_context_file_data_1.handleContextFileData)(), mode);
149
159
  }
150
160
  else if ((0, hash_glob_1.isHandleHashGlobMessage)(payload)) {
151
- await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashGlob)(payload.globs, payload.exclude));
161
+ await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashGlob)(payload.globs, payload.exclude), mode);
152
162
  }
153
163
  else if ((0, hash_glob_1.isHandleHashMultiGlobMessage)(payload)) {
154
- await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashMultiGlob)(payload.globGroups));
164
+ await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashMultiGlob)(payload.globGroups), mode);
155
165
  }
156
166
  else if ((0, task_history_1.isHandleGetFlakyTasksMessage)(payload)) {
157
- await handleResult(socket, task_history_1.GET_FLAKY_TASKS, () => (0, handle_task_history_1.handleGetFlakyTasks)(payload.hashes));
167
+ await handleResult(socket, task_history_1.GET_FLAKY_TASKS, () => (0, handle_task_history_1.handleGetFlakyTasks)(payload.hashes), mode);
158
168
  }
159
169
  else if ((0, task_history_1.isHandleGetEstimatedTaskTimings)(payload)) {
160
- await handleResult(socket, task_history_1.GET_ESTIMATED_TASK_TIMINGS, () => (0, handle_task_history_1.handleGetEstimatedTaskTimings)(payload.targets));
170
+ await handleResult(socket, task_history_1.GET_ESTIMATED_TASK_TIMINGS, () => (0, handle_task_history_1.handleGetEstimatedTaskTimings)(payload.targets), mode);
161
171
  }
162
172
  else if ((0, task_history_1.isHandleWriteTaskRunsToHistoryMessage)(payload)) {
163
- await handleResult(socket, task_history_1.RECORD_TASK_RUNS, () => (0, handle_task_history_1.handleRecordTaskRuns)(payload.taskRuns));
173
+ await handleResult(socket, task_history_1.RECORD_TASK_RUNS, () => (0, handle_task_history_1.handleRecordTaskRuns)(payload.taskRuns), mode);
164
174
  }
165
175
  else if ((0, force_shutdown_1.isHandleForceShutdownMessage)(payload)) {
166
- await handleResult(socket, 'FORCE_SHUTDOWN', () => (0, handle_force_shutdown_1.handleForceShutdown)(server));
176
+ await handleResult(socket, 'FORCE_SHUTDOWN', () => (0, handle_force_shutdown_1.handleForceShutdown)(server), mode);
167
177
  }
168
178
  else if ((0, get_sync_generator_changes_1.isHandleGetSyncGeneratorChangesMessage)(payload)) {
169
- await handleResult(socket, get_sync_generator_changes_1.GET_SYNC_GENERATOR_CHANGES, () => (0, handle_get_sync_generator_changes_1.handleGetSyncGeneratorChanges)(payload.generators));
179
+ await handleResult(socket, get_sync_generator_changes_1.GET_SYNC_GENERATOR_CHANGES, () => (0, handle_get_sync_generator_changes_1.handleGetSyncGeneratorChanges)(payload.generators), mode);
170
180
  }
171
181
  else if ((0, flush_sync_generator_changes_to_disk_1.isHandleFlushSyncGeneratorChangesToDiskMessage)(payload)) {
172
- await handleResult(socket, flush_sync_generator_changes_to_disk_1.FLUSH_SYNC_GENERATOR_CHANGES_TO_DISK, () => (0, handle_flush_sync_generator_changes_to_disk_1.handleFlushSyncGeneratorChangesToDisk)(payload.generators));
182
+ await handleResult(socket, flush_sync_generator_changes_to_disk_1.FLUSH_SYNC_GENERATOR_CHANGES_TO_DISK, () => (0, handle_flush_sync_generator_changes_to_disk_1.handleFlushSyncGeneratorChangesToDisk)(payload.generators), mode);
173
183
  }
174
184
  else if ((0, get_registered_sync_generators_1.isHandleGetRegisteredSyncGeneratorsMessage)(payload)) {
175
- await handleResult(socket, get_registered_sync_generators_1.GET_REGISTERED_SYNC_GENERATORS, () => (0, handle_get_registered_sync_generators_1.handleGetRegisteredSyncGenerators)());
185
+ await handleResult(socket, get_registered_sync_generators_1.GET_REGISTERED_SYNC_GENERATORS, () => (0, handle_get_registered_sync_generators_1.handleGetRegisteredSyncGenerators)(), mode);
176
186
  }
177
187
  else if ((0, update_workspace_context_1.isHandleUpdateWorkspaceContextMessage)(payload)) {
178
- await handleResult(socket, update_workspace_context_1.UPDATE_WORKSPACE_CONTEXT, () => (0, handle_update_workspace_context_1.handleUpdateWorkspaceContext)(payload.createdFiles, payload.updatedFiles, payload.deletedFiles));
188
+ await handleResult(socket, update_workspace_context_1.UPDATE_WORKSPACE_CONTEXT, () => (0, handle_update_workspace_context_1.handleUpdateWorkspaceContext)(payload.createdFiles, payload.updatedFiles, payload.deletedFiles), mode);
179
189
  }
180
190
  else if ((0, run_tasks_execution_hooks_1.isHandlePreTasksExecutionMessage)(payload)) {
181
- await handleResult(socket, run_tasks_execution_hooks_1.PRE_TASKS_EXECUTION, () => (0, handle_tasks_execution_hooks_1.handleRunPreTasksExecution)(payload.context));
191
+ await handleResult(socket, run_tasks_execution_hooks_1.PRE_TASKS_EXECUTION, () => (0, handle_tasks_execution_hooks_1.handleRunPreTasksExecution)(payload.context), mode);
182
192
  }
183
193
  else if ((0, run_tasks_execution_hooks_1.isHandlePostTasksExecutionMessage)(payload)) {
184
- await handleResult(socket, run_tasks_execution_hooks_1.POST_TASKS_EXECUTION, () => (0, handle_tasks_execution_hooks_1.handleRunPostTasksExecution)(payload.context));
194
+ await handleResult(socket, run_tasks_execution_hooks_1.POST_TASKS_EXECUTION, () => (0, handle_tasks_execution_hooks_1.handleRunPostTasksExecution)(payload.context), mode);
185
195
  }
186
196
  else {
187
197
  await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
188
198
  }
189
199
  }
190
- async function handleResult(socket, type, hrFn) {
200
+ async function handleResult(socket, type, hrFn, mode) {
191
201
  let hr;
192
202
  const startMark = new Date();
193
203
  try {
@@ -201,10 +211,13 @@ async function handleResult(socket, type, hrFn) {
201
211
  await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, hr.description, hr.error);
202
212
  }
203
213
  else {
204
- await (0, shutdown_utils_1.respondToClient)(socket, hr.response, hr.description);
214
+ const response = typeof hr.response === 'string'
215
+ ? hr.response
216
+ : serializeUnserializedResult(hr.response, mode);
217
+ await (0, shutdown_utils_1.respondToClient)(socket, response, hr.description);
205
218
  }
206
219
  const endMark = new Date();
207
- logger_1.serverLogger.log(`Handled ${type}. Handling time: ${doneHandlingMark.getTime() - startMark.getTime()}. Response time: ${endMark.getTime() - doneHandlingMark.getTime()}.`);
220
+ logger_1.serverLogger.log(`Handled ${mode} message ${type}. Handling time: ${doneHandlingMark.getTime() - startMark.getTime()}. Response time: ${endMark.getTime() - doneHandlingMark.getTime()}.`);
208
221
  }
209
222
  function handleInactivityTimeout() {
210
223
  if ((0, file_watcher_sockets_1.hasRegisteredFileWatcherSockets)() ||
@@ -415,3 +428,11 @@ async function startServer() {
415
428
  }
416
429
  });
417
430
  }
431
+ function serializeUnserializedResult(response, mode) {
432
+ if (mode === 'json') {
433
+ return JSON.stringify(response);
434
+ }
435
+ else {
436
+ return (0, v8_1.serialize)(response).toString('binary');
437
+ }
438
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"shutdown-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/shutdown-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAI1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQ5C,eAAO,MAAM,4BAA4B,EAAG,QAAiB,CAAC;AAI9D,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,QAErD;AAED,wBAAgB,kBAAkB,YAEjC;AAID,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,OAAO,QAE3D;AAED,wBAAgB,wBAAwB,YAEvC;AAED,UAAU,oCAAoC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,wBAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE,oCAAoC,iBAmCtC;AAID,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAK3D;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,oBAcpB;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,iBAsBb"}
1
+ {"version":3,"file":"shutdown-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/shutdown-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAI1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAS5C,eAAO,MAAM,4BAA4B,EAAG,QAAiB,CAAC;AAI9D,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,QAErD;AAED,wBAAgB,kBAAkB,YAEjC;AAID,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,OAAO,QAE3D;AAED,wBAAgB,wBAAwB,YAEvC;AAED,UAAU,oCAAoC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,wBAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE,oCAAoC,iBAmCtC;AAID,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAK3D;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,oBAcpB;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,iBAsBb"}
@@ -16,6 +16,7 @@ const cache_1 = require("../cache");
16
16
  const error_types_1 = require("../../project-graph/error-types");
17
17
  const db_connection_1 = require("../../utils/db-connection");
18
18
  const get_plugins_1 = require("../../project-graph/plugins/get-plugins");
19
+ const consume_messages_from_socket_1 = require("../../utils/consume-messages-from-socket");
19
20
  exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
20
21
  let watcherInstance;
21
22
  function storeWatcherInstance(instance) {
@@ -70,7 +71,7 @@ function respondToClient(socket, response, description) {
70
71
  if (description) {
71
72
  logger_1.serverLogger.requestLog(`Responding to the client.`, description);
72
73
  }
73
- socket.write(`${response}${String.fromCodePoint(4)}`, (err) => {
74
+ socket.write(response + consume_messages_from_socket_1.MESSAGE_END_SEQ, (err) => {
74
75
  if (err) {
75
76
  console.error(err);
76
77
  }
@@ -10,4 +10,15 @@ export declare const getForkedProcessOsSocketPath: (id: string) => string;
10
10
  export declare const getPluginOsSocketPath: (id: string) => string;
11
11
  export declare function killSocketOrPath(): void;
12
12
  export declare function serializeResult(error: Error | null, serializedProjectGraph: string | null, serializedSourceMaps: string | null): string | null;
13
+ /**
14
+ * Helper to serialize data either using v8 serialization or JSON serialization, based on
15
+ * the user's preference and the success of each method. Should only be used by "client" side
16
+ * connections, daemon or other servers should respond based on the type of serialization used
17
+ * by the client it is communicating with.
18
+ *
19
+ * @param data Data to serialize
20
+ * @param force Forces one serialization method over the other
21
+ * @returns Serialized data as a string
22
+ */
23
+ export declare function serialize(data: any, force?: 'v8' | 'json'): string;
13
24
  //# sourceMappingURL=socket-utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"socket-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/socket-utils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,SAAS,SAAyB,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,cAM/B,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,IAAI,MAAM,WAMtD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,IAAI,MAAM,WAM/C,CAAC;AAgBF,wBAAgB,gBAAgB,IAAI,IAAI,CAIvC;AAGD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,GAAG,IAAI,EACnB,sBAAsB,EAAE,MAAM,GAAG,IAAI,EACrC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAClC,MAAM,GAAG,IAAI,CAKf"}
1
+ {"version":3,"file":"socket-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/socket-utils.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,SAAS,SAAyB,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,cAM/B,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,IAAI,MAAM,WAMtD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,IAAI,MAAM,WAM/C,CAAC;AAgBF,wBAAgB,gBAAgB,IAAI,IAAI,CAIvC;AAGD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,GAAG,IAAI,EACnB,sBAAsB,EAAE,MAAM,GAAG,IAAI,EACrC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAClC,MAAM,GAAG,IAAI,CAKf;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CA4BlE"}
@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getPluginOsSocketPath = exports.getForkedProcessOsSocketPath = exports.getFullOsSocketPath = exports.isWindows = void 0;
4
4
  exports.killSocketOrPath = killSocketOrPath;
5
5
  exports.serializeResult = serializeResult;
6
+ exports.serialize = serialize;
6
7
  const fs_1 = require("fs");
7
8
  const os_1 = require("os");
8
9
  const path_1 = require("path");
9
10
  const tmp_dir_1 = require("./tmp-dir");
10
11
  const serializable_error_1 = require("../utils/serializable-error");
12
+ const is_v8_serializer_enabled_1 = require("./is-v8-serializer-enabled");
13
+ const v8_1 = require("v8");
11
14
  exports.isWindows = (0, os_1.platform)() === 'win32';
12
15
  /**
13
16
  * For IPC with the daemon server we use unix sockets or windows named pipes, depending on the user's operating system.
@@ -53,3 +56,41 @@ function serializeResult(error, serializedProjectGraph, serializedSourceMaps) {
53
56
  // We do not want to repeat work `JSON.stringify`ing an object containing the potentially large project graph so merge as strings
54
57
  return `{ "error": ${JSON.stringify(error ? (0, serializable_error_1.createSerializableError)(error) : error)}, "projectGraph": ${serializedProjectGraph}, "sourceMaps": ${serializedSourceMaps} }`;
55
58
  }
59
+ /**
60
+ * Helper to serialize data either using v8 serialization or JSON serialization, based on
61
+ * the user's preference and the success of each method. Should only be used by "client" side
62
+ * connections, daemon or other servers should respond based on the type of serialization used
63
+ * by the client it is communicating with.
64
+ *
65
+ * @param data Data to serialize
66
+ * @param force Forces one serialization method over the other
67
+ * @returns Serialized data as a string
68
+ */
69
+ function serialize(data, force) {
70
+ if (force === 'v8' || (0, is_v8_serializer_enabled_1.isV8SerializerEnabled)()) {
71
+ try {
72
+ return (0, v8_1.serialize)(data).toString('binary');
73
+ }
74
+ catch (e) {
75
+ if (force !== 'v8') {
76
+ console.warn(`Data could not be serialized using v8 serialization: ${e}. Falling back to JSON serialization.`);
77
+ // Fall back to JSON serialization
78
+ return JSON.stringify(data);
79
+ }
80
+ throw e;
81
+ }
82
+ }
83
+ else {
84
+ try {
85
+ return JSON.stringify(data);
86
+ }
87
+ catch (e) {
88
+ if (force !== 'json') {
89
+ // Fall back to v8 serialization
90
+ console.warn(`Data could not be serialized using JSON.stringify: ${e}. Falling back to v8 serialization.`);
91
+ return (0, v8_1.serialize)(data).toString('binary');
92
+ }
93
+ throw e;
94
+ }
95
+ }
96
+ }
@@ -29,4 +29,5 @@ export { isCI } from './utils/is-ci';
29
29
  export { isUsingPrettierInTree } from './utils/is-using-prettier';
30
30
  export { readYamlFile } from './utils/fileutils';
31
31
  export { globalSpinner } from './utils/spinner';
32
+ export { signalToCode } from './utils/exit-codes';
32
33
  //# 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;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,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;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.globalSpinner = 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;
3
+ exports.signalToCode = exports.globalSpinner = 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.
@@ -63,3 +63,5 @@ var fileutils_1 = require("./utils/fileutils");
63
63
  Object.defineProperty(exports, "readYamlFile", { enumerable: true, get: function () { return fileutils_1.readYamlFile; } });
64
64
  var spinner_1 = require("./utils/spinner");
65
65
  Object.defineProperty(exports, "globalSpinner", { enumerable: true, get: function () { return spinner_1.globalSpinner; } });
66
+ var exit_codes_1 = require("./utils/exit-codes");
67
+ Object.defineProperty(exports, "signalToCode", { enumerable: true, get: function () { return exit_codes_1.signalToCode; } });
Binary file
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/js/index.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACd,MAAM,6BAA6B,CAAC;AAkBrC,eAAO,MAAM,IAAI,oCAAoC,CAAC;AAStD,eAAO,MAAM,aAAa,EAAE,aAK3B,CAAC;AA8CF,eAAO,MAAM,kBAAkB,EAAE,kBAkDhC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/js/index.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACd,MAAM,6BAA6B,CAAC;AAkBrC,eAAO,MAAM,IAAI,oCAAoC,CAAC;AAKtD,eAAO,MAAM,aAAa,EAAE,aAK3B,CAAC;AAkDF,eAAO,MAAM,kBAAkB,EAAE,kBAgDhC,CAAC"}
@@ -16,7 +16,8 @@ const lock_file_1 = require("./lock-file/lock-file");
16
16
  const build_dependencies_1 = require("./project-graph/build-dependencies/build-dependencies");
17
17
  const config_1 = require("./utils/config");
18
18
  exports.name = 'nx/js/dependencies-and-lockfile';
19
- let parsedLockFile = {};
19
+ // Separate in-memory caches
20
+ let cachedExternalNodes;
20
21
  exports.createNodesV2 = [
21
22
  (0, globs_1.combineGlobPatterns)(lock_file_1.LOCKFILES),
22
23
  (files, _, context) => {
@@ -38,15 +39,16 @@ function internalCreateNodes(lockFile, _, context) {
38
39
  ? (0, fs_1.readFileSync)(lockFilePath, 'utf-8')
39
40
  : (0, bun_parser_1.readBunLockFile)(lockFilePath);
40
41
  const lockFileHash = getLockFileHash(lockFileContents);
41
- if (!lockFileNeedsReprocessing(lockFileHash)) {
42
- const nodes = readCachedParsedLockFile().externalNodes;
43
- parsedLockFile.externalNodes = nodes;
42
+ if (!lockFileNeedsReprocessing(lockFileHash, externalNodesHashFile)) {
43
+ const nodes = readCachedExternalNodes();
44
+ cachedExternalNodes = nodes;
44
45
  return {
45
46
  externalNodes: nodes,
46
47
  };
47
48
  }
48
49
  const externalNodes = (0, lock_file_1.getLockFileNodes)(packageManager, lockFileContents, lockFileHash, context);
49
- parsedLockFile.externalNodes = externalNodes;
50
+ cachedExternalNodes = externalNodes;
51
+ writeExternalNodesCache(lockFileHash, externalNodes);
50
52
  return {
51
53
  externalNodes,
52
54
  };
@@ -58,19 +60,18 @@ const createDependencies = (_, ctx) => {
58
60
  // lockfile may not exist yet
59
61
  if (pluginConfig.analyzeLockfile &&
60
62
  (0, lock_file_1.lockFileExists)(packageManager) &&
61
- parsedLockFile.externalNodes) {
63
+ cachedExternalNodes) {
62
64
  const lockFilePath = (0, path_1.join)(workspace_root_1.workspaceRoot, (0, lock_file_1.getLockFileName)(packageManager));
63
65
  const lockFileContents = packageManager !== 'bun'
64
66
  ? (0, fs_1.readFileSync)(lockFilePath, 'utf-8')
65
67
  : (0, bun_parser_1.readBunLockFile)(lockFilePath);
66
68
  const lockFileHash = getLockFileHash(lockFileContents);
67
- if (!lockFileNeedsReprocessing(lockFileHash)) {
68
- lockfileDependencies = readCachedParsedLockFile().dependencies ?? [];
69
+ if (!lockFileNeedsReprocessing(lockFileHash, dependenciesHashFile)) {
70
+ lockfileDependencies = readCachedDependencies();
69
71
  }
70
72
  else {
71
73
  lockfileDependencies = (0, lock_file_1.getLockFileDependencies)(packageManager, lockFileContents, lockFileHash, ctx);
72
- parsedLockFile.dependencies = lockfileDependencies;
73
- writeLastProcessedLockfileHash(lockFileHash, parsedLockFile);
74
+ writeDependenciesCache(lockFileHash, lockfileDependencies);
74
75
  }
75
76
  }
76
77
  perf_hooks_1.performance.mark('build typescript dependencies - start');
@@ -83,21 +84,34 @@ exports.createDependencies = createDependencies;
83
84
  function getLockFileHash(lockFileContents) {
84
85
  return (0, file_hasher_1.hashArray)([versions_1.nxVersion, lockFileContents]);
85
86
  }
86
- function lockFileNeedsReprocessing(lockHash) {
87
+ function lockFileNeedsReprocessing(lockHash, hashFilePath) {
87
88
  try {
88
- return (0, fs_1.readFileSync)(lockFileHashFile).toString() !== lockHash;
89
+ return (0, fs_1.readFileSync)(hashFilePath).toString() !== lockHash;
89
90
  }
90
91
  catch {
91
92
  return true;
92
93
  }
93
94
  }
94
- function writeLastProcessedLockfileHash(hash, lockFile) {
95
- (0, fs_1.mkdirSync)((0, path_1.dirname)(lockFileHashFile), { recursive: true });
96
- (0, fs_1.writeFileSync)(cachedParsedLockFile, JSON.stringify(lockFile, null, 2));
97
- (0, fs_1.writeFileSync)(lockFileHashFile, hash);
95
+ // External nodes cache functions
96
+ function writeExternalNodesCache(hash, nodes) {
97
+ (0, fs_1.mkdirSync)((0, path_1.dirname)(externalNodesHashFile), { recursive: true });
98
+ (0, fs_1.writeFileSync)(externalNodesCache, JSON.stringify(nodes, null, 2));
99
+ (0, fs_1.writeFileSync)(externalNodesHashFile, hash);
98
100
  }
99
- function readCachedParsedLockFile() {
100
- return JSON.parse((0, fs_1.readFileSync)(cachedParsedLockFile).toString());
101
+ function readCachedExternalNodes() {
102
+ return JSON.parse((0, fs_1.readFileSync)(externalNodesCache).toString());
101
103
  }
102
- const lockFileHashFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile.hash');
103
- const cachedParsedLockFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'parsed-lock-file.json');
104
+ // Dependencies cache functions
105
+ function writeDependenciesCache(hash, dependencies) {
106
+ (0, fs_1.mkdirSync)((0, path_1.dirname)(dependenciesHashFile), { recursive: true });
107
+ (0, fs_1.writeFileSync)(dependenciesCache, JSON.stringify(dependencies, null, 2));
108
+ (0, fs_1.writeFileSync)(dependenciesHashFile, hash);
109
+ }
110
+ function readCachedDependencies() {
111
+ return JSON.parse((0, fs_1.readFileSync)(dependenciesCache).toString());
112
+ }
113
+ // Cache file paths
114
+ const externalNodesHashFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile-nodes.hash');
115
+ const dependenciesHashFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile-dependencies.hash');
116
+ const externalNodesCache = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'parsed-lock-file.nodes.json');
117
+ const dependenciesCache = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'parsed-lock-file.dependencies.json');
@@ -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;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"}
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,CAuCR"}
@@ -287,8 +287,10 @@ function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson, workspac
287
287
  const workspaceDependencyImporters = {};
288
288
  for (const [packageName, importerPath] of Object.entries(requiredImporters)) {
289
289
  const baseImporter = importers[importerPath];
290
- workspaceDependencyImporters[`workspace_modules/${packageName}`] =
291
- baseImporter;
290
+ if (baseImporter) {
291
+ workspaceDependencyImporters[`workspace_modules/${packageName}`] =
292
+ baseImporter;
293
+ }
292
294
  }
293
295
  const output = {
294
296
  ...data,
@@ -423,7 +425,7 @@ function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVe
423
425
  let version = packageJson[depType][packageName];
424
426
  const manager = (0, catalog_1.getCatalogManager)(workspaceRoot);
425
427
  if (manager?.isCatalogReference(version)) {
426
- version = manager.resolveCatalogReference(packageName, version, workspaceRoot);
428
+ version = manager.resolveCatalogReference(workspaceRoot, packageName, version);
427
429
  if (!version) {
428
430
  throw new Error(`Could not resolve catalog reference for package ${packageName}@${version}.`);
429
431
  }
@@ -42,7 +42,7 @@ function normalizeDependencies(packageJson, graph, workspacePackages, workspaceR
42
42
  let resolvedVersionRange = versionRange;
43
43
  const manager = (0, catalog_1.getCatalogManager)(workspaceRootPath);
44
44
  if (manager?.isCatalogReference(versionRange)) {
45
- const resolvedVersionRange = manager.resolveCatalogReference(packageName, versionRange, workspaceRootPath);
45
+ resolvedVersionRange = manager.resolveCatalogReference(workspaceRootPath, packageName, versionRange);
46
46
  if (!resolvedVersionRange) {
47
47
  throw new Error(`Could not resolve catalog reference for ${packageName}@${versionRange}.`);
48
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/plugins/isolation/messaging.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/plugins/isolation/messaging.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ exports.isPluginWorkerMessage = isPluginWorkerMessage;
4
4
  exports.isPluginWorkerResult = isPluginWorkerResult;
5
5
  exports.consumeMessage = consumeMessage;
6
6
  exports.sendMessageOverSocket = sendMessageOverSocket;
7
+ const consume_messages_from_socket_1 = require("../../../utils/consume-messages-from-socket");
7
8
  function isPluginWorkerMessage(message) {
8
9
  return (typeof message === 'object' &&
9
10
  'type' in message &&
@@ -46,5 +47,5 @@ async function consumeMessage(socket, raw, handlers) {
46
47
  }
47
48
  }
48
49
  function sendMessageOverSocket(socket, message) {
49
- socket.write(JSON.stringify(message) + String.fromCodePoint(4));
50
+ socket.write(JSON.stringify(message) + consume_messages_from_socket_1.MESSAGE_END_SEQ);
50
51
  }
@@ -166,7 +166,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
166
166
  }
167
167
  },
168
168
  createDependenciesResult: ({ tx, ...result }) => {
169
- const { resolver, rejector } = pending.get(tx);
169
+ const { resolver, rejector } = getPendingPromise(tx, pending);
170
170
  if (result.success) {
171
171
  resolver(result.dependencies);
172
172
  }
@@ -175,7 +175,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
175
175
  }
176
176
  },
177
177
  createNodesResult: ({ tx, ...result }) => {
178
- const { resolver, rejector } = pending.get(tx);
178
+ const { resolver, rejector } = getPendingPromise(tx, pending);
179
179
  if (result.success) {
180
180
  resolver(result.result);
181
181
  }
@@ -184,7 +184,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
184
184
  }
185
185
  },
186
186
  createMetadataResult: ({ tx, ...result }) => {
187
- const { resolver, rejector } = pending.get(tx);
187
+ const { resolver, rejector } = getPendingPromise(tx, pending);
188
188
  if (result.success) {
189
189
  resolver(result.metadata);
190
190
  }
@@ -193,7 +193,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
193
193
  }
194
194
  },
195
195
  preTasksExecutionResult: ({ tx, ...result }) => {
196
- const { resolver, rejector } = pending.get(tx);
196
+ const { resolver, rejector } = getPendingPromise(tx, pending);
197
197
  if (result.success) {
198
198
  resolver(result.mutations);
199
199
  }
@@ -202,7 +202,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
202
202
  }
203
203
  },
204
204
  postTasksExecutionResult: ({ tx, ...result }) => {
205
- const { resolver, rejector } = pending.get(tx);
205
+ const { resolver, rejector } = getPendingPromise(tx, pending);
206
206
  if (result.success) {
207
207
  resolver();
208
208
  }
@@ -220,6 +220,20 @@ function createWorkerExitHandler(worker, pendingPromises) {
220
220
  }
221
221
  };
222
222
  }
223
+ function getPendingPromise(tx, pending) {
224
+ const pendingPromise = pending.get(tx);
225
+ if (!pendingPromise) {
226
+ throw new Error(`No pending promise found for transaction "${tx}". This may indicate a bug in the plugin pool. Currently pending promises:\n` +
227
+ Array.from(pending.keys())
228
+ .map((t) => ` - ${t}`)
229
+ .join('\n'));
230
+ }
231
+ const { rejector, resolver } = pendingPromise;
232
+ return {
233
+ rejector,
234
+ resolver,
235
+ };
236
+ }
223
237
  function registerPendingPromise(tx, pending, callback, context) {
224
238
  let resolver, rejector, timeout;
225
239
  const promise = new Promise((res, rej) => {
@@ -1 +1 @@
1
- {"version":3,"file":"loaded-nx-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/loaded-nx-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAKhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAItB,qBAAa,cAAc;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE;QACrB,WAAW,EAAE,MAAM;QAGnB,EAAE,EAAE,CACF,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,oBAAoB,KAC1B,OAAO,CACV,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAC1E;KACF,CAAC;IACF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACxB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,qBAAqB,KAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAC3B,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;gBAEhB,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,mBAAmB;CAqFtE"}
1
+ {"version":3,"file":"loaded-nx-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/loaded-nx-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAKhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAItB,qBAAa,cAAc;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE;QACrB,WAAW,EAAE,MAAM;QAGnB,EAAE,EAAE,CACF,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,oBAAoB,KAC1B,OAAO,CACV,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAC1E;KACF,CAAC;IACF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACxB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,qBAAqB,KAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAC3B,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;gBAEhB,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,mBAAmB;CAuFtE"}
@@ -66,6 +66,8 @@ class LoadedNxPlugin {
66
66
  });
67
67
  }
68
68
  await plugin.preTasksExecution(this.options, context);
69
+ // This doesn't revert env changes, as the proxy still updates
70
+ // originalEnv, rather it removes the proxy.
69
71
  process.env = originalEnv;
70
72
  return updates;
71
73
  };
@@ -1 +1 @@
1
- {"version":3,"file":"resolve-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/resolve-plugin.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAIrF,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE;;;;GAgBhB;AAqBD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,IAAI,SAAgB,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,oBAAoB,CAAA;CAAE,GAAG,IAAI,CAE9D;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EAAE,EACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,IAAI,EAAE,MAAM;;;;EAmCb"}
1
+ {"version":3,"file":"resolve-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/resolve-plugin.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAOrF,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE;;;;GAiBhB;AAqBD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,IAAI,SAAgB,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,oBAAoB,CAAA;CAAE,GAAG,IAAI,CAE9D;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EAAE,EACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,IAAI,EAAE,MAAM;;;;EAmCb"}
@@ -13,14 +13,16 @@ const workspace_root_1 = require("../../utils/workspace-root");
13
13
  const find_project_for_path_1 = require("../utils/find-project-for-path");
14
14
  const retrieve_workspace_files_1 = require("../utils/retrieve-workspace-files");
15
15
  let projectsWithoutInference;
16
+ let projectsWithoutInferencePromise = null;
16
17
  async function resolveNxPlugin(moduleName, root, paths) {
17
18
  try {
18
19
  require.resolve(moduleName);
19
20
  }
20
21
  catch {
21
22
  // If a plugin cannot be resolved, we will need projects to resolve it
22
- projectsWithoutInference ??=
23
- await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
23
+ projectsWithoutInferencePromise ??=
24
+ (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
25
+ projectsWithoutInference ??= await projectsWithoutInferencePromise;
24
26
  }
25
27
  const { pluginPath, name, shouldRegisterTSTranspiler } = getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
26
28
  return { pluginPath, name, shouldRegisterTSTranspiler };
@@ -71,5 +71,5 @@ export declare function readTargetDefaultsForTarget(targetName: string, targetDe
71
71
  * @param project The project that the target belongs to
72
72
  * @returns The normalized target configuration
73
73
  */
74
- export declare function normalizeTarget(target: TargetConfiguration, project: ProjectConfiguration, workspaceRoot: string, projectsMap: Record<string, ProjectConfiguration>): TargetConfiguration<any>;
74
+ export declare function normalizeTarget(target: TargetConfiguration, project: ProjectConfiguration, workspaceRoot: string, projectsMap: Record<string, ProjectConfiguration>, errorMsgKey: string): TargetConfiguration<any>;
75
75
  //# sourceMappingURL=project-configuration-utils.d.ts.map