fixes ignored folders in prebuilt packages feature of offline mirror (#5793)

* fixes #5755

* lint and duplication fixes

* fix test

Author: bestander

__tests__/commands/install/offline-mirror.js

@@ -53,6 +53,36 @@ test.concurrent(
   },
 );
 
+test.concurrent(
+  'install with offline mirror and pack-built-packages setting should not ignore ".npmignore"',
+  (): Promise<void> => {
+    return runInstall({ignoreScripts: true}, 'install-offline-built-artifacts-no-ignores', async (config, reporter) => {
+      // install scripts were not run
+      expect(await fs.exists(path.join(config.cwd, 'node_modules', 'dep-a', 'build', 'build-artifact.so'))).toEqual(
+        false,
+      );
+
+      // enable packing of built artifacts
+      config.packBuiltPackages = true;
+
+      // after first run we observe package side effects
+      let reinstall = new Install({force: true}, config, reporter, await Lockfile.fromDirectory(config.cwd));
+      await reinstall.init();
+      expect(await fs.exists(path.join(config.cwd, 'node_modules', 'dep-a', 'build', 'module-a-build.log'))).toEqual(
+        true,
+      );
+
+      // after second run we observe only package side effects because offline mirror was used
+      await fs.unlink(path.join(config.cwd, 'node_modules'));
+      reinstall = new Install({}, config, reporter, await Lockfile.fromDirectory(config.cwd));
+      await reinstall.init();
+      expect(await fs.exists(path.join(config.cwd, 'node_modules', 'dep-a', 'build', 'module-a-build.log'))).toEqual(
+        true,
+      );
+    });
+  },
+);
+
 test.concurrent('install without pack-built-packages should keep running install scripts', (): Promise<void> => {
   return runInstall({ignoreScripts: true}, 'install-offline-built-artifacts', async (config, reporter) => {
     // install scripts were not run

__tests__/fixtures/install/install-offline-built-artifacts-no-ignores/.yarnrc

@@ -0,0 +1 @@
+yarn-offline-mirror "./mirror-for-offline"

__tests__/fixtures/install/install-offline-built-artifacts-no-ignores/mirror-for-offline/dep-a-v1.0.0.tgz

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

__tests__/fixtures/install/install-offline-built-artifacts-no-ignores/package.json

@@ -0,0 +1,7 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+[email protected]:
+  version "1.0.0"
+  resolved "./mirror-for-offline/dep-a-v1.0.0.tgz#02b52818570e272083ef17a99f62ec7e30d0a1a5"

__tests__/fixtures/install/install-offline-built-artifacts-no-ignores/yarn.lock

@@ -109,8 +109,9 @@ export async function packTarball(
   // apply filters
   sortFilter(files, filters, keepFiles, possibleKeepFiles, ignoredFiles);
 
-  const packer = tar.pack(config.cwd, {
-    ignore: name => {
+  return packWithIgnoreAndHeaders(
+    config.cwd,
+    name => {
       const relative = path.relative(config.cwd, name);
       // Don't ignore directories, since we need to recurse inside them to check for unignored files.
       if (fs2.lstatSync(name).isDirectory()) {
@@ -120,6 +121,17 @@ export async function packTarball(
       // Otherwise, ignore a file if we're not supposed to keep it.
       return !keepFiles.has(relative);
     },
+    {mapHeader},
+  );
+}
+
+export function packWithIgnoreAndHeaders(
+  cwd: string,
+  ignoreFunction?: string => boolean,
+  {mapHeader}: {mapHeader?: Object => Object} = {},
+): Promise<stream$Duplex> {
+  return tar.pack(cwd, {
+    ignore: ignoreFunction,
     map: header => {
       const suffix = header.name === '.' ? '' : `/${header.name}`;
       header.name = `package${suffix}`;
@@ -128,8 +140,6 @@ export async function packTarball(
       return mapHeader ? mapHeader(header) : header;
     },
   });
-
-  return packer;
 }
 
 export async function pack(config: Config): Promise<stream$Duplex> {

src/cli/commands/pack.js

@@ -9,7 +9,7 @@ import executeLifecycleScript from './util/execute-lifecycle-script.js';
 import * as crypto from './util/crypto.js';
 import * as fsUtil from './util/fs.js';
 import {getPlatformSpecificPackageFilename} from './util/package-name-utils.js';
-import {pack} from './cli/commands/pack.js';
+import {packWithIgnoreAndHeaders} from './cli/commands/pack.js';
 
 const fs = require('fs');
 const invariant = require('invariant');
@@ -320,13 +320,8 @@ export default class PackageInstallScripts {
           const ref = pkg._reference;
           invariant(ref, 'expected reference');
           const builtPackagePath = this.config.generateHardModulePath(ref);
-          const pkgConfig = await Config.create(
-            {
-              cwd: builtPackagePath,
-            },
-            this.reporter,
-          );
-          const stream = await pack(pkgConfig);
+          // don't use pack command, we want to avoid the file filters logic
+          const stream = await packWithIgnoreAndHeaders(builtPackagePath);
 
           const hash = await new Promise((resolve, reject) => {
             const validateStream = new crypto.HashStream();