@@ -143,7 +143,7 @@ function readOptions(
|
143 | 143 | // See: https://github.com/npm/npm-registry-fetch/blob/ebddbe78a5f67118c1f7af2e02c8a22bcaf9e850/index.js#L99-L126 |
144 | 144 | const rcConfig: PackageManagerOptions = yarn ? lockfile.parse(data) : ini.parse(data); |
145 | 145 | |
146 | | -rcOptions = normalizeOptions(rcConfig, location); |
| 146 | +rcOptions = normalizeOptions(rcConfig, location, rcOptions); |
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
@@ -166,17 +166,15 @@ function readOptions(
|
166 | 166 | envVariablesOptions[normalizedName] = value; |
167 | 167 | } |
168 | 168 | |
169 | | -return { |
170 | | - ...rcOptions, |
171 | | - ...normalizeOptions(envVariablesOptions), |
172 | | -}; |
| 169 | +return normalizeOptions(envVariablesOptions, undefined, rcOptions); |
173 | 170 | } |
174 | 171 | |
175 | 172 | function normalizeOptions( |
176 | 173 | rawOptions: PackageManagerOptions, |
177 | 174 | location = process.cwd(), |
| 175 | +existingNormalizedOptions: PackageManagerOptions = {}, |
178 | 176 | ): PackageManagerOptions { |
179 | | -const options: PackageManagerOptions = {}; |
| 177 | +const options = { ...existingNormalizedOptions }; |
180 | 178 | |
181 | 179 | for (const [key, value] of Object.entries(rawOptions)) { |
182 | 180 | let substitutedValue = value; |
|