Skip to content

Commit dbee8e5

Browse files
committed
Don't add overrides field if not npm in an app context
1 parent 4c6874b commit dbee8e5

File tree

1 file changed

+24
-14
lines changed

1 file changed

+24
-14
lines changed

src/commands/optimize.ts

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,20 @@ const availableOverrides = getManifestData('npm')!.filter(({ 1: d }) =>
3333
type NpmOverrides = { [key: string]: string | StringKeyValueObject }
3434
type PnpmOrYarnOverrides = { [key: string]: string }
3535
type Overrides = NpmOverrides | PnpmOrYarnOverrides
36-
type GetOverrides = (pkg: PackageJsonContent) => GetOverridesResult | undefined
37-
type GetOverridesResult = { type: Agent; overrides: Overrides }
36+
type GetOverrides = (
37+
pkgJson: PackageJsonContent
38+
) => GetOverridesResult | undefined
39+
type GetOverridesResult = {
40+
type: Agent
41+
overrides: Overrides
42+
}
3843

39-
const getOverridesDataByAgent: Record<Agent, GetOverrides> = {
44+
const getOverridesDataByAgent: {
45+
npm: (pkgJson: PackageJsonContent) => GetOverridesResult
46+
yarn: (pkgJson: PackageJsonContent) => GetOverridesResult
47+
} & {
48+
[key in Exclude<Agent, 'npm' | 'yarn'>]: GetOverrides
49+
} = {
4050
// npm overrides documentation:
4151
// https://docs.npmjs.com/cli/v10/configuring-npm/package-json#overrides
4252
npm: (pkgJson: PackageJsonContent) => {
@@ -178,16 +188,17 @@ async function addOverrides(
178188
: undefined
179189
]
180190
].filter(({ 1: o }) => o)
181-
const overridesDataObjects = <GetOverridesResult[]>[
182-
getOverridesDataByAgent['npm'](editablePkgJson.content)
183-
]
184-
const isApp = isPrivate || isWorkspace
185-
const overridesData =
186-
!isApp || agent !== 'npm'
187-
? getOverridesDataByAgent[isApp ? agent : 'yarn'](editablePkgJson.content)
188-
: undefined
189-
if (overridesData) {
190-
overridesDataObjects.push(overridesData)
191+
const overridesDataObjects = <GetOverridesResult[]>[]
192+
if (isPrivate || isWorkspace) {
193+
const data = getOverridesDataByAgent[agent](editablePkgJson.content)
194+
if (data) {
195+
overridesDataObjects.push(data)
196+
}
197+
} else {
198+
overridesDataObjects.push(
199+
getOverridesDataByAgent['npm'](editablePkgJson.content),
200+
getOverridesDataByAgent['yarn'](editablePkgJson.content)
201+
)
191202
}
192203
const aliasMap = new Map<string, string>()
193204
for (const { 1: data } of availableOverrides) {
@@ -210,7 +221,6 @@ async function addOverrides(
210221
}
211222
for (const { type, overrides } of overridesDataObjects) {
212223
if (
213-
overrides &&
214224
!hasOwn(overrides, origPkgName) &&
215225
lockIncludes(lockSrc, origPkgName)
216226
) {

0 commit comments

Comments
 (0)