nx 24.0.2 → 24.0.4
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/dist/bin/nx-cloud.js +9 -0
- package/dist/release/changelog-renderer/index.js +12 -5
- package/dist/src/ai/clone-ai-config-repo.d.ts +2 -1
- package/dist/src/ai/clone-ai-config-repo.js +48 -11
- package/dist/src/ai/set-up-ai-agents/set-up-ai-agents.js +37 -8
- package/dist/src/analytics/analytics.js +7 -2
- package/dist/src/command-line/ai/ai-output.js +3 -3
- package/dist/src/command-line/configure-ai-agents/configure-ai-agents.js +2 -2
- package/dist/src/command-line/graph/graph.d.ts +10 -0
- package/dist/src/command-line/graph/graph.js +61 -2
- package/dist/src/command-line/import/import.js +18 -30
- package/dist/src/command-line/import/utils/merge-remote-source.d.ts +1 -0
- package/dist/src/command-line/import/utils/merge-remote-source.js +10 -1
- package/dist/src/command-line/init/implementation/angular/legacy-angular-versions.js +17 -5
- package/dist/src/command-line/init/init-v1.js +2 -2
- package/dist/src/command-line/init/init-v2.js +4 -4
- package/dist/src/command-line/migrate/migrate-analytics.js +2 -2
- package/dist/src/command-line/migrate/migrate.d.ts +3 -0
- package/dist/src/command-line/migrate/migrate.js +40 -22
- package/dist/src/command-line/migrate/workspace-installation.d.ts +15 -0
- package/dist/src/command-line/migrate/workspace-installation.js +73 -0
- package/dist/src/command-line/nx-cloud/complete-run/command-object.js +1 -1
- package/dist/src/command-line/nx-cloud/fix-ci/command-object.js +1 -1
- package/dist/src/command-line/nx-cloud/logout/command-object.js +11 -2
- package/dist/src/command-line/nx-cloud/record/command-object.js +1 -1
- package/dist/src/command-line/nx-cloud/record/record.js +3 -2
- package/dist/src/command-line/nx-cloud/start-ci-run/command-object.js +1 -1
- package/dist/src/command-line/nx-cloud/start-nx-agents/command-object.js +1 -1
- package/dist/src/command-line/nx-commands.js +3 -1
- package/dist/src/command-line/release/changelog/version-plan-filtering.js +4 -1
- package/dist/src/command-line/release/changelog.js +8 -3
- package/dist/src/command-line/release/config/version-plans.js +29 -29
- package/dist/src/command-line/release/utils/git.d.ts +2 -0
- package/dist/src/command-line/release/utils/git.js +49 -26
- package/dist/src/command-line/release/utils/markdown.js +4 -1
- package/dist/src/command-line/release/utils/remote-release-clients/github.js +18 -7
- package/dist/src/command-line/release/utils/remote-release-clients/gitlab.js +3 -1
- package/dist/src/command-line/release/version/derive-specifier-from-conventional-commits.js +1 -1
- package/dist/src/command-line/release/version/version-actions.js +2 -1
- package/dist/src/command-line/release/version.js +2 -1
- package/dist/src/command-line/show/show-target/info.d.ts +1 -1
- package/dist/src/command-line/show/show-target/info.js +4 -4
- package/dist/src/core/graph/favicon.ico +0 -0
- package/dist/src/core/graph/main.js +1 -1
- package/dist/src/core/graph/styles.js +1 -1
- package/dist/src/daemon/server/latest-nx.js +2 -2
- package/dist/src/daemon/server/project-graph-incremental-recomputation.js +3 -1
- package/dist/src/executors/run-commands/running-tasks.js +7 -0
- package/dist/src/executors/run-commands/schema.json +1 -1
- package/dist/src/hasher/native-task-hasher-impl.js +5 -2
- package/dist/src/native/index.d.ts +11 -1
- package/dist/src/native/index.js +12 -17
- package/dist/src/native/nx.wasm32-wasi.debug.wasm +0 -0
- package/dist/src/native/nx.wasm32-wasi.wasm +0 -0
- package/dist/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js +5 -6
- package/dist/src/nx-cloud/update-manager.d.ts +2 -0
- package/dist/src/nx-cloud/utilities/client.d.ts +1 -0
- package/dist/src/nx-cloud/utilities/client.js +5 -0
- package/dist/src/nx-cloud/utilities/get-cloud-options.d.ts +1 -1
- package/dist/src/nx-cloud/utilities/get-cloud-options.js +5 -2
- package/dist/src/nx-cloud/utilities/is-workspace-claimed.js +1 -1
- package/dist/src/nx-cloud/utilities/url-shorten.d.ts +1 -1
- package/dist/src/nx-cloud/utilities/url-shorten.js +4 -4
- package/dist/src/plugins/js/lock-file/yarn-parser.js +49 -2
- package/dist/src/plugins/js/project-graph/build-dependencies/build-dependencies.js +2 -1
- package/dist/src/plugins/js/utils/register.js +3 -2
- package/dist/src/plugins/js/utils/typescript.js +3 -2
- package/dist/src/project-graph/utils/retrieve-workspace-files.js +2 -2
- package/dist/src/tasks-runner/cache.js +24 -8
- package/dist/src/tasks-runner/default-tasks-runner.js +21 -13
- package/dist/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +34 -13
- package/dist/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js +26 -5
- package/dist/src/tasks-runner/life-cycles/performance-report.js +2 -2
- package/dist/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +1 -1
- package/dist/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js +1 -1
- package/dist/src/tasks-runner/life-cycles/summary-terminal-output-life-cycle.js +3 -3
- package/dist/src/tasks-runner/life-cycles/tui-summary-life-cycle.js +76 -39
- package/dist/src/tasks-runner/running-tasks/batch-process.d.ts +2 -2
- package/dist/src/tasks-runner/running-tasks/batch-process.js +1 -1
- package/dist/src/tasks-runner/task-orchestrator.d.ts +6 -3
- package/dist/src/tasks-runner/task-orchestrator.js +61 -29
- package/dist/src/utils/git-utils.js +3 -3
- package/dist/src/utils/git-utils.tree-filter.js +102 -24
- package/dist/src/utils/installation-directory.d.ts +8 -0
- package/dist/src/utils/installation-directory.js +13 -0
- package/dist/src/utils/package-manager.d.ts +9 -3
- package/dist/src/utils/package-manager.js +64 -34
- package/dist/src/utils/provenance.d.ts +14 -1
- package/dist/src/utils/provenance.js +44 -13
- package/dist/src/utils/redact-url-credentials.d.ts +1 -0
- package/dist/src/utils/redact-url-credentials.js +7 -0
- package/dist/src/utils/workspace-id.d.ts +4 -3
- package/dist/src/utils/workspace-id.js +4 -3
- package/package.json +12 -12
|
@@ -8,6 +8,8 @@ export interface RawGitCommit {
|
|
|
8
8
|
body: string;
|
|
9
9
|
shortHash: string;
|
|
10
10
|
author: GitCommitAuthor;
|
|
11
|
+
/** Git's --name-status output, free of commit-author text. */
|
|
12
|
+
nameStatus?: string;
|
|
11
13
|
}
|
|
12
14
|
export interface Reference {
|
|
13
15
|
type: 'hash' | 'issue' | 'pull-request';
|
|
@@ -23,6 +23,8 @@ exports.getFirstProjectCommit = getFirstProjectCommit;
|
|
|
23
23
|
const node_path_1 = require("node:path");
|
|
24
24
|
const semver_1 = require("semver");
|
|
25
25
|
const interpolate_release_config_1 = require("./interpolate-release-config");
|
|
26
|
+
const git_revision_1 = require("../../../utils/git-revision");
|
|
27
|
+
const redact_url_credentials_1 = require("../../../utils/redact-url-credentials");
|
|
26
28
|
const workspace_root_1 = require("../../../utils/workspace-root");
|
|
27
29
|
const exec_command_1 = require("./exec-command");
|
|
28
30
|
const shared_1 = require("./shared");
|
|
@@ -189,6 +191,10 @@ async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolat
|
|
|
189
191
|
}
|
|
190
192
|
}
|
|
191
193
|
async function getGitDiff(from, to = 'HEAD') {
|
|
194
|
+
if (from) {
|
|
195
|
+
(0, git_revision_1.assertValidGitRevision)(from);
|
|
196
|
+
}
|
|
197
|
+
(0, git_revision_1.assertValidGitRevision)(to);
|
|
192
198
|
let range = '';
|
|
193
199
|
if (!from || from === to) {
|
|
194
200
|
range = to;
|
|
@@ -196,15 +202,15 @@ async function getGitDiff(from, to = 'HEAD') {
|
|
|
196
202
|
else {
|
|
197
203
|
range = `${from}..${to}`;
|
|
198
204
|
}
|
|
199
|
-
//
|
|
200
|
-
|
|
201
|
-
const
|
|
205
|
+
// Git rejects NUL in commit messages, so commit text cannot forge a field boundary.
|
|
206
|
+
// Each commit prints a fixed number of fields; --name-status lands in the last one.
|
|
207
|
+
const fieldsPerCommit = 6;
|
|
202
208
|
// https://git-scm.com/docs/pretty-formats
|
|
203
209
|
const args = [
|
|
204
210
|
'--no-pager',
|
|
205
211
|
'log',
|
|
206
212
|
range,
|
|
207
|
-
`--pretty="
|
|
213
|
+
`--pretty="%x00%s%x00%h%x00%an%x00%ae%x00%b"%x00`,
|
|
208
214
|
'--name-status',
|
|
209
215
|
];
|
|
210
216
|
// Support cases where the nx workspace root is located at a nested path within the git repo
|
|
@@ -213,20 +219,19 @@ async function getGitDiff(from, to = 'HEAD') {
|
|
|
213
219
|
args.push(`--relative=${relativePath}`);
|
|
214
220
|
}
|
|
215
221
|
const r = await (0, exec_command_1.execCommand)('git', args);
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
.
|
|
220
|
-
|
|
221
|
-
const [message, shortHash, authorName, authorEmail] = firstLine.split(commitMetadataSeparator);
|
|
222
|
-
const r = {
|
|
222
|
+
const fields = r.split('\0').slice(1);
|
|
223
|
+
const commits = [];
|
|
224
|
+
for (let i = 0; i + fieldsPerCommit <= fields.length; i += fieldsPerCommit) {
|
|
225
|
+
const [message, shortHash, authorName, authorEmail, body, nameStatus] = fields.slice(i, i + fieldsPerCommit);
|
|
226
|
+
commits.push({
|
|
223
227
|
message,
|
|
224
228
|
shortHash,
|
|
225
229
|
author: { name: authorName, email: authorEmail },
|
|
226
|
-
body:
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
}
|
|
230
|
+
body: body + nameStatus,
|
|
231
|
+
nameStatus,
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
return commits;
|
|
230
235
|
}
|
|
231
236
|
async function getChangedTrackedFiles(cwd) {
|
|
232
237
|
const result = await (0, exec_command_1.execCommand)('git', ['status', '--porcelain'], {
|
|
@@ -394,7 +399,7 @@ async function gitPush({ gitRemote, dryRun, verbose, additionalArgs, }) {
|
|
|
394
399
|
console.log(dryRun
|
|
395
400
|
? `Would push the current branch to the remote with the following command, but --dry-run was set:`
|
|
396
401
|
: `Pushing the current branch to the remote with the following command:`);
|
|
397
|
-
console.log(`git ${commandArgs.join(' ')}`);
|
|
402
|
+
console.log((0, redact_url_credentials_1.redactUrlCredentials)(`git ${commandArgs.join(' ')}`));
|
|
398
403
|
}
|
|
399
404
|
if (dryRun) {
|
|
400
405
|
return;
|
|
@@ -403,7 +408,7 @@ async function gitPush({ gitRemote, dryRun, verbose, additionalArgs, }) {
|
|
|
403
408
|
await (0, exec_command_1.execCommand)('git', commandArgs);
|
|
404
409
|
}
|
|
405
410
|
catch (err) {
|
|
406
|
-
throw new Error(`Unexpected git push error: ${err}`);
|
|
411
|
+
throw new Error((0, redact_url_credentials_1.redactUrlCredentials)(`Unexpected git push error: ${err}`));
|
|
407
412
|
}
|
|
408
413
|
}
|
|
409
414
|
function parseCommits(commits) {
|
|
@@ -459,18 +464,36 @@ function extractReferencesFromCommit(commit) {
|
|
|
459
464
|
function getAllAuthorsForCommit(commit) {
|
|
460
465
|
const authors = [commit.author];
|
|
461
466
|
// Additional authors can be specified in the commit body (depending on the VCS provider)
|
|
462
|
-
for (const
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
}
|
|
467
|
+
for (const line of commit.body.split(LineTerminatorRE)) {
|
|
468
|
+
const coAuthor = parseCoAuthoredByLine(line);
|
|
469
|
+
if (coAuthor) {
|
|
470
|
+
authors.push(coAuthor);
|
|
471
|
+
}
|
|
467
472
|
}
|
|
468
473
|
return authors;
|
|
469
474
|
}
|
|
475
|
+
// Parsed with string scans rather than a regex to stay linear on long lines.
|
|
476
|
+
function parseCoAuthoredByLine(line) {
|
|
477
|
+
const prefix = CoAuthoredByRE.exec(line);
|
|
478
|
+
if (!prefix) {
|
|
479
|
+
return null;
|
|
480
|
+
}
|
|
481
|
+
const value = line.slice(prefix.index + prefix[0].length);
|
|
482
|
+
const emailEnd = value.lastIndexOf('>');
|
|
483
|
+
const emailStart = emailEnd < 2 ? -1 : value.lastIndexOf('<', emailEnd - 2);
|
|
484
|
+
if (emailStart < 1) {
|
|
485
|
+
return null;
|
|
486
|
+
}
|
|
487
|
+
return {
|
|
488
|
+
name: value.slice(0, emailStart).trim(),
|
|
489
|
+
email: value.slice(emailStart + 1, emailEnd).trim(),
|
|
490
|
+
};
|
|
491
|
+
}
|
|
470
492
|
// https://www.conventionalcommits.org/en/v1.0.0/
|
|
471
493
|
// https://regex101.com/r/FSfNvA/1
|
|
472
494
|
const ConventionalCommitRegex = /^(?<type>[^\s():!]+)(?:\s*\((?<scope>.+)\))?(?<breaking>!)?: (?<description>.+)$/u;
|
|
473
|
-
const
|
|
495
|
+
const CoAuthoredByRE = /co-authored-by:/i;
|
|
496
|
+
const LineTerminatorRE = /\r\n|[\n\r\u2028\u2029]/;
|
|
474
497
|
// GitHub style PR references
|
|
475
498
|
const PullRequestRE = /\([ a-z]*(#\d+)\s*\)/gm;
|
|
476
499
|
// GitLab style merge request references
|
|
@@ -511,8 +534,7 @@ function parseGitCommit(commit) {
|
|
|
511
534
|
}
|
|
512
535
|
// Find all authors
|
|
513
536
|
const authors = getAllAuthorsForCommit(commit);
|
|
514
|
-
|
|
515
|
-
const affectedFiles = Array.from(commit.body.matchAll(ChangedFileRegex)).reduce((prev, [fullLine, changeType, file1, file2]) =>
|
|
537
|
+
const affectedFiles = Array.from((commit.nameStatus ?? '').matchAll(ChangedFileRegex)).reduce((prev, [fullLine, changeType, file1, file2]) =>
|
|
516
538
|
// file2 only exists for some change types, such as renames
|
|
517
539
|
file2 ? [...prev, file1, file2] : [...prev, file1], []);
|
|
518
540
|
return {
|
|
@@ -528,8 +550,9 @@ function parseGitCommit(commit) {
|
|
|
528
550
|
};
|
|
529
551
|
}
|
|
530
552
|
async function getCommitHash(ref) {
|
|
553
|
+
(0, git_revision_1.assertValidGitRevision)(ref);
|
|
531
554
|
try {
|
|
532
|
-
return (await (0, exec_command_1.execCommand)('git', ['rev-parse', ref])).trim();
|
|
555
|
+
return (await (0, exec_command_1.execCommand)('git', ['rev-parse', '--verify', ref])).trim();
|
|
533
556
|
}
|
|
534
557
|
catch (e) {
|
|
535
558
|
throw new Error(`Unknown revision: ${ref}`);
|
|
@@ -6,8 +6,11 @@ function parseChangelogMarkdown(contents) {
|
|
|
6
6
|
* The release header may include prerelease identifiers (e.g., -alpha.13),
|
|
7
7
|
* and major releases may use a single #, instead of the standard ## used
|
|
8
8
|
* for minor and patch releases. This regex matches all of these cases.
|
|
9
|
+
*
|
|
10
|
+
* Headings must follow a \n. The m flag would also match after \r, U+2028
|
|
11
|
+
* and U+2029, which commit text can carry mid-line.
|
|
9
12
|
*/
|
|
10
|
-
const CHANGELOG_RELEASE_HEAD_RE = new RegExp('
|
|
13
|
+
const CHANGELOG_RELEASE_HEAD_RE = new RegExp('(?<=^|\\n)#+\\s*\\[?(\\d+\\.\\d+\\.\\d+(?:-[a-zA-Z0-9\\.]+)?)\\]?', 'g');
|
|
11
14
|
const headings = [...contents.matchAll(CHANGELOG_RELEASE_HEAD_RE)];
|
|
12
15
|
const releases = [];
|
|
13
16
|
for (let i = 0; i < headings.length; i++) {
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GithubRemoteReleaseClient = exports.defaultCreateReleaseProvider = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const node_util_1 = require("node:util");
|
|
5
6
|
const pc = tslib_1.__importStar(require("picocolors"));
|
|
6
7
|
const prompt_helpers_1 = require("../../../../utils/prompt-helpers");
|
|
7
8
|
const node_child_process_1 = require("node:child_process");
|
|
@@ -9,10 +10,18 @@ const native_1 = require("../../../../native");
|
|
|
9
10
|
const node_fs_1 = require("node:fs");
|
|
10
11
|
const node_os_1 = require("node:os");
|
|
11
12
|
const output_1 = require("../../../../utils/output");
|
|
13
|
+
const redact_url_credentials_1 = require("../../../../utils/redact-url-credentials");
|
|
12
14
|
const path_1 = require("../../../../utils/path");
|
|
13
15
|
const extract_repo_slug_1 = require("./extract-repo-slug");
|
|
14
16
|
const remote_release_client_1 = require("./remote-release-client");
|
|
15
17
|
const http_client_1 = require("../../../../utils/http-client");
|
|
18
|
+
// Logins, plus the "_shortcode" suffix of Enterprise Managed Users and "[bot]".
|
|
19
|
+
const GithubUsernameRegex = /^[a-z\d_-]+(?:\[bot\])?$/i;
|
|
20
|
+
function toGithubUsername(value) {
|
|
21
|
+
return typeof value === 'string' && GithubUsernameRegex.test(value)
|
|
22
|
+
? value
|
|
23
|
+
: null;
|
|
24
|
+
}
|
|
16
25
|
exports.defaultCreateReleaseProvider = {
|
|
17
26
|
provider: 'github',
|
|
18
27
|
hostname: 'github.com',
|
|
@@ -51,7 +60,7 @@ class GithubRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
|
|
|
51
60
|
}
|
|
52
61
|
catch (error) {
|
|
53
62
|
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
54
|
-
console.error(error);
|
|
63
|
+
console.error((0, redact_url_credentials_1.redactUrlCredentials)((0, node_util_1.inspect)(error)));
|
|
55
64
|
}
|
|
56
65
|
return null;
|
|
57
66
|
}
|
|
@@ -80,7 +89,7 @@ class GithubRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
|
|
|
80
89
|
if (ghCLIConfig[hostname].user &&
|
|
81
90
|
(ghCLIConfig[hostname].git_protocol === 'ssh' ||
|
|
82
91
|
ghCLIConfig[hostname].git_protocol === 'https')) {
|
|
83
|
-
const token = (0, node_child_process_1.
|
|
92
|
+
const token = (0, node_child_process_1.execFileSync)('gh', ['auth', 'token', '--hostname', hostname], {
|
|
84
93
|
encoding: 'utf8',
|
|
85
94
|
stdio: 'pipe',
|
|
86
95
|
windowsHide: true,
|
|
@@ -112,14 +121,16 @@ class GithubRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
|
|
|
112
121
|
}
|
|
113
122
|
if (email.endsWith('@users.noreply.github.com')) {
|
|
114
123
|
const match = email.match(/^(\d+\+)?([^@]+)@users\.noreply\.github\.com$/);
|
|
115
|
-
|
|
116
|
-
|
|
124
|
+
const usernameFromEmail = toGithubUsername(match?.[2]);
|
|
125
|
+
if (usernameFromEmail) {
|
|
126
|
+
meta.username = usernameFromEmail;
|
|
117
127
|
break;
|
|
118
128
|
}
|
|
119
129
|
}
|
|
120
130
|
const { data } = await (0, http_client_1.httpRequest)(`https://ungh.cc/users/find/${email}`).catch(() => ({ data: { user: null } }));
|
|
121
|
-
|
|
122
|
-
|
|
131
|
+
const usernameFromUngh = toGithubUsername(data?.user?.username);
|
|
132
|
+
if (usernameFromUngh) {
|
|
133
|
+
meta.username = usernameFromUngh;
|
|
123
134
|
break;
|
|
124
135
|
}
|
|
125
136
|
const usernameFromGhCli = this.resolveUsernameFromGhCli(email);
|
|
@@ -152,7 +163,7 @@ class GithubRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
|
|
|
152
163
|
return null;
|
|
153
164
|
}
|
|
154
165
|
const data = JSON.parse(stdout);
|
|
155
|
-
return data.items?.[0]?.login
|
|
166
|
+
return toGithubUsername(data.items?.[0]?.login);
|
|
156
167
|
}
|
|
157
168
|
catch (error) {
|
|
158
169
|
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GitLabRemoteReleaseClient = exports.defaultCreateReleaseProvider = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const node_util_1 = require("node:util");
|
|
5
6
|
const pc = tslib_1.__importStar(require("picocolors"));
|
|
6
7
|
const prompt_helpers_1 = require("../../../../utils/prompt-helpers");
|
|
7
8
|
const node_child_process_1 = require("node:child_process");
|
|
8
9
|
const native_1 = require("../../../../native");
|
|
9
10
|
const output_1 = require("../../../../utils/output");
|
|
11
|
+
const redact_url_credentials_1 = require("../../../../utils/redact-url-credentials");
|
|
10
12
|
const extract_repo_slug_1 = require("./extract-repo-slug");
|
|
11
13
|
const remote_release_client_1 = require("./remote-release-client");
|
|
12
14
|
exports.defaultCreateReleaseProvider = {
|
|
@@ -54,7 +56,7 @@ class GitLabRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
|
|
|
54
56
|
}
|
|
55
57
|
catch (err) {
|
|
56
58
|
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
57
|
-
console.error(err);
|
|
59
|
+
console.error((0, redact_url_credentials_1.redactUrlCredentials)((0, node_util_1.inspect)(err)));
|
|
58
60
|
}
|
|
59
61
|
return null;
|
|
60
62
|
}
|
|
@@ -18,7 +18,7 @@ isPrerelease, latestMatchingGitTag, releaseGraph, fallbackCurrentVersionResolver
|
|
|
18
18
|
// In this case, use the first commit that touched this project rather than the repo's first commit,
|
|
19
19
|
// to avoid scanning the entire git history for projects that were added after the repo was created.
|
|
20
20
|
const previousVersionRef = latestMatchingGitTag
|
|
21
|
-
? latestMatchingGitTag.tag
|
|
21
|
+
? `refs/tags/${latestMatchingGitTag.tag}`
|
|
22
22
|
: fallbackCurrentVersionResolver === 'disk'
|
|
23
23
|
? await (0, git_1.getFirstProjectCommit)(projectGraphNode.data.root)
|
|
24
24
|
: undefined;
|
|
@@ -6,13 +6,14 @@ const node_path_1 = require("node:path");
|
|
|
6
6
|
const register_1 = require("../../../plugins/js/utils/register");
|
|
7
7
|
const utils_1 = require("../../../tasks-runner/utils");
|
|
8
8
|
const interpolate_release_config_1 = require("../utils/interpolate-release-config");
|
|
9
|
+
const installation_directory_1 = require("../../../utils/installation-directory");
|
|
9
10
|
const workspace_root_1 = require("../../../utils/workspace-root");
|
|
10
11
|
const config_1 = require("../config/config");
|
|
11
12
|
const semver_1 = require("../utils/semver");
|
|
12
13
|
const release_group_processor_1 = require("./release-group-processor");
|
|
13
14
|
function resolveVersionActionsPath(path, projectGraphNode) {
|
|
14
15
|
try {
|
|
15
|
-
return
|
|
16
|
+
return (0, installation_directory_1.resolveFromWorkspace)(path);
|
|
16
17
|
}
|
|
17
18
|
catch {
|
|
18
19
|
try {
|
|
@@ -15,6 +15,7 @@ const file_map_utils_1 = require("../../project-graph/file-map-utils");
|
|
|
15
15
|
const project_graph_1 = require("../../project-graph/project-graph");
|
|
16
16
|
const handle_errors_1 = require("../../utils/handle-errors");
|
|
17
17
|
const output_1 = require("../../utils/output");
|
|
18
|
+
const redact_url_credentials_1 = require("../../utils/redact-url-credentials");
|
|
18
19
|
const path_1 = require("../../utils/path");
|
|
19
20
|
const workspace_root_1 = require("../../utils/workspace-root");
|
|
20
21
|
const config_1 = require("./config/config");
|
|
@@ -291,7 +292,7 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
|
|
|
291
292
|
}
|
|
292
293
|
}
|
|
293
294
|
if (args.gitPush ?? nxReleaseConfig.version.git.push) {
|
|
294
|
-
output_1.output.logSingleLine(`Pushing to git remote "${args.gitRemote ?? 'origin'}"`);
|
|
295
|
+
output_1.output.logSingleLine(`Pushing to git remote "${(0, redact_url_credentials_1.redactUrlCredentials)(args.gitRemote ?? 'origin')}"`);
|
|
295
296
|
await (0, git_1.gitPush)({
|
|
296
297
|
gitRemote: args.gitRemote,
|
|
297
298
|
dryRun: args.dryRun,
|
|
@@ -14,7 +14,7 @@ declare function resolveTargetInfoData(t: ResolvedTarget): {
|
|
|
14
14
|
customHasher?: boolean;
|
|
15
15
|
dependsOn?: string[];
|
|
16
16
|
_depSources?: number[];
|
|
17
|
-
|
|
17
|
+
continuousDependencies?: Record<string, {
|
|
18
18
|
inputsHashed: boolean;
|
|
19
19
|
waitsForReady: boolean;
|
|
20
20
|
}>;
|
|
@@ -69,7 +69,7 @@ function resolveTargetInfoData(t) {
|
|
|
69
69
|
? {
|
|
70
70
|
dependsOn,
|
|
71
71
|
_depSources: depSourceIndices,
|
|
72
|
-
|
|
72
|
+
continuousDependencies: continuousDeps,
|
|
73
73
|
}
|
|
74
74
|
: {}),
|
|
75
75
|
...(transitiveTasks.length > 0 ? { transitiveTasks } : {}),
|
|
@@ -326,7 +326,7 @@ function describeReadyCheck(readyWhen) {
|
|
|
326
326
|
function renderTargetInfo(data, args) {
|
|
327
327
|
if (args.json) {
|
|
328
328
|
// Strip internal renderer-only fields from JSON output
|
|
329
|
-
const { _inputSources, _depSources, _commandSourceKey,
|
|
329
|
+
const { _inputSources, _depSources, _commandSourceKey, ultracacheMode, ultracacheInCI, ...jsonData } = data;
|
|
330
330
|
console.log(JSON.stringify(jsonData, null, 2));
|
|
331
331
|
return;
|
|
332
332
|
}
|
|
@@ -370,7 +370,7 @@ function renderTargetInfo(data, args) {
|
|
|
370
370
|
const hint = srcIdx !== undefined && srcIdx >= 0
|
|
371
371
|
? sourceHint(`dependsOn.${srcIdx}`, 'dependsOn')
|
|
372
372
|
: sourceHint('dependsOn');
|
|
373
|
-
const continuousDep = data.
|
|
373
|
+
const continuousDep = data.continuousDependencies?.[data.dependsOn[i]];
|
|
374
374
|
const note = continuousDep
|
|
375
375
|
? ` ${c.dim(continuousDep.waitsForReady
|
|
376
376
|
? '(continuous, waits for ready)'
|
|
@@ -392,7 +392,7 @@ function renderTargetInfo(data, args) {
|
|
|
392
392
|
const notice = (0, ci_status_1.ultracacheInCINotice)(data.ultracacheInCI, (0, ci_status_1.hasAlwaysInput)(data.inputs));
|
|
393
393
|
console.log(`${c.bold('Ultracache')}: ${notice} ${(0, ci_status_1.ultracacheDocsLink)()}`);
|
|
394
394
|
}
|
|
395
|
-
const hashedContinuousDeps = Object.entries(data.
|
|
395
|
+
const hashedContinuousDeps = Object.entries(data.continuousDependencies ?? {})
|
|
396
396
|
.filter(([, { inputsHashed }]) => inputsHashed)
|
|
397
397
|
.map(([depId]) => depId);
|
|
398
398
|
if (data.inputs?.length || hashedContinuousDeps.length) {
|
|
Binary file
|