@@ -228,14 +228,6 @@ export default class PackageResolver {
228
228
229
229
getAllInfoForPackageName ( name : string ) : Array < Manifest > {
230
230
const patterns = this . patternsByPackage [ name ] || [ ] ;
231
- return this . getAllInfoForPatterns ( patterns ) ;
232
- }
233
-
234
- /**
235
- * Retrieve all the package info stored for a list of patterns.
236
- */
237
-
238
- getAllInfoForPatterns ( patterns : string [ ] ) : Array < Manifest > {
239
231
const infos = [ ] ;
240
232
const seen = new Set ( ) ;
241
233
@@ -292,13 +284,6 @@ export default class PackageResolver {
292
284
293
285
collapseAllVersionsOfPackage ( name : string , version : string ) : string {
294
286
const patterns = this . dedupePatterns ( this . patternsByPackage [ name ] ) ;
295
- return this . collapsePackageVersions ( name , version , patterns ) ;
296
- }
297
-
298
- /**
299
- * Make all given patterns resolve to version.
300
- */
301
- collapsePackageVersions ( name : string , version : string , patterns : string [ ] ) : string {
302
287
const human = `${name } @${version } `;
303
288
304
289
// get manifest that matches the version we're collapsing too
@@ -545,37 +530,10 @@ export default class PackageResolver {
545
530
this . resolveToResolution ( req ) ;
546
531
}
547
532
548
- for ( const dep of deps ) {
549
- const name = normalizePattern ( dep . pattern ) . name ;
550
- this . optimizeResolutions ( name ) ;
551
- }
552
-
553
533
activity . end ( ) ;
554
534
this . activity = null ;
555
535
}
556
536
557
- // for a given package, see if a single manifest can satisfy all ranges
558
- optimizeResolutions ( name : string ) {
559
- const patterns : Array < string > = this . dedupePatterns ( this . patternsByPackage [ name ] || [ ] ) ;
560
-
561
- // don't optimize things that already have a lockfile entry:
562
- // https://github.com/yarnpkg/yarn/issues/79
563
- const collapsablePatterns = patterns . filter ( pattern => {
564
- const remote = this . patterns [ pattern ] . _remote ;
565
- return ! this . lockfile . getLocked ( pattern ) && ( ! remote || remote . type !== 'workspace' ) ;
566
- } ) ;
567
- if ( collapsablePatterns . length < 2 ) {
568
- return ;
569
- }
570
-
571
- const availableVersions = this . getAllInfoForPatterns ( collapsablePatterns ) . map ( manifest => manifest . version ) ;
572
- const combinedRange = collapsablePatterns . map ( pattern => normalizePattern ( pattern ) . range ) . join ( ' ' ) ;
573
- const singleVersion = semver . maxSatisfying ( availableVersions , combinedRange ) ;
574
- if ( singleVersion ) {
575
- this . collapsePackageVersions ( name , singleVersion , collapsablePatterns ) ;
576
- }
577
- }
578
-
579
537
/**
580
538
* Called by the package requester for packages that this resolver already had
581
539
* a matching version for. Delay the resolve, because better matches can still be
0 commit comments