@@ -33,10 +33,20 @@ const availableOverrides = getManifestData('npm')!.filter(({ 1: d }) =>
33
33
type NpmOverrides = { [ key : string ] : string | StringKeyValueObject }
34
34
type PnpmOrYarnOverrides = { [ key : string ] : string }
35
35
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
+ }
38
43
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
+ } = {
40
50
// npm overrides documentation:
41
51
// https://docs.npmjs.com/cli/v10/configuring-npm/package-json#overrides
42
52
npm : ( pkgJson : PackageJsonContent ) => {
@@ -178,16 +188,17 @@ async function addOverrides(
178
188
: undefined
179
189
]
180
190
] . 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
+ )
191
202
}
192
203
const aliasMap = new Map < string , string > ( )
193
204
for ( const { 1 : data } of availableOverrides ) {
@@ -210,7 +221,6 @@ async function addOverrides(
210
221
}
211
222
for ( const { type, overrides } of overridesDataObjects ) {
212
223
if (
213
- overrides &&
214
224
! hasOwn ( overrides , origPkgName ) &&
215
225
lockIncludes ( lockSrc , origPkgName )
216
226
) {
0 commit comments