diff --git a/scripts/changed-lanes.mjs b/scripts/changed-lanes.mjs index 7790cb4ee06..6e47f74d925 100644 --- a/scripts/changed-lanes.mjs +++ b/scripts/changed-lanes.mjs @@ -203,6 +203,21 @@ export function detectChangedLanes(changedPaths, options = {}) { }; } +/** + * @param {{ paths: string[]; base: string; head?: string; staged?: boolean }} params + * @returns {ChangedLaneResult} + */ +export function detectChangedLanesForPaths(params) { + const packageJsonChangeKind = params.paths.includes("package.json") + ? classifyPackageJsonChangeFromGit({ + base: params.base, + head: params.head, + staged: params.staged, + }) + : null; + return detectChangedLanes(params.paths, { packageJsonChangeKind }); +} + /** * @param {{ base: string; head?: string; includeWorktree?: boolean; cwd?: string }} params * @returns {string[]} @@ -458,14 +473,12 @@ if (isDirectRun()) { : args.staged ? listStagedChangedPaths() : listChangedPathsFromGit({ base: args.base, head: args.head }); - const packageJsonChangeKind = paths.includes("package.json") - ? classifyPackageJsonChangeFromGit({ - base: args.base, - head: args.head, - staged: args.staged, - }) - : null; - const result = detectChangedLanes(paths, { packageJsonChangeKind }); + const result = detectChangedLanesForPaths({ + paths, + base: args.base, + head: args.head, + staged: args.staged, + }); if (args.githubOutput) { writeChangedLaneGitHubOutput(result); } diff --git a/scripts/check-changed.mjs b/scripts/check-changed.mjs index 75e5df7c9ec..ee97a218b7a 100644 --- a/scripts/check-changed.mjs +++ b/scripts/check-changed.mjs @@ -1,7 +1,6 @@ import { performance } from "node:perf_hooks"; import { - classifyPackageJsonChangeFromGit, - detectChangedLanes, + detectChangedLanesForPaths, listChangedPathsFromGit, listStagedChangedPaths, normalizeChangedPath, @@ -285,14 +284,12 @@ if (isDirectRun()) { : args.staged ? listStagedChangedPaths() : listChangedPathsFromGit({ base: args.base, head: args.head }); - const packageJsonChangeKind = paths.includes("package.json") - ? classifyPackageJsonChangeFromGit({ - base: args.base, - head: args.head, - staged: args.staged, - }) - : null; - const result = detectChangedLanes(paths, { packageJsonChangeKind }); + const result = detectChangedLanesForPaths({ + paths, + base: args.base, + head: args.head, + staged: args.staged, + }); process.exitCode = await runChangedCheck(result, { ...args, explicitPaths: args.paths.length > 0, diff --git a/scripts/test-projects.test-support.mjs b/scripts/test-projects.test-support.mjs index c2a48ea397e..4421c3e3f56 100644 --- a/scripts/test-projects.test-support.mjs +++ b/scripts/test-projects.test-support.mjs @@ -734,9 +734,6 @@ export function resolveChangedTestTargetPlan(changedPaths, options = {}) { targets.push(changedPath); } } - if (useBroadFallback && changedLanes.lanes.all) { - return { mode: "broad", targets: [] }; - } if (useBroadFallback && changedLanes.extensionImpactFromCore) { targets.push("extensions"); }