Merge branch 'master' into fix-windows-resolved-alias

Author: Rich-Harris

package.json

@@ -3,6 +3,7 @@
   "version": "1.3.1",
   "description": "Resolves aliases with Rollup",
   "main": "dist/rollup-plugin-alias.js",
+  "module": "dist/rollup-plugin-alias.es2015.js",
   "jsnext:main": "dist/rollup-plugin-alias.es2015.js",
   "scripts": {
     "prebuild": "rimraf dist",

src/index.js

@@ -59,7 +59,7 @@ export default function alias(options = {}) {
       // First match is supposed to be the correct one
       const toReplace = aliasKeys.find(key => matches(key, importeeId));
 
-      if (!toReplace) {
+      if (!toReplace || !importerId) {
         return null;
       }
 

test/index.js

@@ -88,6 +88,16 @@ test('Absolute local aliasing', t => {
   t.is(resolved4, '/par/a/di/se.js');
 });
 
+test('Leaves entry file untouched if matches alias', t => {
+  const result = alias({
+    abacaxi: './abacaxi',
+  });
+
+  const resolved = result.resolveId('abacaxi/entry.js', undefined);
+
+  t.is(resolved, null);
+});
+
 test('Test for the resolve property', t => {
   const result = alias({
     ember: './folder/hipster',