Merge pull request #89 from bestander/hoist-jest-case

Added 2 more hoisting unit tests

Author: sebmck

Makefile

@@ -7,7 +7,7 @@ watch:
 	./node_modules/.bin/gulp watch
 
 test-only:
-	./node_modules/.bin/nyc --check-coverage --lines 85 --branches 74 --functions 85 ./node_modules/.bin/ava --verbose test/
+	./node_modules/.bin/nyc --check-coverage --lines 85 --branches 74 --functions 85 ./node_modules/.bin/ava --verbose --concurrency 5 test/
 	./node_modules/.bin/nyc report --reporter=lcov
 
 lint:

src/cli/commands/install.js

@@ -12,7 +12,6 @@
 import type { RegistryNames } from "../../registries/index.js";
 import type { Reporter } from "kreporters";
 import type Config from "../../config.js";
-import type { DependencyRequestPatterns } from "../../types.js";
 import Lockfile from "../../lockfile/index.js";
 import lockStringify from "../../lockfile/stringify.js";
 import PackageInstallScripts from "../../package-install-scripts.js";
@@ -31,18 +30,6 @@ let invariant = require("invariant");
 let emoji     = require("node-emoji");
 let path      = require("path");
 
-type FetchResolveParams = {
-  totalSteps: number,
-  patterns: Array<string>,
-  requests: DependencyRequestPatterns
-};
-
-type FetchResolveReturn = {
-  patterns: Array<string>,
-  total: number,
-  step: number
-};
-
 type InstallActions = "install" | "update" | "uninstall";
 
 export class Install {

src/package-linker.js

@@ -223,6 +223,10 @@ export default class PackageLinker {
 
   async copyModules(patterns: Array<string>): Promise<void> {
     let flatTree = await this.initCopyModules(patterns);
+    // sorted tree makes file creation and copying not to interfere with each other
+    flatTree = flatTree.sort((dep1, dep2) => {
+      return dep1[0].localeCompare(dep2[0]);
+    });
     let self = this;
 
     //

test/commands/install.js

@@ -0,0 +1 @@
+kpm-offline-mirror=./mirror-for-offline

test/fixtures/install/install-should-dedupe-avoiding-conflicts-6/.npmrc

@@ -0,0 +1,30 @@
+dep-b@1.0.0:
+  name dep-b
+  version "1.0.0"
+  resolved dep-b-1.0.0.tgz#3ec41d539ec81cbb0b00f3f77cee143104153783
+  dependencies:
+    dep-c "1.0.0"
+dep-c@1.0.0:
+  name dep-c
+  version "1.0.0"
+  resolved dep-c-1.0.0.tgz#43df1196c1b62b89ed7169b6b93493d8420763b6
+  dependencies:
+    dep-d "1.0.0"
+dep-d@1.0.0:
+  name dep-d
+  version "1.0.0"
+  resolved dep-d-1.0.0.tgz#175ce924c6413b1feeb68b976ae769260cfe0d86
+  dependencies:
+    dep-e "1.0.0"
+dep-d@2.0.0:
+  name dep-d
+  version "2.0.0"
+  resolved dep-d-2.0.0.tgz#ada909b78f52d88a60e9c8583ddc0310ff16da40
+dep-e@1.0.0:
+  name dep-e
+  version "1.0.0"
+  resolved dep-e-1.0.0.tgz#8baa9f7eda12e71a95ccfce7e31ace5867617014
+dep-e@2.0.0:
+  name dep-e
+  version "2.0.0"
+  resolved dep-e-2.0.0.tgz#c326a657226d79e68a2208f62a3f3f9f657416a9