do not remove pattern from lockfile if it is overridden by resolution (…

…#5572)

* do not remove pattern from lockfile if it is overridden by resolution

* test the bailout after integrity check instead of changes to the lockfile

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "javascript.validate.enable": false
+}

__tests__/commands/install/resolutions.js

@@ -2,9 +2,14 @@
 
 import {getPackageVersion, isPackagePresent, runInstall} from '../_helpers.js';
 import {ConsoleReporter} from '../../../src/reporters/index.js';
+import * as fs from '../../../src/util/fs.js';
+import {Install} from '../../../src/cli/commands/install.js';
+import Lockfile from '../../../src/lockfile';
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 150000;
 
+const path = require('path');
+
 test.concurrent('install with simple exact resolutions should override all versions', (): Promise<void> => {
   return runInstall({}, {source: 'resolutions', cwd: 'simple-exact'}, async config => {
     expect(await getPackageVersion(config, 'a')).toEqual('1.0.0');
@@ -92,3 +97,21 @@ test.concurrent('install with nested resolutions using flat mode', (): Promise<v
     expect(await getPackageVersion(config, 'ansi-regex')).toEqual('1.1.1');
   });
 });
+
+test.concurrent('install with resolution settings should correctly bailout during the integrity check', (): Promise<
+  void,
+> => {
+  return runInstall(
+    {},
+    {source: 'resolutions', cwd: 'install-with-resolution-should-bailout-during-the-integrity-check'},
+    async (config, reporter): Promise<void> => {
+      // remove file
+      await fs.unlink(path.join(config.cwd, 'node_modules', 'left-pad', 'index.js'));
+      // run install again
+      const reinstall = new Install({}, config, reporter, await Lockfile.fromDirectory(config.cwd));
+      await reinstall.init();
+      // don't expect file being recreated because install should have bailed out
+      expect(await fs.exists(path.join(config.cwd, 'node_modules', 'left-pad', 'index.js'))).toBe(false);
+    },
+  );
+});

__tests__/fixtures/install/resolutions/e-1/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "e",
+  "version": "1.0.0",
+  "dependencies": {
+    "left-pad": "^1.0.0"
+  }
+}

__tests__/fixtures/install/resolutions/install-with-resolution-should-bailout-during-the-integrity-check/package.json

@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "left-pad": "1.1.1",
+    "e": "file:../e-1"
+  },
+  "resolutions": {
+    "e/left-pad": "1.1.1"
+  }
+}

src/cli/commands/install.js

@@ -541,7 +541,6 @@ export class Install {
     steps.push((curr: number, total: number) =>
       callThroughHook('resolveStep', async () => {
         this.reporter.step(curr, total, this.reporter.lang('resolvingPackages'), emoji.get('mag'));
-        this.resolutionMap.setTopLevelPatterns(rawPatterns);
         await this.resolver.init(this.prepareRequests(depRequests), {
           isFlat: this.flags.flat,
           isFrozen: this.flags.frozenLockfile,

src/package-resolver.js

@@ -629,9 +629,6 @@ export default class PackageResolver {
         invariant(resolutionManifest._reference, 'resolutions should have a resolved reference');
         resolutionManifest._reference.patterns.push(pattern);
         this.addPattern(pattern, resolutionManifest);
-        if (!this.resolutionMap.topLevelPatterns.has(pattern)) {
-          this.lockfile.removePattern(pattern);
-        }
       } else {
         this.resolutionMap.addToDelayQueue(req);
       }

src/resolution-map.js

@@ -33,14 +33,12 @@ export default class ResolutionMap {
     this.config = config;
     this.reporter = config.reporter;
     this.delayQueue = new Set();
-    this.topLevelPatterns = new Set();
   }
 
   resolutionsByPackage: ResolutionInternalMap;
   config: Config;
   reporter: Reporter;
   delayQueue: Set<DependencyRequestPattern>;
-  topLevelPatterns: Set<string>;
 
   init(resolutions: ?ResolutionEntry = {}) {
     for (const globPattern in resolutions) {
@@ -57,10 +55,6 @@ export default class ResolutionMap {
     this.delayQueue.add(req);
   }
 
-  setTopLevelPatterns(patterns: Array<string>) {
-    this.topLevelPatterns = new Set(patterns);
-  }
-
   parsePatternInfo(globPattern: string, range: string): ?Object {
     if (!isValidPackagePath(globPattern)) {
       this.reporter.warn(this.reporter.lang('invalidResolutionName', globPattern));