nx 22.0.0-canary.20251016-849f356 → 22.0.0-canary.20251018-6549d2a
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.
- package/migrations.json +37 -0
- package/package.json +11 -11
- package/src/command-line/migrate/migrate.d.ts.map +1 -1
- package/src/command-line/migrate/migrate.js +16 -0
- package/src/core/graph/main.js +1 -1
- package/src/generators/utils/project-configuration.js +13 -1
- package/src/migrations/update-15-0-0/prefix-outputs.d.ts +3 -0
- package/src/migrations/update-15-0-0/prefix-outputs.d.ts.map +1 -0
- package/src/migrations/update-15-0-0/prefix-outputs.js +49 -0
- package/src/migrations/update-16-0-0/remove-nrwl-cli.d.ts +3 -0
- package/src/migrations/update-16-0-0/remove-nrwl-cli.d.ts.map +1 -0
- package/src/migrations/update-16-0-0/remove-nrwl-cli.js +16 -0
- package/src/migrations/update-16-0-0/update-depends-on-to-tokens.d.ts +3 -0
- package/src/migrations/update-16-0-0/update-depends-on-to-tokens.d.ts.map +1 -0
- package/src/migrations/update-16-0-0/update-depends-on-to-tokens.js +97 -0
- package/src/migrations/update-16-0-0/update-nx-cloud-runner.d.ts +3 -0
- package/src/migrations/update-16-0-0/update-nx-cloud-runner.d.ts.map +1 -0
- package/src/migrations/update-16-0-0/update-nx-cloud-runner.js +29 -0
- package/src/migrations/update-16-2-0/remove-run-commands-output-path.d.ts +3 -0
- package/src/migrations/update-16-2-0/remove-run-commands-output-path.d.ts.map +1 -0
- package/src/migrations/update-16-2-0/remove-run-commands-output-path.js +45 -0
- package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.d.ts +13 -0
- package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.d.ts.map +1 -0
- package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.js +67 -0
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/package-json/create-nodes.js +1 -1
- package/src/plugins/project-json/build-nodes/project-json.d.ts +0 -1
- package/src/plugins/project-json/build-nodes/project-json.d.ts.map +1 -1
- package/src/plugins/project-json/build-nodes/project-json.js +1 -13
- package/src/project-graph/utils/project-configuration-utils.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration-utils.js +9 -0
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.d.ts +1 -1
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.js +83 -55
- package/src/utils/catalog/index.d.ts +1 -1
- package/src/utils/catalog/index.d.ts.map +1 -1
- package/src/utils/catalog/manager.d.ts +1 -0
- package/src/utils/catalog/manager.d.ts.map +1 -1
- package/src/utils/catalog/pnpm-manager.d.ts +1 -0
- package/src/utils/catalog/pnpm-manager.d.ts.map +1 -1
- package/src/utils/catalog/pnpm-manager.js +3 -0
|
@@ -39,8 +39,13 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
|
|
|
39
39
|
tasksToTerminalOutputs[taskId] += output;
|
|
40
40
|
};
|
|
41
41
|
// TODO(@AgentEnder): The following 2 methods should be one but will need more refactoring
|
|
42
|
-
lifeCycle.printTaskTerminalOutput = (task, taskStatus) => {
|
|
42
|
+
lifeCycle.printTaskTerminalOutput = (task, taskStatus, output) => {
|
|
43
43
|
tasksToTaskStatus[task.id] = taskStatus;
|
|
44
|
+
// Store the complete output for display in the summary
|
|
45
|
+
// This is called with the full output for cached and executed tasks
|
|
46
|
+
if (output) {
|
|
47
|
+
tasksToTerminalOutputs[task.id] = output;
|
|
48
|
+
}
|
|
44
49
|
};
|
|
45
50
|
lifeCycle.setTaskStatus = (taskId, taskStatus) => {
|
|
46
51
|
if (taskStatus === 9 /* NativeTaskStatus.Stopped */) {
|
|
@@ -106,7 +111,6 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
|
|
|
106
111
|
(0, task_history_life_cycle_1.getTasksHistoryLifeCycle)().printFlakyTasksMessage();
|
|
107
112
|
};
|
|
108
113
|
const printRunOneSummary = ({ failure, cancelled, }) => {
|
|
109
|
-
let lines = [];
|
|
110
114
|
// Prints task outputs in the order they were completed
|
|
111
115
|
// above the summary, since run-one should print all task results.
|
|
112
116
|
for (const taskId of taskIdsInTheOrderTheyStart) {
|
|
@@ -114,62 +118,71 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
|
|
|
114
118
|
const terminalOutput = tasksToTerminalOutputs[taskId];
|
|
115
119
|
output_1.output.logCommandOutput(taskId, taskStatus, terminalOutput);
|
|
116
120
|
}
|
|
117
|
-
|
|
121
|
+
// Print vertical separator
|
|
122
|
+
const separatorLines = output_1.output.getVerticalSeparatorLines(failure ? 'red' : 'green');
|
|
123
|
+
for (const line of separatorLines) {
|
|
124
|
+
console.log(line);
|
|
125
|
+
}
|
|
118
126
|
if (!failure && !cancelled) {
|
|
119
127
|
const text = `Successfully ran ${(0, formatting_utils_1.formatTargetsAndProjects)([initiatingProject], targets, tasks)}`;
|
|
120
|
-
|
|
128
|
+
// Build success message with color applied to the entire block
|
|
129
|
+
const messageLines = [
|
|
130
|
+
output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim(` (${timeTakenText})`)),
|
|
131
|
+
];
|
|
121
132
|
const filteredOverrides = Object.entries(overrides).filter(
|
|
122
133
|
// Don't print the data passed through from the version subcommand to the publish executor options, it could be quite large and it's an implementation detail.
|
|
123
134
|
([flag]) => flag !== 'nxReleaseVersionData');
|
|
124
135
|
if (filteredOverrides.length > 0) {
|
|
125
|
-
|
|
126
|
-
|
|
136
|
+
messageLines.push('');
|
|
137
|
+
messageLines.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.green('With additional flags:')}`);
|
|
127
138
|
filteredOverrides
|
|
128
139
|
.map(([flag, value]) => output_1.output.dim.green((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
|
|
129
|
-
.forEach((arg) =>
|
|
140
|
+
.forEach((arg) => messageLines.push(arg));
|
|
130
141
|
}
|
|
131
|
-
lines.push(output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim(` (${timeTakenText})`)), ...taskOverridesLines);
|
|
132
142
|
if (totalCachedTasks > 0) {
|
|
133
|
-
|
|
143
|
+
messageLines.push(output_1.output.dim(`${node_os_1.EOL}Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
|
|
134
144
|
}
|
|
135
|
-
|
|
145
|
+
// Print the entire success message block with green color
|
|
146
|
+
console.log(output_1.output.colors.green(messageLines.join(node_os_1.EOL)));
|
|
136
147
|
}
|
|
137
148
|
else if (!cancelled) {
|
|
138
149
|
let text = `Ran target ${output_1.output.bold(targets[0])} for project ${output_1.output.bold(initiatingProject)}`;
|
|
139
150
|
if (tasks.length > 1) {
|
|
140
151
|
text += ` and ${output_1.output.bold(tasks.length - 1)} task(s) they depend on`;
|
|
141
152
|
}
|
|
142
|
-
|
|
153
|
+
// Build failure message lines
|
|
154
|
+
const messageLines = [
|
|
155
|
+
output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim(` (${timeTakenText})`)),
|
|
156
|
+
];
|
|
143
157
|
const filteredOverrides = Object.entries(overrides).filter(
|
|
144
158
|
// Don't print the data passed through from the version subcommand to the publish executor options, it could be quite large and it's an implementation detail.
|
|
145
159
|
([flag]) => flag !== 'nxReleaseVersionData');
|
|
146
160
|
if (filteredOverrides.length > 0) {
|
|
147
|
-
|
|
148
|
-
|
|
161
|
+
messageLines.push('');
|
|
162
|
+
messageLines.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.red('With additional flags:')}`);
|
|
149
163
|
filteredOverrides
|
|
150
164
|
.map(([flag, value]) => output_1.output.dim.red((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
|
|
151
|
-
.forEach((arg) =>
|
|
165
|
+
.forEach((arg) => messageLines.push(arg));
|
|
152
166
|
}
|
|
167
|
+
messageLines.push('');
|
|
168
|
+
messageLines.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`);
|
|
169
|
+
messageLines.push(`${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`);
|
|
153
170
|
const viewLogs = (0, view_logs_utils_1.viewLogsFooterRows)(totalFailedTasks);
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
'',
|
|
158
|
-
`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
|
|
159
|
-
`${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`,
|
|
160
|
-
...viewLogs,
|
|
161
|
-
].join(node_os_1.EOL)));
|
|
171
|
+
messageLines.push(...viewLogs);
|
|
172
|
+
// Print the entire failure message block with red color
|
|
173
|
+
console.log(output_1.output.colors.red(messageLines.join(node_os_1.EOL)));
|
|
162
174
|
}
|
|
163
175
|
else {
|
|
164
|
-
|
|
176
|
+
console.log(output_1.output.applyNxPrefix('red', output_1.output.colors.red(`Cancelled running target ${output_1.output.bold(targets[0])} for project ${output_1.output.bold(initiatingProject)}`) + output_1.output.dim(` (${timeTakenText})`)));
|
|
165
177
|
}
|
|
166
178
|
// adds some vertical space after the summary to avoid bunching against terminal
|
|
167
|
-
|
|
168
|
-
console.log(lines.join(node_os_1.EOL));
|
|
179
|
+
console.log('');
|
|
169
180
|
};
|
|
170
181
|
const printRunManySummary = ({ failure, cancelled, }) => {
|
|
171
182
|
console.log('');
|
|
172
|
-
|
|
183
|
+
// Collect checklist lines to print after task outputs
|
|
184
|
+
const checklistLines = [];
|
|
185
|
+
// First pass: Print task outputs and collect checklist lines
|
|
173
186
|
for (const taskId of taskIdsInTheOrderTheyStart) {
|
|
174
187
|
const taskStatus = tasksToTaskStatus[taskId];
|
|
175
188
|
const terminalOutput = tasksToTerminalOutputs[taskId];
|
|
@@ -177,66 +190,82 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
|
|
|
177
190
|
if (!taskStatus) {
|
|
178
191
|
output_1.output.logCommandOutput(taskId, taskStatus, terminalOutput);
|
|
179
192
|
output_1.output.addNewline();
|
|
180
|
-
|
|
193
|
+
checklistLines.push(`${LEFT_PAD}${output_1.output.colors.cyan(figures.squareSmallFilled)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
|
|
181
194
|
}
|
|
182
195
|
else if (taskStatus === 'failure') {
|
|
183
196
|
output_1.output.logCommandOutput(taskId, taskStatus, terminalOutput);
|
|
184
197
|
output_1.output.addNewline();
|
|
185
|
-
|
|
198
|
+
checklistLines.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
|
|
199
|
+
}
|
|
200
|
+
else if (taskStatus === 'local-cache') {
|
|
201
|
+
checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId} ${output_1.output.dim('[local cache]')}`);
|
|
202
|
+
}
|
|
203
|
+
else if (taskStatus === 'local-cache-kept-existing') {
|
|
204
|
+
checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId} ${output_1.output.dim('[existing outputs match the cache, left as is]')}`);
|
|
205
|
+
}
|
|
206
|
+
else if (taskStatus === 'remote-cache') {
|
|
207
|
+
checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId} ${output_1.output.dim('[remote cache]')}`);
|
|
208
|
+
}
|
|
209
|
+
else if (taskStatus === 'success') {
|
|
210
|
+
checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
|
|
186
211
|
}
|
|
187
212
|
else {
|
|
188
|
-
|
|
213
|
+
checklistLines.push(`${LEFT_PAD}${output_1.output.colors.green(figures.tick)}${SPACER}${output_1.output.colors.gray('nx run ')}${taskId}`);
|
|
189
214
|
}
|
|
190
215
|
}
|
|
191
|
-
|
|
216
|
+
// Print all checklist lines together
|
|
217
|
+
console.log();
|
|
218
|
+
for (const line of checklistLines) {
|
|
219
|
+
console.log(line);
|
|
220
|
+
}
|
|
221
|
+
// Print vertical separator
|
|
222
|
+
const separatorLines = output_1.output.getVerticalSeparatorLines(failure ? 'red' : 'green');
|
|
223
|
+
for (const line of separatorLines) {
|
|
224
|
+
console.log(line);
|
|
225
|
+
}
|
|
192
226
|
if (totalSuccessfulTasks + stoppedTasks.size === totalTasks) {
|
|
193
|
-
const successSummaryRows = [];
|
|
194
227
|
const text = `Successfully ran ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
|
|
195
|
-
const
|
|
228
|
+
const successSummaryRows = [
|
|
229
|
+
output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim.white(` (${timeTakenText})`)),
|
|
230
|
+
];
|
|
196
231
|
const filteredOverrides = Object.entries(overrides).filter(
|
|
197
232
|
// Don't print the data passed through from the version subcommand to the publish executor options, it could be quite large and it's an implementation detail.
|
|
198
233
|
([flag]) => flag !== 'nxReleaseVersionData');
|
|
199
234
|
if (filteredOverrides.length > 0) {
|
|
200
|
-
|
|
201
|
-
|
|
235
|
+
successSummaryRows.push('');
|
|
236
|
+
successSummaryRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.green('With additional flags:')}`);
|
|
202
237
|
filteredOverrides
|
|
203
238
|
.map(([flag, value]) => output_1.output.dim.green((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
|
|
204
|
-
.forEach((arg) =>
|
|
239
|
+
.forEach((arg) => successSummaryRows.push(arg));
|
|
205
240
|
}
|
|
206
|
-
successSummaryRows.push(...[
|
|
207
|
-
output_1.output.applyNxPrefix('green', output_1.output.colors.green(text) + output_1.output.dim.white(` (${timeTakenText})`)),
|
|
208
|
-
...taskOverridesRows,
|
|
209
|
-
]);
|
|
210
241
|
if (totalCachedTasks > 0) {
|
|
211
242
|
successSummaryRows.push(output_1.output.dim(`${node_os_1.EOL}Nx read the output from the cache instead of running the command for ${totalCachedTasks} out of ${totalTasks} tasks.`));
|
|
212
243
|
}
|
|
213
|
-
|
|
244
|
+
console.log(successSummaryRows.join(node_os_1.EOL));
|
|
214
245
|
}
|
|
215
246
|
else {
|
|
216
247
|
const text = `${cancelled ? 'Cancelled while running' : 'Ran'} ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
|
|
217
|
-
const
|
|
248
|
+
const failureSummaryRows = [
|
|
249
|
+
output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim.white(` (${timeTakenText})`)),
|
|
250
|
+
];
|
|
218
251
|
const filteredOverrides = Object.entries(overrides).filter(
|
|
219
252
|
// Don't print the data passed through from the version subcommand to the publish executor options, it could be quite large and it's an implementation detail.
|
|
220
253
|
([flag]) => flag !== 'nxReleaseVersionData');
|
|
221
254
|
if (filteredOverrides.length > 0) {
|
|
222
|
-
|
|
223
|
-
|
|
255
|
+
failureSummaryRows.push('');
|
|
256
|
+
failureSummaryRows.push(`${EXTENDED_LEFT_PAD}${output_1.output.dim.red('With additional flags:')}`);
|
|
224
257
|
filteredOverrides
|
|
225
258
|
.map(([flag, value]) => output_1.output.dim.red((0, formatting_utils_1.formatFlags)(EXTENDED_LEFT_PAD, flag, value)))
|
|
226
|
-
.forEach((arg) =>
|
|
259
|
+
.forEach((arg) => failureSummaryRows.push(arg));
|
|
227
260
|
}
|
|
228
|
-
|
|
229
|
-
const failedTasksForPrinting = Array.from(failedTasks).slice(0, numFailedToPrint);
|
|
230
|
-
const failureSummaryRows = [
|
|
231
|
-
output_1.output.applyNxPrefix('red', output_1.output.colors.red(text) + output_1.output.dim.white(` (${timeTakenText})`)),
|
|
232
|
-
...taskOverridesRows,
|
|
233
|
-
'',
|
|
234
|
-
];
|
|
261
|
+
failureSummaryRows.push('');
|
|
235
262
|
if (totalCompletedTasks > 0) {
|
|
236
263
|
if (totalSuccessfulTasks > 0) {
|
|
237
264
|
failureSummaryRows.push(output_1.output.dim(`${LEFT_PAD}${output_1.output.dim(figures.tick)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output_1.output.dim(`[${totalCachedTasks} read from cache]`)}`), '');
|
|
238
265
|
}
|
|
239
266
|
if (totalFailedTasks > 0) {
|
|
267
|
+
const numFailedToPrint = 5;
|
|
268
|
+
const failedTasksForPrinting = Array.from(failedTasks).slice(0, numFailedToPrint);
|
|
240
269
|
failureSummaryRows.push(`${LEFT_PAD}${output_1.output.colors.red(figures.cross)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} targets failed, including the following:`, '', `${failedTasksForPrinting
|
|
241
270
|
.map((t) => `${EXTENDED_LEFT_PAD}${output_1.output.colors.red('-')} ${output_1.output.formatCommand(t.toString())}`)
|
|
242
271
|
.join('\n')}`, '');
|
|
@@ -256,12 +285,11 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, taskGraph, args,
|
|
|
256
285
|
}
|
|
257
286
|
}
|
|
258
287
|
failureSummaryRows.push(...(0, view_logs_utils_1.viewLogsFooterRows)(failedTasks.size));
|
|
259
|
-
lines.push(output_1.output.colors.red(failureSummaryRows.join(node_os_1.EOL)));
|
|
260
288
|
}
|
|
289
|
+
console.log(output_1.output.colors.red(failureSummaryRows.join(node_os_1.EOL)));
|
|
261
290
|
}
|
|
262
291
|
// adds some vertical space after the summary to avoid bunching against terminal
|
|
263
|
-
|
|
264
|
-
console.log(lines.join(node_os_1.EOL));
|
|
292
|
+
console.log('');
|
|
265
293
|
};
|
|
266
|
-
return { lifeCycle, printSummary };
|
|
294
|
+
return { lifeCycle: lifeCycle, printSummary };
|
|
267
295
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Tree } from '../../generators/tree';
|
|
2
2
|
import type { CatalogManager } from './manager';
|
|
3
3
|
import { getCatalogManager } from './manager-factory';
|
|
4
|
-
export { getCatalogManager };
|
|
4
|
+
export { type CatalogManager, getCatalogManager };
|
|
5
5
|
/**
|
|
6
6
|
* Detects which packages in a package.json use catalog references
|
|
7
7
|
* Returns Map of package name -> catalog name (undefined for default catalog)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,KAAK,cAAc,EAAE,iBAAiB,EAAE,CAAC;AAElD;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,cAAc,GACtB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CA+BjC"}
|
|
@@ -8,6 +8,7 @@ export interface CatalogManager {
|
|
|
8
8
|
readonly name: string;
|
|
9
9
|
isCatalogReference(version: string): boolean;
|
|
10
10
|
parseCatalogReference(version: string): CatalogReference | null;
|
|
11
|
+
getCatalogDefinitionFilePaths(): string[];
|
|
11
12
|
/**
|
|
12
13
|
* Get catalog definitions from the workspace.
|
|
13
14
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAE7C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAEhE;;OAEG;IACH,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAAC;IACvE,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAE5D;;OAEG;IACH,uBAAuB,CACrB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IACjB,uBAAuB,CACrB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IAEjB;;OAEG;IACH,wBAAwB,CACtB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IACR,wBAAwB,CACtB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IAER;;OAEG;IACH,qBAAqB,CACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;IACR,qBAAqB,CACnB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;CACT"}
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAE7C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAEhE,6BAA6B,IAAI,MAAM,EAAE,CAAC;IAE1C;;OAEG;IACH,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAAC;IACvE,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAE5D;;OAEG;IACH,uBAAuB,CACrB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IACjB,uBAAuB,CACrB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAAC;IAEjB;;OAEG;IACH,wBAAwB,CACtB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IACR,wBAAwB,CACtB,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI,CAAC;IAER;;OAEG;IACH,qBAAqB,CACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;IACR,qBAAqB,CACnB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI,CAAC;CACT"}
|
|
@@ -10,6 +10,7 @@ export declare class PnpmCatalogManager implements CatalogManager {
|
|
|
10
10
|
readonly catalogProtocol = "catalog:";
|
|
11
11
|
isCatalogReference(version: string): boolean;
|
|
12
12
|
parseCatalogReference(version: string): CatalogReference | null;
|
|
13
|
+
getCatalogDefinitionFilePaths(): string[];
|
|
13
14
|
getCatalogDefinitions(treeOrRoot: Tree | string): PnpmWorkspaceYaml | null;
|
|
14
15
|
resolveCatalogReference(treeOrRoot: Tree | string, packageName: string, version: string): string | null;
|
|
15
16
|
validateCatalogReference(treeOrRoot: Tree | string, packageName: string, version: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpm-manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/pnpm-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAGlD,OAAO,KAAK,EAAoB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,eAAe,cAAc;IAEtC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI5C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAe/D,qBAAqB,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAe1E,uBAAuB,CACrB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI;IAuBhB,wBAAwB,CACtB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI;IA0HP,qBAAqB,CACnB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI;CAgFR"}
|
|
1
|
+
{"version":3,"file":"pnpm-manager.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/catalog/pnpm-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAGlD,OAAO,KAAK,EAAoB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,eAAe,cAAc;IAEtC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI5C,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAe/D,6BAA6B,IAAI,MAAM,EAAE;IAIzC,qBAAqB,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAe1E,uBAAuB,CACrB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI;IAuBhB,wBAAwB,CACtB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,IAAI;IA0HP,qBAAqB,CACnB,UAAU,EAAE,IAAI,GAAG,MAAM,EACzB,OAAO,EAAE,KAAK,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,GACD,IAAI;CAgFR"}
|
|
@@ -29,6 +29,9 @@ class PnpmCatalogManager {
|
|
|
29
29
|
isDefaultCatalog: isDefault,
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
|
+
getCatalogDefinitionFilePaths() {
|
|
33
|
+
return ['pnpm-workspace.yaml'];
|
|
34
|
+
}
|
|
32
35
|
getCatalogDefinitions(treeOrRoot) {
|
|
33
36
|
if (typeof treeOrRoot === 'string') {
|
|
34
37
|
const pnpmWorkspacePath = (0, node_path_1.join)(treeOrRoot, 'pnpm-workspace.yaml');
|