nx 21.4.0-beta.3 → 21.4.0-beta.5
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/package.json +11 -11
- package/src/adapter/compat.d.ts +2 -2
- package/src/adapter/compat.d.ts.map +1 -1
- package/src/adapter/compat.js +3 -0
- package/src/command-line/release/changelog.js +1 -0
- package/src/command-line/release/command-object.d.ts +5 -3
- package/src/command-line/release/command-object.d.ts.map +1 -1
- package/src/command-line/release/command-object.js +10 -8
- package/src/command-line/release/config/config.d.ts.map +1 -1
- package/src/command-line/release/config/config.js +22 -13
- package/src/command-line/release/utils/resolve-nx-json-error-message.js +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/core/graph/styles.css +1 -1
- package/src/core/graph/styles.js +1 -1
- package/src/native/nx.wasi-browser.js +42 -39
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/js/lock-file/project-graph-pruning.d.ts.map +1 -1
- package/src/plugins/js/lock-file/project-graph-pruning.js +3 -1
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "nx",
|
3
|
-
"version": "21.4.0-beta.
|
3
|
+
"version": "21.4.0-beta.5",
|
4
4
|
"private": false,
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
6
6
|
"repository": {
|
@@ -83,16 +83,16 @@
|
|
83
83
|
}
|
84
84
|
},
|
85
85
|
"optionalDependencies": {
|
86
|
-
"@nx/nx-darwin-arm64": "21.4.0-beta.
|
87
|
-
"@nx/nx-darwin-x64": "21.4.0-beta.
|
88
|
-
"@nx/nx-freebsd-x64": "21.4.0-beta.
|
89
|
-
"@nx/nx-linux-arm-gnueabihf": "21.4.0-beta.
|
90
|
-
"@nx/nx-linux-arm64-gnu": "21.4.0-beta.
|
91
|
-
"@nx/nx-linux-arm64-musl": "21.4.0-beta.
|
92
|
-
"@nx/nx-linux-x64-gnu": "21.4.0-beta.
|
93
|
-
"@nx/nx-linux-x64-musl": "21.4.0-beta.
|
94
|
-
"@nx/nx-win32-arm64-msvc": "21.4.0-beta.
|
95
|
-
"@nx/nx-win32-x64-msvc": "21.4.0-beta.
|
86
|
+
"@nx/nx-darwin-arm64": "21.4.0-beta.5",
|
87
|
+
"@nx/nx-darwin-x64": "21.4.0-beta.5",
|
88
|
+
"@nx/nx-freebsd-x64": "21.4.0-beta.5",
|
89
|
+
"@nx/nx-linux-arm-gnueabihf": "21.4.0-beta.5",
|
90
|
+
"@nx/nx-linux-arm64-gnu": "21.4.0-beta.5",
|
91
|
+
"@nx/nx-linux-arm64-musl": "21.4.0-beta.5",
|
92
|
+
"@nx/nx-linux-x64-gnu": "21.4.0-beta.5",
|
93
|
+
"@nx/nx-linux-x64-musl": "21.4.0-beta.5",
|
94
|
+
"@nx/nx-win32-arm64-msvc": "21.4.0-beta.5",
|
95
|
+
"@nx/nx-win32-x64-msvc": "21.4.0-beta.5"
|
96
96
|
},
|
97
97
|
"nx-migrations": {
|
98
98
|
"migrations": "./migrations.json",
|
package/src/adapter/compat.d.ts
CHANGED
@@ -1,3 +1,3 @@
|
|
1
|
-
export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata"];
|
2
|
-
export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache", "maxCacheSize", "tui"];
|
1
|
+
export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata", "owners", "nxCloudImplicitDependencies"];
|
2
|
+
export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache", "maxCacheSize", "tui", "owners"];
|
3
3
|
//# sourceMappingURL=compat.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,wBAAwB,
|
1
|
+
{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,wBAAwB,8OAiB3B,CAAC;AAQX,eAAO,MAAM,0BAA0B,yeAgC7B,CAAC"}
|
package/src/adapter/compat.js
CHANGED
@@ -29,6 +29,8 @@ exports.allowedProjectExtensions = [
|
|
29
29
|
'release',
|
30
30
|
'includedScripts',
|
31
31
|
'metadata',
|
32
|
+
'owners',
|
33
|
+
'nxCloudImplicitDependencies',
|
32
34
|
];
|
33
35
|
// If we pass props on the workspace that angular doesn't know about,
|
34
36
|
// it throws a warning that users see. We want to pass them still,
|
@@ -67,6 +69,7 @@ exports.allowedWorkspaceExtensions = [
|
|
67
69
|
'useLegacyCache',
|
68
70
|
'maxCacheSize',
|
69
71
|
'tui',
|
72
|
+
'owners',
|
70
73
|
];
|
71
74
|
if (!patched) {
|
72
75
|
Module.prototype.require = function () {
|
@@ -534,6 +534,7 @@ function resolveChangelogVersions(args, releaseGroups, releaseGroupToFilteredPro
|
|
534
534
|
for (const projectName of releaseGroupProjectNames) {
|
535
535
|
if (!args.versionData) {
|
536
536
|
versionData[projectName] = {
|
537
|
+
dockerVersion: args.version,
|
537
538
|
newVersion: args.version,
|
538
539
|
currentVersion: '', // not relevant within changelog/commit generation
|
539
540
|
dependentProjects: [], // not relevant within changelog/commit generation
|
@@ -22,7 +22,10 @@ interface GitOptions {
|
|
22
22
|
gitPushArgs?: string | string[];
|
23
23
|
gitRemote?: string;
|
24
24
|
}
|
25
|
-
export type
|
25
|
+
export type DockerVersionSchemeArgs = {
|
26
|
+
dockerVersionScheme?: string;
|
27
|
+
};
|
28
|
+
export type VersionOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & FirstReleaseArgs & DockerVersionSchemeArgs & {
|
26
29
|
specifier?: string;
|
27
30
|
preid?: string;
|
28
31
|
stageChanges?: boolean;
|
@@ -33,7 +36,6 @@ export type VersionOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Firs
|
|
33
36
|
*/
|
34
37
|
generatorOptionsOverrides?: Record<string, unknown>;
|
35
38
|
versionActionsOptionsOverrides?: Record<string, unknown>;
|
36
|
-
dockerVersionScheme?: string;
|
37
39
|
};
|
38
40
|
export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & FirstReleaseArgs & {
|
39
41
|
version?: string | null;
|
@@ -63,7 +65,7 @@ export type PlanCheckOptions = BaseNxReleaseArgs & {
|
|
63
65
|
uncommitted?: boolean;
|
64
66
|
untracked?: boolean;
|
65
67
|
};
|
66
|
-
export type ReleaseOptions = NxReleaseArgs & FirstReleaseArgs & {
|
68
|
+
export type ReleaseOptions = NxReleaseArgs & FirstReleaseArgs & DockerVersionSchemeArgs & {
|
67
69
|
specifier?: string;
|
68
70
|
yes?: boolean;
|
69
71
|
preid?: VersionOptions['preid'];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAY,MAAM,OAAO,CAAC;AAEtD,OAAO,EACL,WAAW,EACX,cAAc,EAQf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,UAAU,UAAU;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,cAAc,GAAG,aAAa,GACxC,UAAU,GACV,eAAe,GACf,gBAAgB,GAAG;
|
1
|
+
{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/command-object.ts"],"names":[],"mappings":"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"}
|
@@ -71,7 +71,7 @@ exports.yargsReleaseCommand = {
|
|
71
71
|
const releaseCommand = {
|
72
72
|
command: '$0 [specifier]',
|
73
73
|
describe: 'Create a version and release for the workspace, generate a changelog, and optionally publish the packages.',
|
74
|
-
builder: (yargs) => withFirstReleaseOptions(yargs
|
74
|
+
builder: (yargs) => withFirstReleaseOptions(withDockerVersionSchemeOptions(yargs
|
75
75
|
.positional('specifier', {
|
76
76
|
type: 'string',
|
77
77
|
describe: 'Exact version or semver keyword to apply to the selected release group.',
|
@@ -80,10 +80,6 @@ const releaseCommand = {
|
|
80
80
|
type: 'string',
|
81
81
|
describe: 'The optional prerelease identifier to apply to the version. This will only be applied in the case that the specifier argument has been set to `prerelease` OR when conventional commits are enabled, in which case it will modify the resolved specifier from conventional commits to be its prerelease equivalent. E.g. minor -> preminor.',
|
82
82
|
default: '',
|
83
|
-
})
|
84
|
-
.options('dockerVersionScheme', {
|
85
|
-
type: 'string',
|
86
|
-
describe: 'Exact docker version scheme to apply to the selected release group. Warning: Docker support is experimental. Breaking changes may occur and not adhere to semver versioning.',
|
87
83
|
})
|
88
84
|
.option('yes', {
|
89
85
|
type: 'boolean',
|
@@ -99,7 +95,7 @@ const releaseCommand = {
|
|
99
95
|
throw new Error('The --yes and --skip-publish options are mutually exclusive, please use one or the other.');
|
100
96
|
}
|
101
97
|
return true;
|
102
|
-
}),
|
98
|
+
}))),
|
103
99
|
handler: async (args) => {
|
104
100
|
const release = await Promise.resolve().then(() => require('./release'));
|
105
101
|
const result = await release.releaseCLIHandler(args);
|
@@ -113,7 +109,7 @@ const versionCommand = {
|
|
113
109
|
command: 'version [specifier]',
|
114
110
|
aliases: ['v'],
|
115
111
|
describe: 'Create a version and release for one or more applications and libraries.',
|
116
|
-
builder: (yargs) => withFirstReleaseOptions(withGitOptions(yargs
|
112
|
+
builder: (yargs) => withFirstReleaseOptions(withGitOptions(withDockerVersionSchemeOptions(yargs
|
117
113
|
.positional('specifier', {
|
118
114
|
type: 'string',
|
119
115
|
describe: 'Exact version or semver keyword to apply to the selected release group.',
|
@@ -126,7 +122,7 @@ const versionCommand = {
|
|
126
122
|
.option('stage-changes', {
|
127
123
|
type: 'boolean',
|
128
124
|
describe: 'Whether or not to stage the changes made by this command. Useful when combining this command with changelog generation.',
|
129
|
-
}))),
|
125
|
+
})))),
|
130
126
|
handler: async (args) => {
|
131
127
|
const release = await Promise.resolve().then(() => require('./version'));
|
132
128
|
const result = await release.releaseVersionCLIHandler(args);
|
@@ -310,3 +306,9 @@ function withFirstReleaseOptions(yargs) {
|
|
310
306
|
description: 'Indicates that this is the first release for the selected release group. If the current version cannot be determined as usual, the version on disk will be used as a fallback. This is useful when using git or the registry to determine the current version of packages, since those sources are only available after the first release. Also indicates that changelog generation should not assume a previous git tag exists and that publishing should not check for the existence of the package before running.',
|
311
307
|
});
|
312
308
|
}
|
309
|
+
function withDockerVersionSchemeOptions(yargs) {
|
310
|
+
return yargs.option('dockerVersionScheme', {
|
311
|
+
type: 'string',
|
312
|
+
describe: 'Exact docker version scheme to apply to the selected release group. Warning: Docker support is experimental. Breaking changes may occur and not adhere to semver versioning.',
|
313
|
+
});
|
314
|
+
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/config.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/config.ts"],"names":[],"mappings":"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"}
|
@@ -303,7 +303,11 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
|
|
303
303
|
releaseTagPattern:
|
304
304
|
// The appropriate group default releaseTagPattern is dependent upon the projectRelationships
|
305
305
|
groupProjectsRelationship === 'independent'
|
306
|
-
?
|
306
|
+
? // If the default pattern contains {projectName} then it will create unique release tags for each project.
|
307
|
+
// Otherwise, use the default value to guarantee unique tags
|
308
|
+
WORKSPACE_DEFAULTS.releaseTagPattern?.includes('{projectName}')
|
309
|
+
? WORKSPACE_DEFAULTS.releaseTagPattern
|
310
|
+
: defaultIndependentReleaseTagPattern
|
307
311
|
: WORKSPACE_DEFAULTS.releaseTagPattern,
|
308
312
|
releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
|
309
313
|
releaseTagPatternRequireSemver: groupReleaseTagPatternRequireSemver,
|
@@ -508,7 +512,11 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
|
|
508
512
|
releaseTagPattern: releaseGroup.releaseTagPattern ||
|
509
513
|
// The appropriate group default releaseTagPattern is dependent upon the projectRelationships
|
510
514
|
(projectsRelationship === 'independent'
|
511
|
-
?
|
515
|
+
? // If the default pattern contains {projectName} then it will create unique release tags for each project.
|
516
|
+
// Otherwise, use the default value to guarantee unique tags
|
517
|
+
userConfig.releaseTagPattern?.includes('{projectName}')
|
518
|
+
? userConfig.releaseTagPattern
|
519
|
+
: defaultIndependentReleaseTagPattern
|
512
520
|
: userConfig.releaseTagPattern || defaultFixedReleaseTagPattern),
|
513
521
|
releaseTagPatternCheckAllBranchesWhen: releaseGroup.releaseTagPatternCheckAllBranchesWhen ??
|
514
522
|
userConfig.releaseTagPatternCheckAllBranchesWhen ??
|
@@ -718,6 +726,7 @@ function fillUnspecifiedConventionalCommitsProperties(config) {
|
|
718
726
|
};
|
719
727
|
}
|
720
728
|
async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
729
|
+
const linkMessage = `\nRead more about Nx Release at https://nx.dev/features/manage-releases.`;
|
721
730
|
switch (error.code) {
|
722
731
|
case 'PROJECTS_AND_GROUPS_DEFINED':
|
723
732
|
{
|
@@ -727,7 +736,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
727
736
|
]);
|
728
737
|
output_1.output.error({
|
729
738
|
title: `"projects" is not valid when explicitly defining release groups, and everything should be expressed within "groups" in that case. If you are using "groups" then you should remove the "projects" property`,
|
730
|
-
bodyLines: [nxJsonMessage],
|
739
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
731
740
|
});
|
732
741
|
}
|
733
742
|
break;
|
@@ -739,7 +748,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
739
748
|
]);
|
740
749
|
output_1.output.error({
|
741
750
|
title: `Release group "${error.data.releaseGroupName}" matches no projects. Please ensure all release groups match at least one project:`,
|
742
|
-
bodyLines: [nxJsonMessage],
|
751
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
743
752
|
});
|
744
753
|
}
|
745
754
|
break;
|
@@ -751,7 +760,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
751
760
|
]);
|
752
761
|
output_1.output.error({
|
753
762
|
title: `Project "${error.data.project}" matches multiple release groups. Please ensure all projects are part of only one release group:`,
|
754
|
-
bodyLines: [nxJsonMessage],
|
763
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
755
764
|
});
|
756
765
|
}
|
757
766
|
break;
|
@@ -765,7 +774,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
765
774
|
]);
|
766
775
|
output_1.output.error({
|
767
776
|
title: `Release group "${error.data.releaseGroupName}" has an invalid releaseTagPattern. Please ensure the pattern contains exactly one instance of the "{version}" placeholder`,
|
768
|
-
bodyLines: [nxJsonMessage],
|
777
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
769
778
|
});
|
770
779
|
}
|
771
780
|
break;
|
@@ -779,7 +788,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
779
788
|
: 'configuration options';
|
780
789
|
output_1.output.error({
|
781
790
|
title: `You have configured both the shorthand "version.conventionalCommits" and one or more of the related ${text} that it sets for you. Please use one or the other:`,
|
782
|
-
bodyLines: [nxJsonMessage],
|
791
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
783
792
|
});
|
784
793
|
}
|
785
794
|
break;
|
@@ -791,7 +800,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
791
800
|
]);
|
792
801
|
output_1.output.error({
|
793
802
|
title: `You have duplicate conflicting git configurations. If you are using the top level 'nx release' command, then remove the 'release.version.git' and 'release.changelog.git' properties in favor of 'release.git'. If you are using the subcommands or the programmatic API, then remove the 'release.git' property in favor of 'release.version.git' and 'release.changelog.git':`,
|
794
|
-
bodyLines: [nxJsonMessage],
|
803
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
795
804
|
});
|
796
805
|
}
|
797
806
|
break;
|
@@ -799,7 +808,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
799
808
|
const nxJsonMessage = await (0, resolve_nx_json_error_message_1.resolveNxJsonConfigErrorMessage)(['release']);
|
800
809
|
output_1.output.error({
|
801
810
|
title: `There was an error when resolving the configured changelog renderer at path: ${error.data.workspaceRelativePath}`,
|
802
|
-
bodyLines: [nxJsonMessage],
|
811
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
803
812
|
});
|
804
813
|
break;
|
805
814
|
}
|
@@ -812,7 +821,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
812
821
|
title: `Your "changelog.createRelease" config specifies an unsupported provider "${error.data.provider}". The supported providers are ${error.data.supportedProviders
|
813
822
|
.map((p) => `"${p}"`)
|
814
823
|
.join(', ')}`,
|
815
|
-
bodyLines: [nxJsonMessage],
|
824
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
816
825
|
});
|
817
826
|
}
|
818
827
|
break;
|
@@ -823,7 +832,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
823
832
|
]);
|
824
833
|
output_1.output.error({
|
825
834
|
title: `Your "changelog.createRelease" config specifies an invalid hostname "${error.data.hostname}". Please ensure you provide a valid hostname value, such as "example.com"`,
|
826
|
-
bodyLines: [nxJsonMessage],
|
835
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
827
836
|
});
|
828
837
|
}
|
829
838
|
break;
|
@@ -834,7 +843,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
834
843
|
]);
|
835
844
|
output_1.output.error({
|
836
845
|
title: `Your "changelog.createRelease" config specifies an invalid apiBaseUrl "${error.data.apiBaseUrl}". Please ensure you provide a valid URL value, such as "https://example.com"`,
|
837
|
-
bodyLines: [nxJsonMessage],
|
846
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
838
847
|
});
|
839
848
|
}
|
840
849
|
break;
|
@@ -845,7 +854,7 @@ async function handleNxReleaseConfigError(error, useLegacyVersioning) {
|
|
845
854
|
]);
|
846
855
|
output_1.output.error({
|
847
856
|
title: `The createRelease option for changelogs cannot be enabled when git push is explicitly disabled because the commit needs to be pushed to the remote in order to tie the release to it`,
|
848
|
-
bodyLines: [nxJsonMessage],
|
857
|
+
bodyLines: [nxJsonMessage, linkMessage],
|
849
858
|
});
|
850
859
|
}
|
851
860
|
break;
|
@@ -14,7 +14,7 @@ async function resolveNxJsonConfigErrorMessage(propPath) {
|
|
14
14
|
? `, line ${errorLines.startLine}`
|
15
15
|
: `, lines ${errorLines.startLine}-${errorLines.endLine}`;
|
16
16
|
}
|
17
|
-
return nxJsonMessage;
|
17
|
+
return nxJsonMessage + '.';
|
18
18
|
}
|
19
19
|
async function getJsonConfigLinesForErrorMessage(rawConfig, jsonPath) {
|
20
20
|
try {
|