Allow resolving of versioned dependencies

Author: Ives van Hoorne

src/sandbox/eval/manager.js

@@ -8,6 +8,7 @@ import type { Module } from './entities/module';
 import TranspiledModule from './transpiled-module';
 import Preset from './presets';
 import fetchModule from './npm/fetch-npm-module';
+import getDependencyName from './utils/get-dependency-name';
 import DependencyNotFoundError from '../errors/dependency-not-found-error';
 import ModuleNotFoundError from '../errors/module-not-found-error';
 
@@ -214,17 +215,8 @@ export default class Manager {
       return path;
     }
 
-    const dependencyParts = path.split('/');
-    const dependencyName = path.startsWith('@')
-      ? `${dependencyParts[0]}/${dependencyParts[1]}`
-      : dependencyParts[0];
-
-    const previousDependencyParts = currentPath
-      .replace('/node_modules/', '')
-      .split('/');
-    const previousDependencyName = path.startsWith('@')
-      ? `${previousDependencyParts[0]}/${previousDependencyParts[1]}`
-      : previousDependencyParts[0];
+    const dependencyName = getDependencyName(path);
+    const previousDependencyName = getDependencyName(currentPath);
 
     if (
       this.manifest.dependencyAliases[previousDependencyName] &&
@@ -280,10 +272,7 @@ export default class Manager {
         throw new ModuleNotFoundError(aliasedPath, false);
       }
 
-      const dependencyParts = path.split('/');
-      const dependencyName = path.startsWith('@')
-        ? `${dependencyParts[0]}/${dependencyParts[1]}`
-        : dependencyParts[0];
+      const dependencyName = getDependencyName(path);
 
       if (
         this.manifest.dependencies.find(d => d.name === dependencyName) ||

src/sandbox/eval/utils/get-dependency-name.js

@@ -0,0 +1,14 @@
+export default function getDependencyName(path: string) {
+  const dependencyParts = path.split('/');
+  let dependencyName = dependencyParts.shift();
+
+  if (path.startsWith('@')) {
+    dependencyName += `/${dependencyParts.shift()}`;
+  }
+  if (dependencyParts[0] && /^\d/.test(dependencyParts[0])) {
+    // Make sure to include the aliased version if it's part of it
+    dependencyName += `/${dependencyParts.shift()}`;
+  }
+
+  return dependencyName;
+}

src/sandbox/eval/utils/get-dependency-name.test.js

@@ -0,0 +1,25 @@
+import getDependencyName from './get-dependency-name';
+
+describe('getDependencyName', () => {
+  it('can find a simple dependency name', () => {
+    expect(getDependencyName('lodash/test')).toBe('lodash');
+  });
+
+  it('can find a simple dependency name from no path', () => {
+    expect(getDependencyName('lodash')).toBe('lodash');
+  });
+
+  it('can find a simple dependency name from an organization', () => {
+    expect(getDependencyName('@angular/core/test')).toBe('@angular/core');
+  });
+
+  it('can find a simple dependency name with a version', () => {
+    expect(getDependencyName('lodash/4.4.3/test')).toBe('lodash/4.4.3');
+  });
+
+  it('can find a simple dependency name with a version from an organization', () => {
+    expect(getDependencyName('@angular/core/4.4.3/test')).toBe(
+      '@angular/core/4.4.3'
+    );
+  });
+});