Patch 1

README.md

@@ -1,24 +1,24 @@
 # eslint-import-resolver-babel-root-import
 
-A [babel-root-import](https://github.com/michaelzoidl/babel-root-import)
+A [babel-plugin-root-import](https://github.com/michaelzoidl/babel-plugin-root-import)
 resolver for [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import).
 
 ## Installation
 
 ```sh
-npm install --save-dev eslint-plugin-import eslint-import-resolver-babel-root-import
+npm install --save-dev eslint-plugin-import eslint-import-resolver-babel-plugin-root-import
 ```
 
 ## Usage
 
 Inside your `.eslintrc` file, pass this resolver to `eslint-plugin-import`:
 ```
 "settings": {
-  "import/resolver": "babel-root-import"
+  "import/resolver": "babel-plugin-root-import"
 }
 ```
 
-And see [babel-root-import][babel-root-import] to know how to configure
+And see [babel-plugin-root-import][babel-plugin-root-import] to know how to configure
 your prefix/suffix.
 
 ### Example
@@ -29,9 +29,11 @@ your prefix/suffix.
   "rules": {},
   "settings": {
     "import/resolver": {
-      "babel-root-import": {}
+        "babel-plugin-root-import": {
+            "rootPathSuffix": "src",
+            "rootPathPrefix": "~"
+        }
     }
-  }
 }
 ```
 
@@ -40,4 +42,4 @@ your prefix/suffix.
 MIT, see [LICENSE.md](/LICENSE.md) for details.
 
 
-[babel-root-import]: https://github.com/michaelzoidl/babel-root-import
+[babel-plugin-root-import]: https://github.com/michaelzoidl/babel-plugin-root-import

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "eslint-import-resolver-babel-root-import",
+  "name": "eslint-import-resolver-babel-plugin-root-import",
   "version": "0.0.3",
   "main": "src/index.js",
   "description": "babel-plugin-root-import resolver for eslint-plugin-import",
@@ -35,9 +35,9 @@
     "import"
   ],
   "dependencies": {
-    "babel-root-import": "^3.2.2",
-    "eslint-import-resolver-node": "^0.2.1",
-    "json5": "^0.5.0"
+    "babel-plugin-root-import": "^5.1.0",
+    "eslint-import-resolver-node": "^0.3.0",
+    "json5": "^0.5.1"
   },
   "devDependencies": {
     "chai": "^3.5.0",

src/index.js

@@ -5,7 +5,7 @@ const JSON5 = require('json5');
 const nodeResolve = require('eslint-import-resolver-node').resolve;
 
 /* eslint-disable no-console */
-const babelRootImport = require('babel-root-import/build/helper.js');
+const babelRootImport = require('babel-plugin-root-import/build/helper.js');
 
 // newer version of babel root import exports the 2 functions
 // but older versions exported a class
@@ -24,38 +24,6 @@ if (babelRootImport.default) {
     transformRelativeToRootPath = transformRelativeToRootPath.bind(babelRootImportObj);
 }
 
-// returns the root import config as an object
-function getConfigFromBabel(start, babelrc = '.babelrc') {
-    if (start === '/') return [];
-
-    const packageJSONPath = path.join(start, 'package.json');
-    const packageJSON = require(packageJSONPath);
-    const babelConfig = packageJSON.babel;
-    if (babelConfig) {
-        const pluginConfig = babelConfig.plugins.find(p => (
-            p[0] === 'babel-root-import'
-        ));
-        process.chdir(path.dirname(packageJSONPath));
-        return pluginConfig[1];
-    }
-
-    const babelrcPath = path.join(start, babelrc);
-    if (fs.existsSync(babelrcPath)) {
-        const babelrcJson = JSON5.parse(fs.readFileSync(babelrcPath, 'utf8'));
-        if (babelrcJson && Array.isArray(babelrcJson.plugins)) {
-            const pluginConfig = babelrcJson.plugins.find(p => (
-                p[0] === 'babel-root-import'
-            ));
-            // The src path inside babelrc are from the root so we have
-            // to change the working directory for the same directory
-            // to make the mapping to work properly
-            process.chdir(path.dirname(babelrcPath));
-            return pluginConfig[1];
-        }
-    }
-    return getConfigFromBabel(path.dirname(start));
-}
-
 exports.interfaceVersion = 2;
 
 /**
@@ -65,11 +33,10 @@ exports.interfaceVersion = 2;
  * @param  {string} source - the module to resolve; i.e './some-module'
  * @param  {string} file - the importing file's full path; i.e. '/usr/local/bin/file.js'
  * @param  {object} config - the resolver options
- * @param  {string} babelrc - the name of the babelrc file
  * @return {object}
  */
-exports.resolve = (source, file, config, babelrc) => {
-    const opts = getConfigFromBabel(process.cwd(), babelrc);
+exports.resolve = (source, file, config) => {
+    const opts = config;
 
     // [{rootPathPrefix: rootPathSuffix}]
     const rootPathConfig = [];
@@ -99,7 +66,7 @@ exports.resolve = (source, file, config, babelrc) => {
 
         let rootPathSuffix = '';
         if (opts.rootPathSuffix && typeof opts.rootPathSuffix === 'string') {
-            rootPathSuffix = `/${opts.rootPathSuffix.replace(/^(\/)|(\/)$/g, '')}`;
+            rootPathSuffix = opts.rootPathSuffix;
         }
 
         rootPathConfig.push({
@@ -114,7 +81,7 @@ exports.resolve = (source, file, config, babelrc) => {
         const prefix = option.rootPathPrefix;
         const suffix = option.rootPathSuffix;
         if (hasRootPathPrefixInString(source, option.rootPathPrefix)) {
-            transformedSource = transformRelativeToRootPath(source, suffix, prefix);
+            transformedSource = transformRelativeToRootPath(source, suffix, prefix, file);
             break;
         }
     }