Skip to content

Commit c556447

Browse files
committed
fix overrides
1 parent 608e154 commit c556447

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

dev-packages/e2e-tests/lib/pnpmOverrides.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,34 @@ export async function addPnpmOverrides(tmpDirPath: string, packedDirPath: string
1414
const packageJsonPath = path.join(tmpDirPath, 'package.json');
1515
const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8')) as {
1616
pnpm?: { overrides?: Record<string, string> };
17+
dependencies?: Record<string, string>;
18+
devDependencies?: Record<string, string>;
1719
};
1820

1921
const overrides: Record<string, string> = {};
2022

2123
const packageNames = getPublishedSentryTarballPackageNames();
2224

25+
const dependencies = packageJson.dependencies ?? {};
26+
const devDependencies = packageJson.devDependencies ?? {};
27+
28+
// Override anything that is not a dependency of the application itself,
29+
// to ensure we do not accidentally overwrite weird/custom things
30+
const deps = {
31+
...dependencies,
32+
...devDependencies,
33+
};
34+
2335
for (const packageName of packageNames) {
24-
overrides[packageName] = `file:${packedDirPath}/${packedSymlinkFilename(packageName)}`;
36+
if (!deps[packageName]) {
37+
overrides[packageName] = `file:${packedDirPath}/${packedSymlinkFilename(packageName)}`;
38+
}
2539
}
2640

2741
packageJson.pnpm = {
2842
overrides: {
29-
...packageJson.pnpm?.overrides,
3043
...overrides,
44+
...packageJson.pnpm?.overrides,
3145
},
3246
};
3347

0 commit comments

Comments
 (0)