nx 22.0.0-canary.20251016-849f356 → 22.0.0-canary.20251021-6934445
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/bin/nx.js +3 -0
- package/migrations.json +37 -0
- package/package.json +12 -11
- package/src/command-line/add/add.d.ts.map +1 -1
- package/src/command-line/add/add.js +3 -5
- package/src/command-line/init/configure-plugins.d.ts.map +1 -1
- package/src/command-line/init/configure-plugins.js +2 -3
- package/src/command-line/init/init-v2.d.ts.map +1 -1
- package/src/command-line/init/init-v2.js +18 -0
- package/src/command-line/migrate/migrate.d.ts.map +1 -1
- package/src/command-line/migrate/migrate.js +16 -0
- package/src/command-line/nx-cloud/complete-run/command-object.d.ts +3 -0
- package/src/command-line/nx-cloud/complete-run/command-object.d.ts.map +1 -0
- package/src/command-line/nx-cloud/complete-run/command-object.js +16 -0
- package/src/command-line/nx-cloud/complete-run/stop-all-agents.d.ts +5 -0
- package/src/command-line/nx-cloud/complete-run/stop-all-agents.d.ts.map +1 -0
- package/src/command-line/nx-cloud/complete-run/stop-all-agents.js +7 -0
- package/src/command-line/nx-cloud/start-agent/command-object.d.ts +3 -0
- package/src/command-line/nx-cloud/start-agent/command-object.d.ts.map +1 -0
- package/src/command-line/nx-cloud/start-agent/command-object.js +15 -0
- package/src/command-line/nx-cloud/start-agent/start-agent.d.ts +5 -0
- package/src/command-line/nx-cloud/start-agent/start-agent.d.ts.map +1 -0
- package/src/command-line/nx-cloud/start-agent/start-agent.js +7 -0
- package/src/command-line/nx-cloud/start-ci-run/command-object.js +1 -1
- package/src/command-line/nx-commands.d.ts.map +1 -1
- package/src/command-line/nx-commands.js +11 -7
- package/src/command-line/release/config/version-plans.d.ts.map +1 -1
- package/src/command-line/release/config/version-plans.js +34 -3
- package/src/command-line/release/version/release-group-processor.d.ts.map +1 -1
- package/src/command-line/release/version/release-group-processor.js +5 -3
- package/src/command-line/release/version/resolve-current-version.d.ts.map +1 -1
- package/src/command-line/release/version/resolve-current-version.js +2 -4
- package/src/command-line/sync/sync.d.ts.map +1 -1
- package/src/command-line/sync/sync.js +2 -3
- package/src/core/graph/main.js +1 -1
- package/src/devkit-internals.d.ts +1 -0
- package/src/devkit-internals.d.ts.map +1 -1
- package/src/devkit-internals.js +3 -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/plugins/public-api.d.ts +1 -1
- package/src/project-graph/plugins/public-api.d.ts.map +1 -1
- 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/task-history-life-cycle-old.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle-old.js +8 -2
- package/src/tasks-runner/life-cycles/task-history-life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle.js +8 -2
- 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
- package/src/utils/delayed-spinner.d.ts +2 -2
- package/src/utils/delayed-spinner.d.ts.map +1 -1
- package/src/utils/delayed-spinner.js +8 -10
- package/src/utils/spinner.d.ts +13 -0
- package/src/utils/spinner.d.ts.map +1 -0
- package/src/utils/spinner.js +61 -0
package/bin/nx.js
CHANGED
package/migrations.json
CHANGED
|
@@ -1,5 +1,42 @@
|
|
|
1
1
|
{
|
|
2
2
|
"generators": {
|
|
3
|
+
"16.0.0-remove-nrwl-cli": {
|
|
4
|
+
"cli": "nx",
|
|
5
|
+
"version": "16.0.0-beta.0",
|
|
6
|
+
"description": "Remove @nrwl/cli.",
|
|
7
|
+
"implementation": "./src/migrations/update-16-0-0/remove-nrwl-cli"
|
|
8
|
+
},
|
|
9
|
+
"16.0.0-tokens-for-depends-on": {
|
|
10
|
+
"cli": "nx",
|
|
11
|
+
"version": "16.0.0-beta.9",
|
|
12
|
+
"description": "Replace `dependsOn.projects` and `inputs` definitions with new configuration format.",
|
|
13
|
+
"implementation": "./src/migrations/update-16-0-0/update-depends-on-to-tokens"
|
|
14
|
+
},
|
|
15
|
+
"16.0.0-update-nx-cloud-runner": {
|
|
16
|
+
"cli": "nx",
|
|
17
|
+
"version": "16.0.0-beta.0",
|
|
18
|
+
"description": "Replace @nrwl/nx-cloud with nx-cloud",
|
|
19
|
+
"implementation": "./src/migrations/update-16-0-0/update-nx-cloud-runner"
|
|
20
|
+
},
|
|
21
|
+
"16.2.0-remove-output-path-from-run-commands": {
|
|
22
|
+
"cli": "nx",
|
|
23
|
+
"version": "16.2.0-beta.0",
|
|
24
|
+
"description": "Remove outputPath from run commands",
|
|
25
|
+
"implementation": "./src/migrations/update-16-2-0/remove-run-commands-output-path"
|
|
26
|
+
},
|
|
27
|
+
"16.6.0-prefix-outputs": {
|
|
28
|
+
"cli": "nx",
|
|
29
|
+
"version": "16.6.0-beta.6",
|
|
30
|
+
"description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
|
|
31
|
+
"implementation": "./src/migrations/update-15-0-0/prefix-outputs"
|
|
32
|
+
},
|
|
33
|
+
"16.8.0-escape-dollar-sign-env": {
|
|
34
|
+
"cli": "nx",
|
|
35
|
+
"version": "16.8.0-beta.3",
|
|
36
|
+
"description": "Escape $ in env variables",
|
|
37
|
+
"implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables",
|
|
38
|
+
"x-repair-skip": true
|
|
39
|
+
},
|
|
3
40
|
"17.0.0-move-cache-directory": {
|
|
4
41
|
"cli": "nx",
|
|
5
42
|
"version": "17.0.0-beta.1",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "22.0.0-canary.
|
|
3
|
+
"version": "22.0.0-canary.20251021-6934445",
|
|
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": "22.0.0-canary.
|
|
87
|
-
"@nx/nx-darwin-x64": "22.0.0-canary.
|
|
88
|
-
"@nx/nx-freebsd-x64": "22.0.0-canary.
|
|
89
|
-
"@nx/nx-linux-arm-gnueabihf": "22.0.0-canary.
|
|
90
|
-
"@nx/nx-linux-arm64-gnu": "22.0.0-canary.
|
|
91
|
-
"@nx/nx-linux-arm64-musl": "22.0.0-canary.
|
|
92
|
-
"@nx/nx-linux-x64-gnu": "22.0.0-canary.
|
|
93
|
-
"@nx/nx-linux-x64-musl": "22.0.0-canary.
|
|
94
|
-
"@nx/nx-win32-arm64-msvc": "22.0.0-canary.
|
|
95
|
-
"@nx/nx-win32-x64-msvc": "22.0.0-canary.
|
|
86
|
+
"@nx/nx-darwin-arm64": "22.0.0-canary.20251021-6934445",
|
|
87
|
+
"@nx/nx-darwin-x64": "22.0.0-canary.20251021-6934445",
|
|
88
|
+
"@nx/nx-freebsd-x64": "22.0.0-canary.20251021-6934445",
|
|
89
|
+
"@nx/nx-linux-arm-gnueabihf": "22.0.0-canary.20251021-6934445",
|
|
90
|
+
"@nx/nx-linux-arm64-gnu": "22.0.0-canary.20251021-6934445",
|
|
91
|
+
"@nx/nx-linux-arm64-musl": "22.0.0-canary.20251021-6934445",
|
|
92
|
+
"@nx/nx-linux-x64-gnu": "22.0.0-canary.20251021-6934445",
|
|
93
|
+
"@nx/nx-linux-x64-musl": "22.0.0-canary.20251021-6934445",
|
|
94
|
+
"@nx/nx-win32-arm64-msvc": "22.0.0-canary.20251021-6934445",
|
|
95
|
+
"@nx/nx-win32-x64-msvc": "22.0.0-canary.20251021-6934445"
|
|
96
96
|
},
|
|
97
97
|
"nx-migrations": {
|
|
98
98
|
"migrations": "./migrations.json",
|
|
@@ -111,6 +111,7 @@
|
|
|
111
111
|
"@nx/expo",
|
|
112
112
|
"@nx/express",
|
|
113
113
|
"@nx/gradle",
|
|
114
|
+
"@nx/maven",
|
|
114
115
|
"@nx/module-federation",
|
|
115
116
|
"@nx/nest",
|
|
116
117
|
"@nx/next",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/add/add.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AASnD,wBAAgB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAc/D;
|
|
1
|
+
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/add/add.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AASnD,wBAAgB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAc/D;AA6HD,eAAO,MAAM,oBAAoB,qBAUhC,CAAC"}
|
|
@@ -16,7 +16,7 @@ const workspace_root_1 = require("../../utils/workspace-root");
|
|
|
16
16
|
const add_nx_scripts_1 = require("../init/implementation/dot-nx/add-nx-scripts");
|
|
17
17
|
const semver_1 = require("semver");
|
|
18
18
|
const configure_plugins_1 = require("../init/configure-plugins");
|
|
19
|
-
const
|
|
19
|
+
const spinner_1 = require("../../utils/spinner");
|
|
20
20
|
function addHandler(options) {
|
|
21
21
|
return (0, handle_errors_1.handleErrors)(options.verbose, async () => {
|
|
22
22
|
output_1.output.addNewline();
|
|
@@ -30,8 +30,7 @@ function addHandler(options) {
|
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
32
|
async function installPackage(pkgName, version, nxJson) {
|
|
33
|
-
const spinner =
|
|
34
|
-
spinner.start();
|
|
33
|
+
const spinner = spinner_1.globalSpinner.start(`Installing ${pkgName}@${version}...`);
|
|
35
34
|
if ((0, fs_1.existsSync)('package.json')) {
|
|
36
35
|
const pm = (0, package_manager_1.detectPackageManager)();
|
|
37
36
|
const pmv = (0, package_manager_1.getPackageManagerVersion)(pm);
|
|
@@ -86,8 +85,7 @@ async function initializePlugin(pkgName, options, nxJson) {
|
|
|
86
85
|
process.env.NX_ADD_PLUGINS !== 'false'))) {
|
|
87
86
|
updatePackageScripts = true;
|
|
88
87
|
}
|
|
89
|
-
const spinner =
|
|
90
|
-
spinner.start();
|
|
88
|
+
const spinner = spinner_1.globalSpinner.start(`Initializing ${pkgName}...`);
|
|
91
89
|
try {
|
|
92
90
|
await (0, configure_plugins_1.runPluginInitGenerator)(pkgName, workspace_root_1.workspaceRoot, updatePackageScripts, options.verbose);
|
|
93
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure-plugins.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/configure-plugins.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configure-plugins.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/configure-plugins.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AAoBrC,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,sBAAmD,EACxD,OAAO,EAAE,MAAM,EAAE,QAkBlB;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,EACd,QAAQ,GAAE,MAAsB,EAChC,oBAAoB,GAAE,OAAe,EACrC,OAAO,GAAE,OAAe,EACxB,GAAG,GAAE,sBAAmD,GACvD,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,EAAE,EACjB,oBAAoB,EAAE,OAAO,EAC7B,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,GAAE,MAAsB,EAChC,OAAO,GAAE,OAAe,GACvB,OAAO,CAAC;IACT,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAA;KAAE,CAAC;CAC5C,CAAC,CAkCD;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EAAE,EACjB,oBAAoB,EAAE,OAAO,EAC7B,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,GAAE,MAAsB,EAChC,OAAO,GAAE,OAAe,GACvB,OAAO,CAAC;IACT,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAA;KAAE,CAAC;CAC5C,CAAC,CAgDD;AAqBD,wBAAgB,qCAAqC,CAAC,CAAC,EAAE,GAAG,GAAG,MAAM,EAAE,CAwCtE"}
|
|
@@ -5,7 +5,6 @@ exports.runPluginInitGenerator = runPluginInitGenerator;
|
|
|
5
5
|
exports.runPluginInitGenerators = runPluginInitGenerators;
|
|
6
6
|
exports.configurePlugins = configurePlugins;
|
|
7
7
|
exports.getFailedToInstallPluginErrorMessages = getFailedToInstallPluginErrorMessages;
|
|
8
|
-
const createSpinner = require("ora");
|
|
9
8
|
const chalk_1 = require("chalk");
|
|
10
9
|
const package_manager_1 = require("../../utils/package-manager");
|
|
11
10
|
const output_1 = require("../../utils/output");
|
|
@@ -20,6 +19,7 @@ const configuration_1 = require("../../config/configuration");
|
|
|
20
19
|
const versions_1 = require("../../utils/versions");
|
|
21
20
|
const child_process_1 = require("../../utils/child-process");
|
|
22
21
|
const fileutils_1 = require("../../utils/fileutils");
|
|
22
|
+
const spinner_1 = require("../../utils/spinner");
|
|
23
23
|
function installPluginPackages(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)(), plugins) {
|
|
24
24
|
if (plugins.length === 0) {
|
|
25
25
|
return;
|
|
@@ -87,12 +87,11 @@ async function runPluginInitGenerators(plugins, updatePackageScripts, pmc, repoR
|
|
|
87
87
|
failedPlugins: {},
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
|
-
const spinner = createSpinner();
|
|
91
90
|
let succeededPlugins = [];
|
|
92
91
|
const failedPlugins = {};
|
|
93
92
|
for (const plugin of plugins) {
|
|
93
|
+
const spinner = spinner_1.globalSpinner.start('Installing plugin ' + plugin);
|
|
94
94
|
try {
|
|
95
|
-
spinner.start('Installing plugin ' + plugin);
|
|
96
95
|
await runPluginInitGenerator(plugin, repoRoot, updatePackageScripts, verbose, pmc);
|
|
97
96
|
succeededPlugins.push(plugin);
|
|
98
97
|
spinner.succeed('Installed plugin ' + plugin);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AAavE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAgBvC,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAyKlE;AA2BD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,
|
|
1
|
+
{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AAavE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAgBvC,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAyKlE;AA2BD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,CAoJD"}
|
|
@@ -225,6 +225,24 @@ async function detectPlugins(nxJson, interactive, includeAngularCli) {
|
|
|
225
225
|
if (gradlewFiles.some((f) => (0, fs_1.existsSync)(f))) {
|
|
226
226
|
detectedPlugins.add('@nx/gradle');
|
|
227
227
|
}
|
|
228
|
+
const dotnetProjectGlobs = ['**/*.csproj', '**/*.fsproj', '**/*.vbproj'];
|
|
229
|
+
const dotnetFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), [
|
|
230
|
+
...dotnetProjectGlobs,
|
|
231
|
+
]);
|
|
232
|
+
if (dotnetFiles.length > 0) {
|
|
233
|
+
detectedPlugins.add('@nx/dotnet');
|
|
234
|
+
}
|
|
235
|
+
let mvnwFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), [
|
|
236
|
+
'mvnw',
|
|
237
|
+
'mvnw.cmd',
|
|
238
|
+
'pom.xml',
|
|
239
|
+
'**/mvnw',
|
|
240
|
+
'**/mvnw.cmd',
|
|
241
|
+
'**/pom.xml',
|
|
242
|
+
]);
|
|
243
|
+
if (mvnwFiles.length > 0) {
|
|
244
|
+
detectedPlugins.add('@nx/maven');
|
|
245
|
+
}
|
|
228
246
|
// Remove existing plugins
|
|
229
247
|
for (const plugin of detectedPlugins) {
|
|
230
248
|
if (currentPlugins.has(plugin)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -759,6 +759,22 @@ async function updatePackageJson(root, updatedPackages) {
|
|
|
759
759
|
if (catalogUpdates.length) {
|
|
760
760
|
// manager is guaranteed to be defined when there are catalog updates
|
|
761
761
|
manager.updateCatalogVersions(root, catalogUpdates);
|
|
762
|
+
await formatCatalogDefinitionFiles(manager, root);
|
|
763
|
+
}
|
|
764
|
+
}
|
|
765
|
+
async function formatCatalogDefinitionFiles(manager, root) {
|
|
766
|
+
const catalogDefinitionFilePaths = manager.getCatalogDefinitionFilePaths();
|
|
767
|
+
const catalogDefinitionFiles = catalogDefinitionFilePaths.map((filePath) => {
|
|
768
|
+
const absolutePath = (0, path_1.join)(root, filePath);
|
|
769
|
+
return {
|
|
770
|
+
path: filePath,
|
|
771
|
+
absolutePath,
|
|
772
|
+
content: (0, fs_1.readFileSync)(absolutePath, 'utf-8'),
|
|
773
|
+
};
|
|
774
|
+
});
|
|
775
|
+
const results = await (0, format_changed_files_with_prettier_if_available_1.formatFilesWithPrettierIfAvailable)(catalogDefinitionFiles.map(({ path, content }) => ({ path, content })), root, { silent: true });
|
|
776
|
+
for (const { path, absolutePath, content } of catalogDefinitionFiles) {
|
|
777
|
+
(0, fs_1.writeFileSync)(absolutePath, results.has(path) ? results.get(path) : content, { encoding: 'utf-8' });
|
|
762
778
|
}
|
|
763
779
|
}
|
|
764
780
|
async function updateInstallationDetails(root, updatedPackages) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/complete-run/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,eAAO,MAAM,yBAAyB,EAAE,aAevC,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.yargsStopAllAgentsCommand = void 0;
|
|
4
|
+
const shared_options_1 = require("../../yargs-utils/shared-options");
|
|
5
|
+
exports.yargsStopAllAgentsCommand = {
|
|
6
|
+
command: 'stop-all-agents [options]',
|
|
7
|
+
aliases: ['complete-ci-run'],
|
|
8
|
+
describe: 'Terminates all dedicated agents associated with this CI pipeline execution. This command is an alias for [`nx-cloud stop-all-agents`](/docs/reference/nx-cloud-cli#nx-cloud-stop-all-agents).',
|
|
9
|
+
builder: (yargs) => (0, shared_options_1.withVerbose)(yargs)
|
|
10
|
+
.help(false)
|
|
11
|
+
.showHelpOnFail(false)
|
|
12
|
+
.option('help', { describe: 'Show help.', type: 'boolean' }),
|
|
13
|
+
handler: async (args) => {
|
|
14
|
+
process.exit(await (await Promise.resolve().then(() => require('./stop-all-agents'))).stopAllAgentsHandler(args));
|
|
15
|
+
},
|
|
16
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stop-all-agents.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/complete-run/stop-all-agents.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAE7E"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.stopAllAgentsHandler = stopAllAgentsHandler;
|
|
4
|
+
const utils_1 = require("../utils");
|
|
5
|
+
function stopAllAgentsHandler(args) {
|
|
6
|
+
return (0, utils_1.executeNxCloudCommand)('stop-all-agents', args.verbose);
|
|
7
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/start-agent/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,eAAO,MAAM,sBAAsB,EAAE,aAYpC,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.yargsStartAgentCommand = void 0;
|
|
4
|
+
const shared_options_1 = require("../../yargs-utils/shared-options");
|
|
5
|
+
exports.yargsStartAgentCommand = {
|
|
6
|
+
command: 'start-agent [options]',
|
|
7
|
+
describe: 'Starts a new agent for distributed task execution. This command is an alias for [`nx-cloud start-agent`](/docs/reference/nx-cloud-cli).',
|
|
8
|
+
builder: (yargs) => (0, shared_options_1.withVerbose)(yargs)
|
|
9
|
+
.help(false)
|
|
10
|
+
.showHelpOnFail(false)
|
|
11
|
+
.option('help', { describe: 'Show help.', type: 'boolean' }),
|
|
12
|
+
handler: async (args) => {
|
|
13
|
+
process.exit(await (await Promise.resolve().then(() => require('./start-agent'))).startAgentHandler(args));
|
|
14
|
+
},
|
|
15
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-agent.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/start-agent/start-agent.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAEvE"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.startAgentHandler = startAgentHandler;
|
|
4
|
+
const utils_1 = require("../utils");
|
|
5
|
+
function startAgentHandler(args) {
|
|
6
|
+
return (0, utils_1.executeNxCloudCommand)('start-agent', args.verbose);
|
|
7
|
+
}
|
|
@@ -4,7 +4,7 @@ exports.yargsStartCiRunCommand = void 0;
|
|
|
4
4
|
const shared_options_1 = require("../../yargs-utils/shared-options");
|
|
5
5
|
exports.yargsStartCiRunCommand = {
|
|
6
6
|
command: 'start-ci-run [options]',
|
|
7
|
-
describe: 'Starts a new CI run for distributed task execution. This command is an alias for [`nx-cloud start-ci-run`](/
|
|
7
|
+
describe: 'Starts a new CI run for distributed task execution. This command is an alias for [`nx-cloud start-ci-run`](/docs/reference/nx-cloud-cli#npx-nxcloud-start-ci-run).',
|
|
8
8
|
builder: (yargs) => (0, shared_options_1.withVerbose)(yargs)
|
|
9
9
|
.help(false)
|
|
10
10
|
.showHelpOnFail(false)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-commands.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/nx-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"nx-commands.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/nx-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA0D/B,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAEzE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,qBAsDf,CAAC"}
|
|
@@ -30,11 +30,13 @@ const command_object_24 = require("./nx-cloud/login/command-object");
|
|
|
30
30
|
const command_object_25 = require("./nx-cloud/logout/command-object");
|
|
31
31
|
const command_object_26 = require("./nx-cloud/record/command-object");
|
|
32
32
|
const command_object_27 = require("./nx-cloud/start-ci-run/command-object");
|
|
33
|
-
const command_object_28 = require("./nx-cloud/
|
|
33
|
+
const command_object_28 = require("./nx-cloud/start-agent/command-object");
|
|
34
|
+
const command_object_29 = require("./nx-cloud/complete-run/command-object");
|
|
35
|
+
const command_object_30 = require("./nx-cloud/fix-ci/command-object");
|
|
34
36
|
const command_objects_1 = require("./deprecated/command-objects");
|
|
35
|
-
const
|
|
37
|
+
const command_object_31 = require("./sync/command-object");
|
|
36
38
|
const output_1 = require("../utils/output");
|
|
37
|
-
const
|
|
39
|
+
const command_object_32 = require("./mcp/command-object");
|
|
38
40
|
// Ensure that the output takes up the available width of the terminal.
|
|
39
41
|
yargs.wrap(yargs.terminalWidth());
|
|
40
42
|
exports.parserConfiguration = {
|
|
@@ -81,8 +83,8 @@ exports.commandsObject = yargs
|
|
|
81
83
|
.command(command_object_16.yargsRunCommand)
|
|
82
84
|
.command(command_object_17.yargsRunManyCommand)
|
|
83
85
|
.command(command_object_18.yargsShowCommand)
|
|
84
|
-
.command(
|
|
85
|
-
.command(
|
|
86
|
+
.command(command_object_31.yargsSyncCommand)
|
|
87
|
+
.command(command_object_31.yargsSyncCheckCommand)
|
|
86
88
|
.command(command_object_3.yargsViewLogsCommand)
|
|
87
89
|
.command(command_object_19.yargsWatchCommand)
|
|
88
90
|
.command(command_object_16.yargsNxInfixCommand)
|
|
@@ -90,8 +92,10 @@ exports.commandsObject = yargs
|
|
|
90
92
|
.command(command_object_25.yargsLogoutCommand)
|
|
91
93
|
.command(command_object_26.yargsRecordCommand)
|
|
92
94
|
.command(command_object_27.yargsStartCiRunCommand)
|
|
93
|
-
.command(command_object_28.
|
|
94
|
-
.command(
|
|
95
|
+
.command(command_object_28.yargsStartAgentCommand)
|
|
96
|
+
.command(command_object_29.yargsStopAllAgentsCommand)
|
|
97
|
+
.command(command_object_30.yargsFixCiCommand)
|
|
98
|
+
.command(command_object_32.yargsMcpCommand)
|
|
95
99
|
.command(resolveConformanceCommandObject())
|
|
96
100
|
.command(resolveConformanceCheckCommandObject())
|
|
97
101
|
.scriptName('nx')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-plans.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/version-plans.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,WAAW,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,gBAAgB,EAAE,WAAW,CAAC;IAC9B;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CAClD;
|
|
1
|
+
{"version":3,"file":"version-plans.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/version-plans.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,WAAW,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,gBAAgB,EAAE,WAAW,CAAC;IAC9B;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CAClD;AAgBD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAgDrE;AAED,wBAAsB,+BAA+B,CACnD,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,EAAE,oBAAoB,EAAE,EACrC,0BAA0B,EAAE,MAAM,EAAE,EACpC,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAwNjC;AASD,wBAAgB,2BAA2B,WAE1C"}
|
|
@@ -12,6 +12,17 @@ const workspace_root_1 = require("../../../utils/workspace-root");
|
|
|
12
12
|
const config_1 = require("./config");
|
|
13
13
|
const fm = require('front-matter');
|
|
14
14
|
const versionPlansDirectory = (0, path_1.join)('.nx', 'version-plans');
|
|
15
|
+
const allowedAttributeValues = [
|
|
16
|
+
// Stable releases (with conventional-commit style aliases)
|
|
17
|
+
'"major" (aliases: "feat!" or "fix!")',
|
|
18
|
+
'"minor" (alias: "feat")',
|
|
19
|
+
'"patch" (alias: "fix")',
|
|
20
|
+
// Prereleases
|
|
21
|
+
'"premajor"',
|
|
22
|
+
'"preminor"',
|
|
23
|
+
'"prepatch"',
|
|
24
|
+
'"prerelease"',
|
|
25
|
+
];
|
|
15
26
|
async function readRawVersionPlans() {
|
|
16
27
|
const versionPlansPath = getVersionPlansAbsolutePath();
|
|
17
28
|
if (!(0, node_fs_1.existsSync)(versionPlansPath)) {
|
|
@@ -24,6 +35,26 @@ async function readRawVersionPlans() {
|
|
|
24
35
|
const versionPlanContent = (0, node_fs_1.readFileSync)(filePath).toString();
|
|
25
36
|
const versionPlanStats = await (0, promises_1.stat)(filePath);
|
|
26
37
|
const parsedContent = fm(versionPlanContent);
|
|
38
|
+
/**
|
|
39
|
+
* For convenience allow:
|
|
40
|
+
* - feat to be used as an alias of minor
|
|
41
|
+
* - fix to be used as an alias of patch
|
|
42
|
+
* - Either feat! or fix! to be used as an alias of major
|
|
43
|
+
*/
|
|
44
|
+
for (const [key, value] of Object.entries(parsedContent.attributes)) {
|
|
45
|
+
switch (value) {
|
|
46
|
+
case 'feat':
|
|
47
|
+
parsedContent.attributes[key] = 'minor';
|
|
48
|
+
break;
|
|
49
|
+
case 'fix':
|
|
50
|
+
parsedContent.attributes[key] = 'patch';
|
|
51
|
+
break;
|
|
52
|
+
case 'feat!':
|
|
53
|
+
case 'fix!':
|
|
54
|
+
parsedContent.attributes[key] = 'major';
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
27
58
|
versionPlans.push({
|
|
28
59
|
absolutePath: filePath,
|
|
29
60
|
relativePath: (0, path_1.join)(versionPlansDirectory, versionPlanFile),
|
|
@@ -63,10 +94,10 @@ async function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, a
|
|
|
63
94
|
}
|
|
64
95
|
if (!isReleaseType(value)) {
|
|
65
96
|
if (isDefaultGroup) {
|
|
66
|
-
throw new Error(`Found a version bump in '${rawVersionPlan.fileName}' with an invalid release type. Please specify one of ${
|
|
97
|
+
throw new Error(`Found a version bump in '${rawVersionPlan.fileName}' with an invalid release type. Please specify one of: ${allowedAttributeValues.join(', ')}.`);
|
|
67
98
|
}
|
|
68
99
|
else {
|
|
69
|
-
throw new Error(`Found a version bump for group '${key}' in '${rawVersionPlan.fileName}' with an invalid release type. Please specify one of ${
|
|
100
|
+
throw new Error(`Found a version bump for group '${key}' in '${rawVersionPlan.fileName}' with an invalid release type. Please specify one of: ${allowedAttributeValues.join(', ')}.`);
|
|
70
101
|
}
|
|
71
102
|
}
|
|
72
103
|
const existingPlan = (group.resolvedVersionPlans.find((plan) => plan.fileName === rawVersionPlan.fileName));
|
|
@@ -114,7 +145,7 @@ async function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, a
|
|
|
114
145
|
}
|
|
115
146
|
}
|
|
116
147
|
if (!isReleaseType(value)) {
|
|
117
|
-
throw new Error(`Found a version bump for project '${key}' in '${rawVersionPlan.fileName}' with an invalid release type. Please specify one of ${
|
|
148
|
+
throw new Error(`Found a version bump for project '${key}' in '${rawVersionPlan.fileName}' with an invalid release type. Please specify one of: ${allowedAttributeValues.join(', ')}.`);
|
|
118
149
|
}
|
|
119
150
|
if (groupForProject.projectsRelationship === 'independent') {
|
|
120
151
|
const existingPlan = (groupForProject.resolvedVersionPlans.find((plan) => plan.fileName === rawVersionPlan.fileName));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-group-processor.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/release-group-processor.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAEb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAyB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,OAAO,KAAK,EAAE,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAarE,eAAO,MAAM,qBAAqB;;;;;;;;;CAYxB,CAAC;AAEX,UAAU,4BAA4B;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IAEd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;OAIG;IACH,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;IAEF,8BAA8B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1D;AAED,qBAAa,qBAAqB;IAmC9B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IAtCjB;;;OAGG;IACH,OAAO,CAAC,eAAe,CAA0B;IAEjD;;;;OAIG;IACH,OAAO,CAAC,cAAc,CAA0B;IAEhD;;OAEG;IACH,OAAO,CAAC,WAAW,CAGL;IAEd;;;OAGG;IACH,OAAO,CAAC,kBAAkB,CAAqB;IAE/C;;;OAGG;IACH,OAAO,CAAC,yBAAyB,CAAqB;gBAG5C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,4BAA4B;IA+B/C,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKjE,YAAY,IAAI,MAAM,GAAG,IAAI;IAcvB,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IA4CxC,sBAAsB;IAMtB,+BAA+B,IAAI,IAAI;IAMvC,cAAc,IAAI,WAAW;IAI7B;;;;;;;;;;OAUG;IACG,yBAAyB,CAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjD,OAAO,CAAC;QACT,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;IA6BI,qBAAqB,CACzB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,aAAa,CAAC,EAAE,MAAM;YAyDV,YAAY;YAWZ,YAAY;YAUZ,qBAAqB;YAgKrB,2BAA2B;YA4E3B,8BAA8B;IAqH5C,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,iCAAiC;IAMzC,OAAO,CAAC,8BAA8B;YAaxB,mBAAmB;YAoBnB,4BAA4B;
|
|
1
|
+
{"version":3,"file":"release-group-processor.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/release-group-processor.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAEb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAyB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,OAAO,KAAK,EAAE,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAarE,eAAO,MAAM,qBAAqB;;;;;;;;;CAYxB,CAAC;AAEX,UAAU,4BAA4B;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IAEd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;OAIG;IACH,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;IAEF,8BAA8B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1D;AAED,qBAAa,qBAAqB;IAmC9B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IAtCjB;;;OAGG;IACH,OAAO,CAAC,eAAe,CAA0B;IAEjD;;;;OAIG;IACH,OAAO,CAAC,cAAc,CAA0B;IAEhD;;OAEG;IACH,OAAO,CAAC,WAAW,CAGL;IAEd;;;OAGG;IACH,OAAO,CAAC,kBAAkB,CAAqB;IAE/C;;;OAGG;IACH,OAAO,CAAC,yBAAyB,CAAqB;gBAG5C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,4BAA4B;IA+B/C,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKjE,YAAY,IAAI,MAAM,GAAG,IAAI;IAcvB,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IA4CxC,sBAAsB;IAMtB,+BAA+B,IAAI,IAAI;IAMvC,cAAc,IAAI,WAAW;IAI7B;;;;;;;;;;OAUG;IACG,yBAAyB,CAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjD,OAAO,CAAC;QACT,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;IA6BI,qBAAqB,CACzB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,aAAa,CAAC,EAAE,MAAM;YAyDV,YAAY;YAWZ,YAAY;YAUZ,qBAAqB;YAgKrB,2BAA2B;YA4E3B,8BAA8B;IAqH5C,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,iCAAiC;IAMzC,OAAO,CAAC,8BAA8B;YAaxB,mBAAmB;YAoBnB,4BAA4B;YA8D5B,qBAAqB;YAgGrB,+BAA+B;IAa7C,OAAO,CAAC,4BAA4B;YAQtB,4BAA4B;IAwB1C,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,kCAAkC;CAI3C"}
|
|
@@ -476,8 +476,7 @@ class ReleaseGroupProcessor {
|
|
|
476
476
|
const dependenciesToUpdate = {};
|
|
477
477
|
const dependencies = this.projectGraph.dependencies[projectName] || [];
|
|
478
478
|
for (const dep of dependencies) {
|
|
479
|
-
if (this.releaseGraph.allProjectsToProcess.has(dep.target)
|
|
480
|
-
this.bumpedProjects.has(dep.target)) {
|
|
479
|
+
if (this.releaseGraph.allProjectsToProcess.has(dep.target)) {
|
|
481
480
|
const targetVersionData = this.versionData.get(dep.target);
|
|
482
481
|
if (targetVersionData) {
|
|
483
482
|
const { currentVersion: currentDependencyVersion } = await versionActions.readCurrentVersionOfDependency(this.tree, this.projectGraph, dep.target);
|
|
@@ -492,8 +491,11 @@ class ReleaseGroupProcessor {
|
|
|
492
491
|
else if (['~', '^', '='].includes(cachedFinalConfigForProject.versionPrefix)) {
|
|
493
492
|
finalPrefix = cachedFinalConfigForProject.versionPrefix;
|
|
494
493
|
}
|
|
494
|
+
const newVersion = targetVersionData.newVersion ??
|
|
495
|
+
this.releaseGraph.cachedCurrentVersions.get(dep.target) ??
|
|
496
|
+
currentDependencyVersion;
|
|
495
497
|
// Remove any existing prefix from the new version before applying the finalPrefix
|
|
496
|
-
const cleanNewVersion =
|
|
498
|
+
const cleanNewVersion = newVersion.replace(/^[~^=]/, '');
|
|
497
499
|
dependenciesToUpdate[dep.target] = `${finalPrefix}${cleanNewVersion}`;
|
|
498
500
|
}
|
|
499
501
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-current-version.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/resolve-current-version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve-current-version.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/resolve-current-version.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,uBAAuB,EACzC,YAAY,EAAE,oBAAoB,EAClC,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,aAAa,EACrB,yCAAyC,EAAE,GAAG,CAC5C,MAAM,EAAE,qBAAqB;AAC7B;IACE,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB,CACF,EACD,qBAAqB,EAAE,qBAAqB,EAC5C,iBAAiB,EAAE,MAAM,EACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,GAC3E,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyCxB;AAED;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,uBAAuB,EACzC,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,CAAC,CAmCjB;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,uBAAuB,EACzC,YAAY,EAAE,oBAAoB,EAClC,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,aAAa,EACrB,yCAAyC,EAAE,GAAG,CAC5C,MAAM,EAAE,qBAAqB;AAC7B;IACE,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CACF,EACD,qBAAqB,EAAE,qBAAqB,GAC3C,OAAO,CAAC,MAAM,CAAC,CA4GjB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,uBAAuB,EACzC,YAAY,EAAE,oBAAoB,EAClC,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,aAAa,EACrB,yCAAyC,EAAE,GAAG,CAC5C,MAAM,EAAE,qBAAqB;AAC7B;IACE,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB,CACF,EACD,qBAAqB,EAAE,qBAAqB,EAC5C,iBAAiB,EAAE,MAAM,EACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,GAC3E,OAAO,CAAC,MAAM,CAAC,CAiFjB"}
|
|
@@ -5,8 +5,8 @@ exports.resolveCurrentVersionFromDisk = resolveCurrentVersionFromDisk;
|
|
|
5
5
|
exports.resolveCurrentVersionFromRegistry = resolveCurrentVersionFromRegistry;
|
|
6
6
|
exports.resolveCurrentVersionFromGitTag = resolveCurrentVersionFromGitTag;
|
|
7
7
|
const chalk = require("chalk");
|
|
8
|
-
const ora = require("ora");
|
|
9
8
|
const enquirer_1 = require("enquirer");
|
|
9
|
+
const spinner_1 = require("../../../utils/spinner");
|
|
10
10
|
async function resolveCurrentVersion(tree, projectGraphNode, releaseGroup, versionActions, logger, cachedCurrentVersionsPerFixedReleaseGroup, finalConfigForProject, releaseTagPattern, latestMatchingGitTag) {
|
|
11
11
|
switch (finalConfigForProject.currentVersionResolver) {
|
|
12
12
|
case 'none':
|
|
@@ -66,9 +66,7 @@ async function resolveCurrentVersionFromRegistry(tree, projectGraphNode, release
|
|
|
66
66
|
return cached.currentVersion;
|
|
67
67
|
}
|
|
68
68
|
let registryTxt = '';
|
|
69
|
-
const spinner =
|
|
70
|
-
spinner.color = 'cyan';
|
|
71
|
-
spinner.start();
|
|
69
|
+
const spinner = spinner_1.globalSpinner.start(`Resolving the current version for ${projectGraphNode.name} from the configured registry...`);
|
|
72
70
|
try {
|
|
73
71
|
const res = await versionActions.readCurrentVersionFromRegistry(tree, finalConfigForProject.currentVersionResolverMetadata);
|
|
74
72
|
if (!res) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/sync/sync.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/sync/sync.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAIjD,UAAU,WAAY,SAAQ,QAAQ;IACpC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAwJjE"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.syncHandler = syncHandler;
|
|
4
|
-
const ora = require("ora");
|
|
5
4
|
const nx_json_1 = require("../../config/nx-json");
|
|
6
5
|
const project_graph_1 = require("../../project-graph/project-graph");
|
|
7
6
|
const output_1 = require("../../utils/output");
|
|
8
7
|
const handle_errors_1 = require("../../utils/handle-errors");
|
|
9
8
|
const sync_generators_1 = require("../../utils/sync-generators");
|
|
10
9
|
const chalk = require("chalk");
|
|
10
|
+
const spinner_1 = require("../../utils/spinner");
|
|
11
11
|
function syncHandler(options) {
|
|
12
12
|
return (0, handle_errors_1.handleErrors)(options.verbose, async () => {
|
|
13
13
|
const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
|
|
@@ -70,8 +70,7 @@ function syncHandler(options) {
|
|
|
70
70
|
title: 'The workspace is out of sync',
|
|
71
71
|
bodyLines: resultBodyLines,
|
|
72
72
|
});
|
|
73
|
-
const spinner =
|
|
74
|
-
spinner.start();
|
|
73
|
+
const spinner = spinner_1.globalSpinner.start('Syncing the workspace...');
|
|
75
74
|
try {
|
|
76
75
|
const flushResult = await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
|
|
77
76
|
if ('generatorFailures' in flushResult) {
|