nx 23.1.0 → 23.2.0-beta.1
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.js +1 -1
- package/dist/src/ai/configure-ai-agents-disclaimer.d.ts +5 -0
- package/dist/src/ai/configure-ai-agents-disclaimer.js +31 -0
- package/dist/src/command-line/add/add.js +8 -1
- package/dist/src/command-line/import/import.js +1 -1
- package/dist/src/command-line/init/ai-agent-prompts.d.ts +1 -1
- package/dist/src/command-line/init/ai-agent-prompts.js +7 -6
- package/dist/src/command-line/init/command-object.js +10 -2
- package/dist/src/command-line/init/configure-plugins.js +3 -2
- package/dist/src/command-line/init/implementation/add-nx-to-monorepo.js +4 -2
- package/dist/src/command-line/init/implementation/add-nx-to-nest.js +4 -3
- package/dist/src/command-line/init/implementation/add-nx-to-npm-repo.js +4 -3
- package/dist/src/command-line/init/implementation/add-nx-to-turborepo.js +4 -3
- package/dist/src/command-line/init/implementation/angular/index.js +4 -2
- package/dist/src/command-line/init/implementation/utils.d.ts +3 -3
- package/dist/src/command-line/init/implementation/utils.js +22 -3
- package/dist/src/command-line/migrate/execute-migration.d.ts +72 -0
- package/dist/src/command-line/migrate/execute-migration.js +389 -0
- package/dist/src/command-line/migrate/migrate-ui-api.js +17 -12
- package/dist/src/command-line/migrate/migrate.d.ts +14 -45
- package/dist/src/command-line/migrate/migrate.js +58 -375
- package/dist/src/command-line/release/utils/git.js +6 -2
- package/dist/src/command-line/release/utils/release-graph.d.ts +2 -2
- package/dist/src/command-line/release/utils/shared.d.ts +2 -2
- package/dist/src/command-line/show/show-target/info.js +11 -2
- package/dist/src/commands-runner/create-command-graph.js +5 -0
- package/dist/src/config/nx-json.d.ts +1 -1
- package/dist/src/core/graph/main.js +1 -1
- package/dist/src/daemon/client/client.d.ts +0 -2
- package/dist/src/daemon/client/client.js +17 -19
- package/dist/src/devkit-internals.d.ts +2 -0
- package/dist/src/devkit-internals.js +7 -1
- package/dist/src/generators/utils/nx-json.js +13 -3
- package/dist/src/native/index.d.ts +1 -1
- package/dist/src/native/nx.wasm32-wasi.debug.wasm +0 -0
- package/dist/src/native/nx.wasm32-wasi.wasm +0 -0
- package/dist/src/plugins/js/lock-file/npm-parser.js +71 -27
- package/dist/src/plugins/js/lock-file/pnpm-parser.js +46 -15
- package/dist/src/plugins/js/lock-file/project-graph-pruning.js +1 -1
- package/dist/src/plugins/js/lock-file/yarn-parser.js +32 -5
- package/dist/src/plugins/js/utils/register.d.ts +18 -0
- package/dist/src/plugins/js/utils/register.js +81 -0
- package/dist/src/plugins/js/utils/typescript.d.ts +9 -0
- package/dist/src/plugins/js/utils/typescript.js +15 -0
- package/dist/src/project-graph/error-types.js +41 -1
- package/dist/src/project-graph/file-utils.js +6 -1
- package/dist/src/project-graph/plugins/isolation/isolated-plugin.js +4 -0
- package/dist/src/project-graph/plugins/transpiler.js +4 -0
- package/dist/src/project-graph/utils/project-configuration/name-substitution-manager.d.ts +9 -12
- package/dist/src/project-graph/utils/project-configuration/name-substitution-manager.js +77 -61
- package/dist/src/project-graph/utils/project-configuration/project-nodes-manager.d.ts +1 -1
- package/dist/src/project-graph/utils/project-configuration/project-nodes-manager.js +1 -1
- package/dist/src/project-graph/utils/project-configuration-utils.js +4 -6
- package/dist/src/tasks-runner/life-cycles/performance-analysis.d.ts +11 -4
- package/dist/src/tasks-runner/life-cycles/performance-analysis.js +15 -6
- package/dist/src/tasks-runner/life-cycles/performance-life-cycle.js +5 -4
- package/dist/src/tasks-runner/life-cycles/performance-report.d.ts +18 -8
- package/dist/src/tasks-runner/life-cycles/performance-report.js +66 -29
- package/dist/src/tasks-runner/run-command.js +5 -3
- package/dist/src/utils/acknowledge-build-scripts.d.ts +13 -0
- package/dist/src/utils/acknowledge-build-scripts.js +100 -0
- package/dist/src/utils/catalog/manager-utils.d.ts +1 -2
- package/dist/src/utils/catalog/manager-utils.js +22 -5
- package/dist/src/utils/catalog/pnpm-manager.d.ts +1 -0
- package/dist/src/utils/catalog/pnpm-manager.js +3 -15
- package/dist/src/utils/catalog/yarn-manager.d.ts +1 -0
- package/dist/src/utils/catalog/yarn-manager.js +3 -15
- package/dist/src/utils/command-line-utils.js +30 -20
- package/dist/src/utils/git-revision.d.ts +12 -0
- package/dist/src/utils/git-revision.js +25 -0
- package/dist/src/utils/git-utils.d.ts +2 -3
- package/dist/src/utils/git-utils.js +101 -47
- package/dist/src/utils/min-release-age/behavior/pnpm.js +9 -7
- package/dist/src/utils/package-manager.js +6 -2
- package/dist/src/utils/provenance.js +12 -2
- package/migrations.json +7 -1
- package/package.json +11 -11
- package/dist/src/migrations/update-17-3-0/nx-release-path.d.ts +0 -3
- package/dist/src/migrations/update-17-3-0/nx-release-path.js +0 -47
|
@@ -1,24 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isHybridMigration = exports.isPromptOnlyMigration = exports.filterDowngradedUpdates = exports.Migrator = exports.normalizeVersion = void 0;
|
|
4
4
|
exports.formatCommandFailure = formatCommandFailure;
|
|
5
5
|
exports.resolveCanonicalNxPackage = resolveCanonicalNxPackage;
|
|
6
6
|
exports.resolveInclude = resolveInclude;
|
|
7
7
|
exports.parseMigrationsOptions = parseMigrationsOptions;
|
|
8
8
|
exports.createFetcher = createFetcher;
|
|
9
9
|
exports.generateMigrationsJsonAndUpdatePackageJson = generateMigrationsJsonAndUpdatePackageJson;
|
|
10
|
-
exports.isNpmPeerDepsError = isNpmPeerDepsError;
|
|
11
10
|
exports.resolveAgenticRunId = resolveAgenticRunId;
|
|
12
11
|
exports.formatSkippedPromptsNextStep = formatSkippedPromptsNextStep;
|
|
13
12
|
exports.resolveCreateCommits = resolveCreateCommits;
|
|
13
|
+
exports.confirmCommitsOnDefaultBranch = confirmCommitsOnDefaultBranch;
|
|
14
14
|
exports.resolveShouldRunValidation = resolveShouldRunValidation;
|
|
15
15
|
exports.executeMigrations = executeMigrations;
|
|
16
|
-
exports.runNxOrAngularMigration = runNxOrAngularMigration;
|
|
17
|
-
exports.parseMigrationReturn = parseMigrationReturn;
|
|
18
16
|
exports.migrate = migrate;
|
|
19
17
|
exports.runMigration = runMigration;
|
|
20
|
-
exports.readMigrationCollection = readMigrationCollection;
|
|
21
|
-
exports.getImplementationPath = getImplementationPath;
|
|
22
18
|
exports.resolveMigrationForRun = resolveMigrationForRun;
|
|
23
19
|
exports.resolveDocumentationFileToWorkspacePath = resolveDocumentationFileToWorkspacePath;
|
|
24
20
|
exports.nxCliPath = nxCliPath;
|
|
@@ -26,19 +22,18 @@ const tslib_1 = require("tslib");
|
|
|
26
22
|
const pc = tslib_1.__importStar(require("picocolors"));
|
|
27
23
|
const child_process_1 = require("child_process");
|
|
28
24
|
const safe_prompt_1 = require("./safe-prompt");
|
|
29
|
-
const handle_import_1 = require("../../utils/handle-import");
|
|
30
25
|
const path_1 = require("path");
|
|
31
26
|
const module_1 = require("module");
|
|
32
27
|
const path_2 = require("../../utils/path");
|
|
33
28
|
const semver_1 = require("semver");
|
|
34
29
|
const node_url_1 = require("node:url");
|
|
35
30
|
const util_1 = require("util");
|
|
36
|
-
const tree_1 = require("../../generators/tree");
|
|
37
31
|
const fileutils_1 = require("../../utils/fileutils");
|
|
38
32
|
const tar_1 = require("../../utils/tar");
|
|
39
33
|
const write_formatted_json_file_1 = require("../../utils/write-formatted-json-file");
|
|
40
34
|
const logger_1 = require("../../utils/logger");
|
|
41
35
|
const git_utils_1 = require("../../utils/git-utils");
|
|
36
|
+
const command_line_utils_1 = require("../../utils/command-line-utils");
|
|
42
37
|
const package_json_1 = require("../../utils/package-json");
|
|
43
38
|
const package_manager_1 = require("../../utils/package-manager");
|
|
44
39
|
const errors_1 = require("../../utils/min-release-age/errors");
|
|
@@ -55,7 +50,6 @@ const configuration_1 = require("../../config/configuration");
|
|
|
55
50
|
const child_process_2 = require("../../utils/child-process");
|
|
56
51
|
const client_1 = require("../../daemon/client/client");
|
|
57
52
|
const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
|
|
58
|
-
const project_graph_1 = require("../../project-graph/project-graph");
|
|
59
53
|
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
60
54
|
const provenance_1 = require("../../utils/provenance");
|
|
61
55
|
const catalog_1 = require("../../utils/catalog");
|
|
@@ -74,6 +68,8 @@ const update_filters_1 = require("./update-filters");
|
|
|
74
68
|
Object.defineProperty(exports, "filterDowngradedUpdates", { enumerable: true, get: function () { return update_filters_1.filterDowngradedUpdates; } });
|
|
75
69
|
const version_utils_1 = require("./version-utils");
|
|
76
70
|
Object.defineProperty(exports, "normalizeVersion", { enumerable: true, get: function () { return version_utils_1.normalizeVersion; } });
|
|
71
|
+
const execute_migration_1 = require("./execute-migration");
|
|
72
|
+
tslib_1.__exportStar(require("./execute-migration"), exports);
|
|
77
73
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
78
74
|
function formatCommandFailure(command, error) {
|
|
79
75
|
const normalizeCommandOutput = (output) => {
|
|
@@ -1189,7 +1185,7 @@ async function getPackageMigrationsUsingInstallImpl(packageName, packageVersion,
|
|
|
1189
1185
|
// as-is by the outer catch instead of being mislabeled as install failures.
|
|
1190
1186
|
throw new Error(formatCommandFailure(addCommand, e));
|
|
1191
1187
|
}
|
|
1192
|
-
const { migrations: migrationsFilePath, packageGroup, supportsOptionalMigrations, packageJson, } = readPackageMigrationConfig(packageName, dir);
|
|
1188
|
+
const { migrations: migrationsFilePath, packageGroup, supportsOptionalMigrations, packageJson, } = (0, execute_migration_1.readPackageMigrationConfig)(packageName, dir);
|
|
1193
1189
|
let migrations = undefined;
|
|
1194
1190
|
let resolvedPromptFiles;
|
|
1195
1191
|
if (migrationsFilePath) {
|
|
@@ -1216,32 +1212,6 @@ async function getPackageMigrationsUsingInstallImpl(packageName, packageVersion,
|
|
|
1216
1212
|
}
|
|
1217
1213
|
return result;
|
|
1218
1214
|
}
|
|
1219
|
-
function readPackageMigrationConfig(packageName, dir) {
|
|
1220
|
-
const { path: packageJsonPath, packageJson: json } = (0, package_json_1.readModulePackageJson)(packageName, (0, installation_directory_1.getNxRequirePaths)(dir));
|
|
1221
|
-
const config = (0, package_json_1.readNxMigrateConfig)(json);
|
|
1222
|
-
if (!config) {
|
|
1223
|
-
return { packageJson: json, migrations: null, packageGroup: [] };
|
|
1224
|
-
}
|
|
1225
|
-
try {
|
|
1226
|
-
const migrationFile = require.resolve(config.migrations, {
|
|
1227
|
-
paths: [(0, path_1.dirname)(packageJsonPath)],
|
|
1228
|
-
});
|
|
1229
|
-
return {
|
|
1230
|
-
packageJson: json,
|
|
1231
|
-
migrations: migrationFile,
|
|
1232
|
-
packageGroup: config.packageGroup,
|
|
1233
|
-
supportsOptionalMigrations: config.supportsOptionalMigrations,
|
|
1234
|
-
};
|
|
1235
|
-
}
|
|
1236
|
-
catch {
|
|
1237
|
-
return {
|
|
1238
|
-
packageJson: json,
|
|
1239
|
-
migrations: null,
|
|
1240
|
-
packageGroup: config.packageGroup,
|
|
1241
|
-
supportsOptionalMigrations: config.supportsOptionalMigrations,
|
|
1242
|
-
};
|
|
1243
|
-
}
|
|
1244
|
-
}
|
|
1245
1215
|
async function createMigrationsFile(root, migrations) {
|
|
1246
1216
|
await (0, write_formatted_json_file_1.writeFormattedJsonFile)((0, path_1.join)(root, 'migrations.json'), { migrations });
|
|
1247
1217
|
}
|
|
@@ -1608,118 +1578,6 @@ function showConnectToCloudMessage() {
|
|
|
1608
1578
|
return false;
|
|
1609
1579
|
}
|
|
1610
1580
|
}
|
|
1611
|
-
function runInstall(nxWorkspaceRoot, phase = 'pre-migration') {
|
|
1612
|
-
const cwd = nxWorkspaceRoot ?? process.cwd();
|
|
1613
|
-
const packageManager = (0, package_manager_1.detectPackageManager)(cwd);
|
|
1614
|
-
const pmCommands = (0, package_manager_1.getPackageManagerCommand)(packageManager, cwd);
|
|
1615
|
-
const installCommand = `${pmCommands.install} ${pmCommands.ignoreScriptsFlag ?? ''}`;
|
|
1616
|
-
output_1.output.log({
|
|
1617
|
-
title: `Running '${installCommand}' to make sure necessary packages are installed`,
|
|
1618
|
-
});
|
|
1619
|
-
return new Promise((resolve, reject) => {
|
|
1620
|
-
// For npm, pipe stderr so we can detect peer dependency errors while still
|
|
1621
|
-
// mirroring it live to the user's terminal. Other package managers inherit
|
|
1622
|
-
// stderr directly since we don't need to inspect their output.
|
|
1623
|
-
const shouldCaptureStderr = packageManager === 'npm';
|
|
1624
|
-
const child = (0, child_process_1.spawn)(installCommand, {
|
|
1625
|
-
shell: true,
|
|
1626
|
-
stdio: ['inherit', 'inherit', shouldCaptureStderr ? 'pipe' : 'inherit'],
|
|
1627
|
-
windowsHide: true,
|
|
1628
|
-
cwd,
|
|
1629
|
-
});
|
|
1630
|
-
const stderrChunks = [];
|
|
1631
|
-
child.stderr?.on('data', (chunk) => {
|
|
1632
|
-
process.stderr.write(chunk);
|
|
1633
|
-
stderrChunks.push(chunk);
|
|
1634
|
-
});
|
|
1635
|
-
child.on('error', reject);
|
|
1636
|
-
child.on('close', (code) => {
|
|
1637
|
-
if (code === 0) {
|
|
1638
|
-
resolve();
|
|
1639
|
-
return;
|
|
1640
|
-
}
|
|
1641
|
-
if (shouldCaptureStderr) {
|
|
1642
|
-
const stderr = Buffer.concat(stderrChunks).toString().trim();
|
|
1643
|
-
if (isNpmPeerDepsError(stderr)) {
|
|
1644
|
-
// Log the remediation guidance here so every caller of `runInstall`
|
|
1645
|
-
// (CLI migrate, `nx repair`, single-migration runner, etc.) surfaces
|
|
1646
|
-
// it consistently. Top-level callers catch `NpmPeerDepsInstallError`
|
|
1647
|
-
// and return a non-zero exit code without re-logging.
|
|
1648
|
-
logNpmPeerDepsError(phase);
|
|
1649
|
-
reject(new NpmPeerDepsInstallError());
|
|
1650
|
-
return;
|
|
1651
|
-
}
|
|
1652
|
-
}
|
|
1653
|
-
reject(new Error(`Command failed: ${installCommand}`));
|
|
1654
|
-
});
|
|
1655
|
-
});
|
|
1656
|
-
}
|
|
1657
|
-
class NpmPeerDepsInstallError extends Error {
|
|
1658
|
-
constructor() {
|
|
1659
|
-
super('npm install failed due to peer dependency conflicts.');
|
|
1660
|
-
this.name = 'NpmPeerDepsInstallError';
|
|
1661
|
-
}
|
|
1662
|
-
}
|
|
1663
|
-
/**
|
|
1664
|
-
* Detects npm peer-dependency resolution failures. Keyed on the `ERESOLVE`
|
|
1665
|
-
* error code, which npm consistently emits for this class of failure across
|
|
1666
|
-
* v7+ (`npm ERR! code ERESOLVE` / `npm error code ERESOLVE`). Falls back to a
|
|
1667
|
-
* small set of stable phrases in case the code line is missing from the
|
|
1668
|
-
* captured output.
|
|
1669
|
-
*/
|
|
1670
|
-
function isNpmPeerDepsError(stderr) {
|
|
1671
|
-
if (/\bERESOLVE\b/.test(stderr)) {
|
|
1672
|
-
return true;
|
|
1673
|
-
}
|
|
1674
|
-
const lowerStderr = stderr.toLowerCase();
|
|
1675
|
-
return (lowerStderr.includes('unable to resolve dependency tree') ||
|
|
1676
|
-
lowerStderr.includes('could not resolve dependency') ||
|
|
1677
|
-
lowerStderr.includes('conflicting peer dependency'));
|
|
1678
|
-
}
|
|
1679
|
-
function logNpmPeerDepsError(phase) {
|
|
1680
|
-
const peerDepsResolutionSteps = [
|
|
1681
|
-
'Recommended approaches (in order of preference):',
|
|
1682
|
-
'',
|
|
1683
|
-
'1. Use "overrides" in package.json to force compatible versions across the dependency tree.',
|
|
1684
|
-
' See https://docs.npmjs.com/cli/configuring-npm/package-json#overrides',
|
|
1685
|
-
'2. Persist legacy peer deps resolution in the project ".npmrc":',
|
|
1686
|
-
' npm config set legacy-peer-deps=true --location=project',
|
|
1687
|
-
' (bypasses peer dependency resolution; use with caution)',
|
|
1688
|
-
'3. As a last resort, force the installation by running "npm install --force".',
|
|
1689
|
-
' (does not persist and may produce broken installs)',
|
|
1690
|
-
];
|
|
1691
|
-
const manualInstallHint = [
|
|
1692
|
-
'If you installed the dependencies manually, pass "--skip-install" to avoid re-installing them:',
|
|
1693
|
-
' nx migrate --run-migrations --skip-install',
|
|
1694
|
-
];
|
|
1695
|
-
if (phase === 'pre-migration') {
|
|
1696
|
-
output_1.output.error({
|
|
1697
|
-
title: 'You need to resolve the peer dependency conflicts before the migration can continue',
|
|
1698
|
-
bodyLines: [
|
|
1699
|
-
...peerDepsResolutionSteps,
|
|
1700
|
-
'',
|
|
1701
|
-
'Once the conflicts are resolved, re-run the migrations:',
|
|
1702
|
-
' nx migrate --run-migrations',
|
|
1703
|
-
'',
|
|
1704
|
-
...manualInstallHint,
|
|
1705
|
-
],
|
|
1706
|
-
});
|
|
1707
|
-
}
|
|
1708
|
-
else {
|
|
1709
|
-
output_1.output.error({
|
|
1710
|
-
title: 'Some migrations have been applied, but installing the updated dependencies failed',
|
|
1711
|
-
bodyLines: [
|
|
1712
|
-
...peerDepsResolutionSteps,
|
|
1713
|
-
'',
|
|
1714
|
-
'Once the conflicts are resolved, run "npm install" to install the updated dependencies.',
|
|
1715
|
-
'If the migration was interrupted before completing, re-run the remaining migrations:',
|
|
1716
|
-
' nx migrate --run-migrations',
|
|
1717
|
-
'',
|
|
1718
|
-
...manualInstallHint,
|
|
1719
|
-
],
|
|
1720
|
-
});
|
|
1721
|
-
}
|
|
1722
|
-
}
|
|
1723
1581
|
function resolveAgenticRunId(migrations) {
|
|
1724
1582
|
return (0, semver_1.rsort)(migrations.map((m) => (0, version_utils_1.normalizeVersion)(m.version)))[0];
|
|
1725
1583
|
}
|
|
@@ -1784,6 +1642,30 @@ function resolveCreateCommits(args) {
|
|
|
1784
1642
|
: undefined,
|
|
1785
1643
|
};
|
|
1786
1644
|
}
|
|
1645
|
+
/**
|
|
1646
|
+
* Confirms before creating per-migration commits while the user sits on the
|
|
1647
|
+
* repository's default branch, so migrations don't silently commit there (most
|
|
1648
|
+
* relevant since `--agentic` enables commits by default). Only the default
|
|
1649
|
+
* branch triggers a prompt; a detached HEAD, a different branch, or an
|
|
1650
|
+
* unresolved default branch all proceed untouched. Callers gate this on
|
|
1651
|
+
* commits being effective and prompting being possible, so non-interactive
|
|
1652
|
+
* runs (CI, `--no-interactive`) never reach here.
|
|
1653
|
+
*/
|
|
1654
|
+
async function confirmCommitsOnDefaultBranch(args) {
|
|
1655
|
+
const { currentBranch, defaultBranch } = args;
|
|
1656
|
+
if (!currentBranch || !defaultBranch || currentBranch !== defaultBranch) {
|
|
1657
|
+
return true;
|
|
1658
|
+
}
|
|
1659
|
+
const { proceed } = await (0, safe_prompt_1.migratePrompt)([
|
|
1660
|
+
{
|
|
1661
|
+
name: 'proceed',
|
|
1662
|
+
type: 'confirm',
|
|
1663
|
+
message: `You're on the default branch '${currentBranch}'. nx migrate will create a commit for each migration on this branch. Continue?`,
|
|
1664
|
+
initial: false,
|
|
1665
|
+
},
|
|
1666
|
+
]);
|
|
1667
|
+
return proceed;
|
|
1668
|
+
}
|
|
1787
1669
|
/**
|
|
1788
1670
|
* Resolves whether the framework-owned generic-validation agent step should run
|
|
1789
1671
|
* after generator-only migrations.
|
|
@@ -1797,7 +1679,7 @@ function resolveShouldRunValidation(args) {
|
|
|
1797
1679
|
return args.validate !== false && args.agenticKind === 'enabled';
|
|
1798
1680
|
}
|
|
1799
1681
|
async function executeMigrations(root, migrations, isVerbose, shouldCreateCommits, commitPrefix, shouldSkipInstall = false, agentic, agenticHasDiffContext = false, shouldRunValidation = false) {
|
|
1800
|
-
const changedDepInstaller = new ChangedDepInstaller(root, shouldSkipInstall);
|
|
1682
|
+
const changedDepInstaller = new execute_migration_1.ChangedDepInstaller(root, shouldSkipInstall);
|
|
1801
1683
|
const migrationsWithNoChanges = [];
|
|
1802
1684
|
const sortedMigrations = migrations.sort((a, b) => {
|
|
1803
1685
|
// Under `--agentic`, hoist the v23 migration that ignores
|
|
@@ -1957,7 +1839,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
|
|
|
1957
1839
|
}
|
|
1958
1840
|
}
|
|
1959
1841
|
else if ((0, migration_shape_1.isHybridMigration)(m)) {
|
|
1960
|
-
const { changes, nextSteps, agentContext, logs, madeChanges } = await runNxOrAngularMigration(root, m, isVerbose,
|
|
1842
|
+
const { changes, nextSteps, agentContext, logs, madeChanges } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose,
|
|
1961
1843
|
/* captureGeneratorOutput: */ !!agenticRun, resolvedCollection);
|
|
1962
1844
|
migrationEmittedNextSteps.push(...nextSteps);
|
|
1963
1845
|
if (agenticRun) {
|
|
@@ -2021,7 +1903,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
|
|
|
2021
1903
|
// Defer commit until validation succeeds; failed validation leaves
|
|
2022
1904
|
// changes uncommitted in the working tree for the user to review.
|
|
2023
1905
|
const validationRun = agenticRun && shouldRunValidation ? agenticRun : undefined;
|
|
2024
|
-
const { changes, nextSteps, agentContext, logs, madeChanges } = await runNxOrAngularMigration(root, m, isVerbose,
|
|
1906
|
+
const { changes, nextSteps, agentContext, logs, madeChanges } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose,
|
|
2025
1907
|
/* captureGeneratorOutput: */ !!validationRun, resolvedCollection);
|
|
2026
1908
|
migrationEmittedNextSteps.push(...nextSteps);
|
|
2027
1909
|
const canRunValidation = !!validationRun && changes.length > 0;
|
|
@@ -2098,7 +1980,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
|
|
|
2098
1980
|
// `nx repair` reuses executeMigrations; only record for migrate runs.
|
|
2099
1981
|
if ((0, migrate_analytics_1.hasMigrateRunStarted)()) {
|
|
2100
1982
|
(0, migrate_analytics_1.reportMigrateRunError)({
|
|
2101
|
-
code: e instanceof NpmPeerDepsInstallError
|
|
1983
|
+
code: e instanceof execute_migration_1.NpmPeerDepsInstallError
|
|
2102
1984
|
? 'npm_install'
|
|
2103
1985
|
: inAgenticStep
|
|
2104
1986
|
? 'agentic'
|
|
@@ -2109,7 +1991,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
|
|
|
2109
1991
|
error: e,
|
|
2110
1992
|
});
|
|
2111
1993
|
}
|
|
2112
|
-
if (!(e instanceof NpmPeerDepsInstallError)) {
|
|
1994
|
+
if (!(e instanceof execute_migration_1.NpmPeerDepsInstallError)) {
|
|
2113
1995
|
// `withGeneratorOutputCapture` attaches the generator's `console.*`
|
|
2114
1996
|
// output as `capturedLogs` (best-effort; may be absent). Surface it
|
|
2115
1997
|
// so the user sees what the generator printed before it crashed.
|
|
@@ -2163,30 +2045,6 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
|
|
|
2163
2045
|
retainedAtSuccess: (0, migrate_output_1.retainedMigrations)(outcomes).map((p) => `${p.package}: ${p.name}`),
|
|
2164
2046
|
};
|
|
2165
2047
|
}
|
|
2166
|
-
class ChangedDepInstaller {
|
|
2167
|
-
constructor(root, shouldSkipInstall = false) {
|
|
2168
|
-
this.root = root;
|
|
2169
|
-
this.shouldSkipInstall = shouldSkipInstall;
|
|
2170
|
-
this._skippedInstall = false;
|
|
2171
|
-
this.initialDeps = getStringifiedPackageJsonDeps(root);
|
|
2172
|
-
}
|
|
2173
|
-
get skippedInstall() {
|
|
2174
|
-
return this._skippedInstall;
|
|
2175
|
-
}
|
|
2176
|
-
async installDepsIfChanged() {
|
|
2177
|
-
const currentDeps = getStringifiedPackageJsonDeps(this.root);
|
|
2178
|
-
if (this.initialDeps !== currentDeps) {
|
|
2179
|
-
if (this.shouldSkipInstall) {
|
|
2180
|
-
this._skippedInstall = true;
|
|
2181
|
-
}
|
|
2182
|
-
else {
|
|
2183
|
-
await runInstall(this.root, 'post-migration');
|
|
2184
|
-
}
|
|
2185
|
-
}
|
|
2186
|
-
this.initialDeps = currentDeps;
|
|
2187
|
-
}
|
|
2188
|
-
}
|
|
2189
|
-
exports.ChangedDepInstaller = ChangedDepInstaller;
|
|
2190
2048
|
function logSkippedPostMigrationInstall(root) {
|
|
2191
2049
|
const packageManager = (0, package_manager_1.detectPackageManager)(root);
|
|
2192
2050
|
const installCommand = (0, package_manager_1.getPackageManagerCommand)(packageManager, root).install;
|
|
@@ -2195,58 +2053,9 @@ function logSkippedPostMigrationInstall(root) {
|
|
|
2195
2053
|
bodyLines: [`Run "${installCommand}" to install the updated dependencies.`],
|
|
2196
2054
|
});
|
|
2197
2055
|
}
|
|
2198
|
-
async function runNxOrAngularMigration(root, migration, isVerbose, captureGeneratorOutput = false, resolvedCollection) {
|
|
2199
|
-
const { collection, collectionPath } = resolvedCollection ?? readMigrationCollection(migration.package, root);
|
|
2200
|
-
let changes = [];
|
|
2201
|
-
let nextSteps = [];
|
|
2202
|
-
let agentContext = [];
|
|
2203
|
-
let logs = '';
|
|
2204
|
-
// Angular's `ngResult.changes` is synthesized from the schematic's
|
|
2205
|
-
// DryRunEvent stream so Nx and Angular paths can share commit/validation
|
|
2206
|
-
// gating via `changes.length > 0`.
|
|
2207
|
-
let madeChanges = false;
|
|
2208
|
-
logger_1.logger.info(pc.dim('→ Running generator…'));
|
|
2209
|
-
if (!isAngularMigration(collection, migration.name)) {
|
|
2210
|
-
({ nextSteps, changes, agentContext, logs } = await runNxMigration(root, collectionPath, collection, migration.name, migration.version, captureGeneratorOutput));
|
|
2211
|
-
madeChanges = changes.length > 0;
|
|
2212
|
-
logger_1.logger.info(`Ran ${migration.name} from ${migration.package}`);
|
|
2213
|
-
if (migration.description) {
|
|
2214
|
-
logger_1.logger.info(` ${migration.description}`);
|
|
2215
|
-
}
|
|
2216
|
-
logger_1.logger.info('');
|
|
2217
|
-
if (!madeChanges) {
|
|
2218
|
-
logger_1.logger.info(`No changes were made\n`);
|
|
2219
|
-
return { changes, nextSteps, agentContext, logs, madeChanges };
|
|
2220
|
-
}
|
|
2221
|
-
logger_1.logger.info('Changes:');
|
|
2222
|
-
(0, tree_1.printChanges)(changes, ' ');
|
|
2223
|
-
logger_1.logger.info('');
|
|
2224
|
-
}
|
|
2225
|
-
else {
|
|
2226
|
-
const ngCliAdapter = await getNgCompatLayer();
|
|
2227
|
-
const migrationProjectGraph = await (0, project_graph_1.createProjectGraphAsync)();
|
|
2228
|
-
const ngResult = await ngCliAdapter.runMigration(root, migration.package, migration.name, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(migrationProjectGraph).projects, isVerbose, migrationProjectGraph);
|
|
2229
|
-
changes = ngResult.changes;
|
|
2230
|
-
madeChanges = ngResult.madeChanges;
|
|
2231
|
-
logs = ngResult.loggingQueue.join('\n');
|
|
2232
|
-
logger_1.logger.info(`Ran ${migration.name} from ${migration.package}`);
|
|
2233
|
-
if (migration.description) {
|
|
2234
|
-
logger_1.logger.info(` ${migration.description}`);
|
|
2235
|
-
}
|
|
2236
|
-
logger_1.logger.info('');
|
|
2237
|
-
if (!madeChanges) {
|
|
2238
|
-
logger_1.logger.info(`No changes were made\n`);
|
|
2239
|
-
return { changes, nextSteps, agentContext, logs, madeChanges };
|
|
2240
|
-
}
|
|
2241
|
-
logger_1.logger.info('Changes:');
|
|
2242
|
-
ngResult.loggingQueue.forEach((log) => logger_1.logger.info(' ' + log));
|
|
2243
|
-
logger_1.logger.info('');
|
|
2244
|
-
}
|
|
2245
|
-
return { changes, nextSteps, agentContext, logs, madeChanges };
|
|
2246
|
-
}
|
|
2247
2056
|
async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits, commitPrefix, shouldSkipInstall = false) {
|
|
2248
2057
|
if (!shouldSkipInstall && !process.env.NX_MIGRATE_SKIP_INSTALL) {
|
|
2249
|
-
await runInstall();
|
|
2058
|
+
await (0, execute_migration_1.runInstall)();
|
|
2250
2059
|
}
|
|
2251
2060
|
if (!__dirname.startsWith(workspace_root_1.workspaceRoot)) {
|
|
2252
2061
|
// we are running from a temp installation with nx latest, switch to running
|
|
@@ -2304,6 +2113,25 @@ async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits, c
|
|
|
2304
2113
|
if (createCommitsWarning) {
|
|
2305
2114
|
output_1.output.warn({ title: createCommitsWarning });
|
|
2306
2115
|
}
|
|
2116
|
+
if (effectiveCreateCommits && (0, safe_prompt_1.canPrompt)(opts.interactive)) {
|
|
2117
|
+
const currentBranch = (0, git_utils_1.getGitCurrentBranch)(root);
|
|
2118
|
+
// `getBaseRef` may carry an `origin/` prefix (set by the CI-workflow
|
|
2119
|
+
// generator); compare against the local branch name.
|
|
2120
|
+
const defaultBranch = (0, command_line_utils_1.getBaseRef)((0, configuration_1.readNxJson)(root)).replace(/^origin\//, '');
|
|
2121
|
+
const proceed = await confirmCommitsOnDefaultBranch({
|
|
2122
|
+
currentBranch,
|
|
2123
|
+
defaultBranch,
|
|
2124
|
+
});
|
|
2125
|
+
if (!proceed) {
|
|
2126
|
+
output_1.output.log({
|
|
2127
|
+
title: `Skipped running migrations to avoid committing to the default branch '${currentBranch}'.`,
|
|
2128
|
+
bodyLines: [
|
|
2129
|
+
'Switch to a different branch and re-run, or re-run and confirm to proceed.',
|
|
2130
|
+
],
|
|
2131
|
+
});
|
|
2132
|
+
return;
|
|
2133
|
+
}
|
|
2134
|
+
}
|
|
2307
2135
|
const shouldRunValidation = resolveShouldRunValidation({
|
|
2308
2136
|
validate: opts.validate,
|
|
2309
2137
|
agenticKind: agentic.kind,
|
|
@@ -2419,59 +2247,6 @@ async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits, c
|
|
|
2419
2247
|
appliedCount,
|
|
2420
2248
|
});
|
|
2421
2249
|
}
|
|
2422
|
-
function getStringifiedPackageJsonDeps(root) {
|
|
2423
|
-
try {
|
|
2424
|
-
const { dependencies, devDependencies } = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
|
|
2425
|
-
return JSON.stringify([dependencies, devDependencies]);
|
|
2426
|
-
}
|
|
2427
|
-
catch {
|
|
2428
|
-
// We don't really care if the .nx/installation property changes,
|
|
2429
|
-
// whenever nxw is invoked it will handle the dep updates.
|
|
2430
|
-
return '';
|
|
2431
|
-
}
|
|
2432
|
-
}
|
|
2433
|
-
async function runNxMigration(root, collectionPath, collection, name, migrationVersion, captureGeneratorOutput) {
|
|
2434
|
-
const { path: implPath, fnSymbol } = getImplementationPath(collection, collectionPath, name, migrationVersion);
|
|
2435
|
-
const fn = require(implPath)[fnSymbol];
|
|
2436
|
-
const host = new tree_1.FsTree(root, process.env.NX_VERBOSE_LOGGING === 'true', `migration ${collection.name}:${name}`);
|
|
2437
|
-
let result;
|
|
2438
|
-
let logs = '';
|
|
2439
|
-
if (captureGeneratorOutput) {
|
|
2440
|
-
const { withGeneratorOutputCapture } = require('./agentic/capture-generator-output');
|
|
2441
|
-
({ result, logs } = await withGeneratorOutputCapture(() => fn(host, {})));
|
|
2442
|
-
}
|
|
2443
|
-
else {
|
|
2444
|
-
result = await fn(host, {});
|
|
2445
|
-
}
|
|
2446
|
-
const { nextSteps, agentContext } = parseMigrationReturn(result);
|
|
2447
|
-
host.lock();
|
|
2448
|
-
const changes = host.listChanges();
|
|
2449
|
-
(0, tree_1.flushChanges)(root, changes);
|
|
2450
|
-
return { changes, nextSteps, agentContext, logs };
|
|
2451
|
-
}
|
|
2452
|
-
function parseMigrationReturn(value) {
|
|
2453
|
-
if (Array.isArray(value)) {
|
|
2454
|
-
return { nextSteps: filterStrings(value), agentContext: [] };
|
|
2455
|
-
}
|
|
2456
|
-
if (value && typeof value === 'object') {
|
|
2457
|
-
const obj = value;
|
|
2458
|
-
return {
|
|
2459
|
-
nextSteps: filterStrings(obj.nextSteps),
|
|
2460
|
-
agentContext: filterStrings(obj.agentContext),
|
|
2461
|
-
};
|
|
2462
|
-
}
|
|
2463
|
-
// Catches `void`, mistakenly-returned generator callbacks, malformed values.
|
|
2464
|
-
return { nextSteps: [], agentContext: [] };
|
|
2465
|
-
}
|
|
2466
|
-
// Bucket-level tolerance: a single non-string entry shouldn't discard the
|
|
2467
|
-
// whole `nextSteps` / `agentContext` array. Migration authors occasionally
|
|
2468
|
-
// push `null` / `undefined` / a number into the array; we drop the bad entries
|
|
2469
|
-
// and keep the rest so end-of-run guidance isn't silently lost.
|
|
2470
|
-
function filterStrings(value) {
|
|
2471
|
-
if (!Array.isArray(value))
|
|
2472
|
-
return [];
|
|
2473
|
-
return value.filter((v) => typeof v === 'string');
|
|
2474
|
-
}
|
|
2475
2250
|
async function migrate(root, args, rawArgs) {
|
|
2476
2251
|
await client_1.daemonClient.stop();
|
|
2477
2252
|
return (0, handle_errors_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
|
|
@@ -2505,7 +2280,7 @@ async function migrate(root, args, rawArgs) {
|
|
|
2505
2280
|
// The remediation guidance is already logged by `runInstall`; swallow
|
|
2506
2281
|
// the error here so `handleErrors` doesn't print a noisy stack after
|
|
2507
2282
|
// the friendly output.
|
|
2508
|
-
if (e instanceof NpmPeerDepsInstallError) {
|
|
2283
|
+
if (e instanceof execute_migration_1.NpmPeerDepsInstallError) {
|
|
2509
2284
|
(0, migrate_analytics_1.reportMigrateRunError)({ code: 'npm_install', error: e });
|
|
2510
2285
|
return 1;
|
|
2511
2286
|
}
|
|
@@ -2540,39 +2315,6 @@ async function runMigration() {
|
|
|
2540
2315
|
return runLocalMigrate();
|
|
2541
2316
|
});
|
|
2542
2317
|
}
|
|
2543
|
-
function readMigrationCollection(packageName, root) {
|
|
2544
|
-
const collectionPath = readPackageMigrationConfig(packageName, root).migrations;
|
|
2545
|
-
const collection = (0, fileutils_1.readJsonFile)(collectionPath);
|
|
2546
|
-
collection.name ??= packageName;
|
|
2547
|
-
return {
|
|
2548
|
-
collection,
|
|
2549
|
-
collectionPath,
|
|
2550
|
-
};
|
|
2551
|
-
}
|
|
2552
|
-
function getImplementationPath(collection, collectionPath, name, migrationVersion) {
|
|
2553
|
-
const g = collection.generators?.[name] || collection.schematics?.[name];
|
|
2554
|
-
if (!g) {
|
|
2555
|
-
throw new MigrationImplementationMissingError(`Unable to determine implementation path for "${collectionPath}:${name}"`, collectionPath, migrationVersion);
|
|
2556
|
-
}
|
|
2557
|
-
const implRelativePathAndMaybeSymbol = g.implementation || g.factory;
|
|
2558
|
-
const [implRelativePath, fnSymbol = 'default'] = implRelativePathAndMaybeSymbol.split('#');
|
|
2559
|
-
let implPath;
|
|
2560
|
-
try {
|
|
2561
|
-
implPath = require.resolve(implRelativePath, {
|
|
2562
|
-
paths: [(0, path_1.dirname)(collectionPath)],
|
|
2563
|
-
});
|
|
2564
|
-
}
|
|
2565
|
-
catch (e) {
|
|
2566
|
-
try {
|
|
2567
|
-
// workaround for a bug in node 12
|
|
2568
|
-
implPath = require.resolve(`${(0, path_1.dirname)(collectionPath)}/${implRelativePath}`);
|
|
2569
|
-
}
|
|
2570
|
-
catch {
|
|
2571
|
-
throw new MigrationImplementationMissingError(`Could not resolve implementation for migration "${name}" from "${collectionPath}"`, collectionPath, migrationVersion ?? g.version);
|
|
2572
|
-
}
|
|
2573
|
-
}
|
|
2574
|
-
return { path: implPath, fnSymbol };
|
|
2575
|
-
}
|
|
2576
2318
|
/**
|
|
2577
2319
|
* Resolves a migration's collection once and derives everything the run loop
|
|
2578
2320
|
* needs from that single read: the implementation context (`collection` +
|
|
@@ -2591,11 +2333,11 @@ function getImplementationPath(collection, collectionPath, name, migrationVersio
|
|
|
2591
2333
|
function resolveMigrationForRun(root, migration, resolveDocumentation) {
|
|
2592
2334
|
let resolvedCollection;
|
|
2593
2335
|
if (!(0, migration_shape_1.isPromptOnlyMigration)(migration)) {
|
|
2594
|
-
resolvedCollection = readMigrationCollection(migration.package, root);
|
|
2336
|
+
resolvedCollection = (0, execute_migration_1.readMigrationCollection)(migration.package, root);
|
|
2595
2337
|
}
|
|
2596
2338
|
else if (resolveDocumentation && migration.documentation) {
|
|
2597
2339
|
try {
|
|
2598
|
-
resolvedCollection = readMigrationCollection(migration.package, root);
|
|
2340
|
+
resolvedCollection = (0, execute_migration_1.readMigrationCollection)(migration.package, root);
|
|
2599
2341
|
}
|
|
2600
2342
|
catch {
|
|
2601
2343
|
// Non-fatal: documentation is supplementary; the warning below fires.
|
|
@@ -2630,52 +2372,6 @@ function resolveDocumentationFileToWorkspacePath(root, migrationsDir, documentat
|
|
|
2630
2372
|
const relativePath = (0, path_1.relative)(root, documentationFile);
|
|
2631
2373
|
return relativePath.startsWith('..') ? documentationFile : relativePath;
|
|
2632
2374
|
}
|
|
2633
|
-
class MigrationImplementationMissingError extends Error {
|
|
2634
|
-
constructor(baseMessage, collectionPath, migrationVersion) {
|
|
2635
|
-
super(buildMigrationMissingMessage(baseMessage, collectionPath, migrationVersion));
|
|
2636
|
-
this.name = 'MigrationImplementationMissingError';
|
|
2637
|
-
}
|
|
2638
|
-
}
|
|
2639
|
-
function buildMigrationMissingMessage(baseMessage, collectionPath, migrationVersion) {
|
|
2640
|
-
if (!migrationVersion) {
|
|
2641
|
-
return baseMessage;
|
|
2642
|
-
}
|
|
2643
|
-
try {
|
|
2644
|
-
const packageJsonPath = (0, path_1.join)((0, path_1.dirname)(collectionPath), 'package.json');
|
|
2645
|
-
if (!(0, fs_1.existsSync)(packageJsonPath)) {
|
|
2646
|
-
return baseMessage;
|
|
2647
|
-
}
|
|
2648
|
-
const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
|
|
2649
|
-
const installedVersion = packageJson.version;
|
|
2650
|
-
if (installedVersion &&
|
|
2651
|
-
(0, semver_1.lt)((0, version_utils_1.normalizeVersion)(installedVersion), (0, version_utils_1.normalizeVersion)(migrationVersion))) {
|
|
2652
|
-
const packageManager = (0, package_manager_1.detectPackageManager)();
|
|
2653
|
-
const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
|
|
2654
|
-
const overrideFieldName = getOverrideFieldName(packageManager);
|
|
2655
|
-
return (`${baseMessage}\n\n` +
|
|
2656
|
-
`The installed version of "${packageJson.name}" is ${installedVersion}, ` +
|
|
2657
|
-
`but this migration requires version ${migrationVersion}. ` +
|
|
2658
|
-
`This likely means the package version is being held back by an ${overrideFieldName} ` +
|
|
2659
|
-
`in your package.json. ` +
|
|
2660
|
-
`Remove the ${overrideFieldName} and run "${pmc.install}" to install the correct version.`);
|
|
2661
|
-
}
|
|
2662
|
-
}
|
|
2663
|
-
catch {
|
|
2664
|
-
// Fall through to return the base message if we can't read package info
|
|
2665
|
-
}
|
|
2666
|
-
return baseMessage;
|
|
2667
|
-
}
|
|
2668
|
-
function getOverrideFieldName(packageManager) {
|
|
2669
|
-
switch (packageManager) {
|
|
2670
|
-
case 'pnpm':
|
|
2671
|
-
return '"pnpm.overrides"';
|
|
2672
|
-
case 'yarn':
|
|
2673
|
-
return '"resolutions"';
|
|
2674
|
-
case 'npm':
|
|
2675
|
-
case 'bun':
|
|
2676
|
-
return '"overrides"';
|
|
2677
|
-
}
|
|
2678
|
-
}
|
|
2679
2375
|
async function nxCliPath(nxWorkspaceRoot) {
|
|
2680
2376
|
const version = process.env.NX_MIGRATE_CLI_VERSION || 'latest';
|
|
2681
2377
|
const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
|
|
@@ -2745,16 +2441,3 @@ function addToNodePath(dir) {
|
|
|
2745
2441
|
// Update the env variable.
|
|
2746
2442
|
process.env.NODE_PATH = paths.join(delimiter);
|
|
2747
2443
|
}
|
|
2748
|
-
function isAngularMigration(collection, name) {
|
|
2749
|
-
return !collection.generators?.[name] && collection.schematics?.[name];
|
|
2750
|
-
}
|
|
2751
|
-
const getNgCompatLayer = (() => {
|
|
2752
|
-
let _ngCliAdapter;
|
|
2753
|
-
return async function getNgCompatLayer() {
|
|
2754
|
-
if (!_ngCliAdapter) {
|
|
2755
|
-
_ngCliAdapter = await (0, handle_import_1.handleImport)('../../adapter/ngcli-adapter.js', __dirname);
|
|
2756
|
-
require('../../adapter/compat');
|
|
2757
|
-
}
|
|
2758
|
-
return _ngCliAdapter;
|
|
2759
|
-
};
|
|
2760
|
-
})();
|
|
@@ -443,8 +443,10 @@ function extractReferencesFromCommit(commit) {
|
|
|
443
443
|
references.push({ type: 'issue', value: m[1] });
|
|
444
444
|
}
|
|
445
445
|
}
|
|
446
|
-
// Extract issue references from commit body
|
|
447
|
-
|
|
446
|
+
// Extract issue references from commit body, only when linked via a closing
|
|
447
|
+
// keyword so that other repos' issue numbers mentioned in prose are not
|
|
448
|
+
// picked up (e.g. "web-infra-dev/rspack#2292")
|
|
449
|
+
for (const m of commit.body.matchAll(IssueClosingKeywordRE)) {
|
|
448
450
|
if (!references.some((i) => i.value === m[1])) {
|
|
449
451
|
references.push({ type: 'issue', value: m[1] });
|
|
450
452
|
}
|
|
@@ -473,6 +475,8 @@ const PullRequestRE = /\([ a-z]*(#\d+)\s*\)/gm;
|
|
|
473
475
|
// GitLab style merge request references
|
|
474
476
|
const GitLabMergeRequestRE = /See merge request (?:[a-z0-9/-]+)?(![\d]+)/gim;
|
|
475
477
|
const IssueRE = /(#\d+)/gm;
|
|
478
|
+
// GitHub style issue closing keywords, e.g. "Fixes #1234"
|
|
479
|
+
const IssueClosingKeywordRE = /\b(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?):?\s+(#\d+)/gim;
|
|
476
480
|
const ChangedFileRegex = /(A|M|D|R\d*|C\d*)\t([^\t\n]*)\t?(.*)?/gm;
|
|
477
481
|
const RevertHashRE = /This reverts commit (?<hash>[\da-f]{40})./gm;
|
|
478
482
|
function parseVersionPlanCommit(commit) {
|
|
@@ -86,8 +86,8 @@ export declare class ReleaseGraph {
|
|
|
86
86
|
source: string;
|
|
87
87
|
target: string;
|
|
88
88
|
type: string;
|
|
89
|
-
dependencyCollection: string;
|
|
90
|
-
rawVersionSpec: string;
|
|
89
|
+
dependencyCollection: string | null;
|
|
90
|
+
rawVersionSpec: string | null;
|
|
91
91
|
}[]>;
|
|
92
92
|
readonly releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>;
|
|
93
93
|
private originalFilteredProjects;
|
|
@@ -24,8 +24,8 @@ export interface VersionDataEntry {
|
|
|
24
24
|
source: string;
|
|
25
25
|
target: string;
|
|
26
26
|
type: string;
|
|
27
|
-
dependencyCollection: string;
|
|
28
|
-
rawVersionSpec: string;
|
|
27
|
+
dependencyCollection: string | null;
|
|
28
|
+
rawVersionSpec: string | null;
|
|
29
29
|
}[];
|
|
30
30
|
}
|
|
31
31
|
export declare function isPrerelease(version: string): boolean;
|
|
@@ -116,8 +116,17 @@ function resolveDependencyProjects(dep, projectName, graph) {
|
|
|
116
116
|
function resolveTaskGraphDependencies(graph, extraTargetDeps, projectName, targetName, configuration, depConfigs) {
|
|
117
117
|
try {
|
|
118
118
|
const taskGraph = (0, create_task_graph_1.createTaskGraph)(graph, extraTargetDeps, [projectName], [targetName], configuration, {});
|
|
119
|
-
|
|
120
|
-
|
|
119
|
+
// `createTaskGraph` resolves the target's `defaultConfiguration`, so the real
|
|
120
|
+
// root task id may carry a `:config` suffix that `createTaskId` with the raw
|
|
121
|
+
// configuration would omit. Find the root task by (project, target) instead.
|
|
122
|
+
const rootTask = Object.values(taskGraph.tasks).find((task) => task.target.project === projectName && task.target.target === targetName);
|
|
123
|
+
const rootId = rootTask?.id ?? (0, utils_1.createTaskId)(projectName, targetName, configuration);
|
|
124
|
+
// Continuous dependencies (e.g. dev servers) live in a separate map but are
|
|
125
|
+
// direct dependencies just like the entries in `dependencies`.
|
|
126
|
+
const directDeps = [
|
|
127
|
+
...(taskGraph.dependencies[rootId] ?? []),
|
|
128
|
+
...(taskGraph.continuousDependencies[rootId] ?? []),
|
|
129
|
+
];
|
|
121
130
|
const directDepSet = new Set(directDeps);
|
|
122
131
|
const depSourceIndices = directDeps.map((depTaskId) => {
|
|
123
132
|
const task = taskGraph.tasks[depTaskId];
|