Skip to content

Restrict overrides to referenced packages #10733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timotheeguerin wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

Restrict overrides to referenced packages #10733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions packages/tsp-integration/src/patch-package-json.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ export async function patchPackageJson(dir: string, packages: Packages) {
packageJson.peerDependencies = packageJson.peerDependencies ?? {};
packageJson.overrides = packageJson.overrides ?? {};

// Collect the set of package names already referenced in the project
const referencedPackages = new Set<string>([
...Object.keys(packageJson.dependencies ?? {}),
...Object.keys(packageJson.devDependencies ?? {}),
...Object.keys(packageJson.peerDependencies ?? {}),
...Object.keys(packageJson.overrides ?? {}),
]);

// Update dependencies to point to tgz files
for (const pkg of Object.values(packages)) {
const packageName = pkg.name;
Expand All @@ -41,8 +49,11 @@ export async function patchPackageJson(dir: string, packages: Packages) {
}
}

// Also set in overrides to ensure all nested dependencies use our version
packageJson.overrides[packageName] = filePath;
// Only override packages already referenced by the project to avoid
// npm arborist issues with unused file: overrides
if (referencedPackages.has(packageName)) {
packageJson.overrides[packageName] = filePath;
}
}

// Write updated package.json
Expand Down
Loading