Bugfix 3752 - Artifacts disappearing when missing integrity file

__tests__/commands/add.js

@@ -836,6 +836,37 @@ test.concurrent('should only refer to root to satisfy peer dependency', (): Prom
   );
 });
 
+test.concurrent('should retain build artifacts after add when missing integrity file', (): Promise<void> => {
+  return buildRun(
+    reporters.BufferReporter,
+    fixturesLoc,
+    async (args, flags, config, reporter): Promise<void> => {
+      const lockfile = await createLockfile(config.cwd);
+
+      const addA = new Add(args, flags, config, reporter, lockfile);
+      await addA.init();
+
+      const expectedArtifacts = ['foo.txt'];
+      const integrityLoc = path.join(config.cwd, 'node_modules', constants.INTEGRITY_FILENAME);
+
+      const beforeIntegrity = await fs.readJson(integrityLoc);
+      expect(beforeIntegrity.artifacts['[email protected]']).toEqual(expectedArtifacts);
+
+      await fs.unlink(integrityLoc);
+
+      const lockfileAfterPreviousAdd = await Lockfile.fromDirectory(config.cwd);
+      const addB = new Add(['file:b'], flags, config, reporter, lockfileAfterPreviousAdd);
+      await addB.init();
+
+      const afterIntegrity = await fs.readJson(integrityLoc);
+      expect(afterIntegrity.artifacts['[email protected]']).toEqual(expectedArtifacts);
+    },
+    ['file:a'],
+    {},
+    'retain-build-artifacts-missing-integrity',
+  );
+});
+
 test.concurrent('should retain build artifacts after add', (): Promise<void> => {
   return buildRun(
     reporters.BufferReporter,

__tests__/commands/install/lockfiles.js

@@ -195,6 +195,24 @@ test.concurrent('install should write and read integrity file based on lockfile
   });
 });
 
+test.concurrent('install should retain artifacts when missing integrity file', (): Promise<void> => {
+  return runInstall({}, 'install-should-retain-artifacts-when-missing-integrity', async (config, reporter) => {
+    const expectedArtifacts = ['foo.txt'];
+    const integrityLoc = path.join(config.cwd, 'node_modules', constants.INTEGRITY_FILENAME);
+
+    const beforeIntegrity = await fs.readJson(integrityLoc);
+    expect(beforeIntegrity.artifacts['[email protected]']).toEqual(expectedArtifacts);
+
+    await fs.unlink(integrityLoc);
+
+    const reinstall = new Install({}, config, reporter, await Lockfile.fromDirectory(config.cwd));
+    await reinstall.init();
+
+    const afterIntegrity = await fs.readJson(integrityLoc);
+    expect(afterIntegrity.artifacts['[email protected]']).toEqual(expectedArtifacts);
+  });
+});
+
 test.concurrent('install should not continue if integrity check passes', (): Promise<void> => {
   return runInstall({}, 'lockfile-stability', async (config, reporter) => {
     await fs.writeFile(path.join(config.cwd, 'node_modules', 'yarn.test'), 'YARN TEST');

__tests__/fixtures/add/retain-build-artifacts-missing-integrity/a/install.js

@@ -0,0 +1 @@
+require('fs').writeFileSync('foo.txt', 'foobar');

__tests__/fixtures/add/retain-build-artifacts-missing-integrity/a/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "a",
+  "version": "0.0.0",
+  "scripts": {
+    "postinstall": "node install.js"
+  }
+}

__tests__/fixtures/add/retain-build-artifacts-missing-integrity/b/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "b",
+  "version": "0.0.0"
+}

__tests__/fixtures/add/retain-build-artifacts-missing-integrity/package.json

@@ -0,0 +1 @@
+{}

__tests__/fixtures/install/install-should-retain-artifacts-when-missing-integrity/a/install.js

@@ -0,0 +1 @@
+require('fs').writeFileSync('foo.txt', 'foobar');

__tests__/fixtures/install/install-should-retain-artifacts-when-missing-integrity/a/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "a",
+  "version": "0.0.0",
+  "scripts": {
+    "postinstall": "node install.js"
+  }
+}

__tests__/fixtures/install/install-should-retain-artifacts-when-missing-integrity/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "a": "file:a"
+  }
+}

__tests__/fixtures/install/install-should-retain-artifacts-when-missing-integrity/yarn.lock

@@ -0,0 +1,6 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"a@file:a":
+  version "0.0.0"

src/cli/commands/add.js

@@ -7,12 +7,16 @@ import type Config from '../../config.js';
 import type {ListOptions} from './list.js';
 import Lockfile from '../../lockfile/wrapper.js';
 import PackageRequest from '../../package-request.js';
+import WorkspaceLayout from '../../workspace-layout.js';
 import {getExoticResolver} from '../../resolvers/index.js';
 import {buildTree} from './list.js';
 import {wrapLifecycle, Install} from './install.js';
 import {MessageError} from '../../errors.js';
+import * as constants from '../../constants.js';
+import * as fs from '../../util/fs.js';
 
 import invariant from 'invariant';
+import path from 'path';
 import semver from 'semver';
 
 export class Add extends Install {
@@ -97,8 +101,18 @@ export class Add extends Install {
     return preparedPatterns;
   }
 
-  bailout(patterns: Array<string>): Promise<boolean> {
-    return Promise.resolve(false);
+  async bailout(patterns: Array<string>, workspaceLayout: ?WorkspaceLayout): Promise<boolean> {
+    const lockfileCache = this.lockfile.cache;
+    if (!lockfileCache) {
+      return false;
+    }
+    const match = await this.integrityChecker.check(patterns, lockfileCache, this.flags, workspaceLayout);
+    const haveLockfile = await fs.exists(path.join(this.config.lockfileFolder, constants.LOCKFILE_FILENAME));
+    if (match.integrityFileMissing && haveLockfile) {
+      // Integrity file missing, force script installations
+      this.scripts.setForce(true);
+    }
+    return false;
   }
 
   /**

src/cli/commands/install.js

@@ -359,6 +359,12 @@ export class Install {
       return true;
     }
 
+    if (match.integrityFileMissing && haveLockfile) {
+      // Integrity file missing, force script installations
+      this.scripts.setForce(true);
+      return false;
+    }
+
     if (!patterns.length && !match.integrityFileMissing) {
       this.reporter.success(this.reporter.lang('nothingToInstall'));
       await this.createEmptyManifestFolders();

src/package-install-scripts.js

@@ -34,6 +34,10 @@ export default class PackageInstallScripts {
   force: boolean;
   artifacts: InstallArtifacts;
 
+  setForce(force: boolean) {
+    this.force = force;
+  }
+
   setArtifacts(artifacts: InstallArtifacts) {
     this.artifacts = artifacts;
   }