Fix conflict resolving for dependencies in dependencies (codesandbox#498)

CompuIves · web-flow · commit d59ee25e228c · 2018-02-05T15:46:04.000+01:00
diff --git a/packages/app/src/sandbox/eval/manager.js b/packages/app/src/sandbox/eval/manager.js
@@ -322,7 +322,9 @@ export default class Manager {
     }
 
     const dependencyName = getDependencyName(path);
-    const previousDependencyName = getDependencyName(currentPath);
+    const previousDependencyName = getDependencyName(
+      currentPath.replace('/node_modules/', '')
+    );
 
     if (
       this.manifest.dependencyAliases[previousDependencyName] &&

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,9 @@ export default class Manager {`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`const dependencyName = getDependencyName(path);`
`325`		`- const previousDependencyName = getDependencyName(currentPath);`
	`325`	`+ const previousDependencyName = getDependencyName(`
	`326`	`+ currentPath.replace('/node_modules/', '')`
	`327`	`+ );`
`326`	`328`
`327`	`329`	`if (`
`328`	`330`	`this.manifest.dependencyAliases[previousDependencyName] &&`