Merge 488bbb1 into 4351987

.editorconfig

@@ -4,8 +4,6 @@ root = true
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-[*.js]
 indent_style = space
-indent_width = 2
+indent_size = 2
 end_of_line = lf

.eslintrc

@@ -12,3 +12,4 @@ rules:
   curly: [2, "multi-line"]
   comma-dangle: [2, always-multiline]
   eqeqeq: [2, "allow-null"]
+  no-shadow: 1

.npmignore

@@ -1,6 +1,7 @@
 # files
 src/
 reports/
+resolvers/
 
 # config
 .eslintrc

.travis.yml

@@ -2,12 +2,21 @@ language: node_js
 node_js:
   - 0.10
   - 0.12
-  - iojs
+  - 4
   - stable
 env:
  - NODE_PATH=./lib
 
-script: "npm run-script ci-test"
+install:
+  - npm -g install npm@2
+  - npm install
+  # install all resolver deps
+  - "for resolver in ./resolvers/*; do cd $resolver && npm install && cd ../..; done"
+
+script:
+  - "npm run-script ci-test"
+  - "cd resolvers/webpack && npm test"
+  - "cd ../.."  # come back out of resolvers folder
 
 after_success:
   - npm run coveralls

appveyor.yml

@@ -18,6 +18,11 @@ environment:
 install:
   # Get the latest stable version of Node.js or io.js
   - ps: Install-Product node $env:nodejs_version
+
+  # update npm
+  - npm -g install npm@2
+  - set PATH=%APPDATA%\npm;%PATH%
+
   # install modules
   - npm install
 

package.json

@@ -13,8 +13,8 @@
     "ci-test": "npm run-script pretest && mocha --recursive --reporter dot tests/lib/",
     "debug": "mocha debug --recursive --reporter dot tests/lib/",
     "compile": "rm -rf lib/ && babel -d lib/ src/",
-    "prepublish": "npm run compile",
-    "pretest": "eslint ./src && npm run compile && babel -d tests/lib/ tests/src/",
+    "prepublish": "eslint ./src && npm run compile",
+    "pretest": "npm run compile && babel -d tests/lib/ tests/src/",
     "coveralls": "istanbul cover --report lcovonly --dir reports/coverage _mocha tests/lib/ -- --recursive --reporter dot; remap-istanbul -i reports/coverage/coverage.json -o reports/coverage/lcov.info --type lcovonly && cat ./reports/coverage/lcov.info | coveralls"
   },
   "repository": {
@@ -44,15 +44,16 @@
     "eslint": ">=1.8.0",
     "istanbul": "^0.4.0",
     "mocha": "^2.2.1",
-    "remap-istanbul": "^0.4.0"
+    "remap-istanbul": "^0.4.0",
+    "eslint-import-resolver-webpack": "file:./resolvers/webpack",
+    "eslint-import-resolver-node": "file:./resolvers/node"
   },
   "peerDependencies": {
     "eslint": ">=1.4.0"
   },
   "dependencies": {
     "babel-runtime": "5.x",
-    "babylon": "^6.1.2",
-    "resolve": "1.1.6"
+    "babylon": "^6.1.2"
   },
   "greenkeeper": {
     "ignore": [

resolvers/.eslintrc

@@ -0,0 +1,3 @@
+---
+env:
+  es6: false

resolvers/node/README.md

@@ -0,0 +1,26 @@
+# eslint-import-resolver-node
+
+[![npm](https://img.shields.io/npm/v/eslint-import-resolver-node.svg)](https://www.npmjs.com/package/eslint-import-resolver-node)
+
+Default Node-style module resolution plugin for [`eslint-plugin-import`](https://www.npmjs.com/package/eslint-plugin-import).
+
+Published separately to allow pegging to a specific version in case of breaking
+changes.
+
+Config is passed directly through to [`resolve`](https://www.npmjs.com/package/resolve) as options:
+
+```yaml
+settings:
+  import/resolver:
+    node:
+      moduleDirectory:
+        - node_modules
+        - src
+```
+
+or to use the default options:
+
+```yaml
+settings:
+  import/resolver: node
+```

resolvers/node/index.js

@@ -0,0 +1,17 @@
+var resolve = require('resolve')
+  , path = require('path')
+  , assign = require('object-assign')
+
+exports.resolveImport = function resolveImport(source, file, config) {
+  if (resolve.isCore(source)) return null
+
+  return resolve.sync(source, opts(path.dirname(file), config))
+}
+
+function opts(basedir, config) {
+  return assign( {}
+               , config
+               , { basedir: basedir }
+               )
+}
+

resolvers/node/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "eslint-import-resolver-node",
+  "version": "0.0.0",
+  "description": "Node default behavior import resolution plugin for eslint-plugin-import.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/benmosher/eslint-plugin-import"
+  },
+  "keywords": [
+    "eslint",
+    "eslintplugin",
+    "esnext",
+    "modules",
+    "eslint-plugin-import"
+  ],
+  "author": "Ben Mosher (me@benmosher.com)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/benmosher/eslint-plugin-import/issues"
+  },
+  "homepage": "https://github.com/benmosher/eslint-plugin-import",
+  "dependencies": {
+    "object-assign": "^4.0.1",
+    "resolve": "^1.1.6"
+  }
+}

resolvers/webpack/.babelrc

@@ -0,0 +1 @@
+{ "presets": ["es2015"] }

resolvers/webpack/.npmignore

@@ -0,0 +1,2 @@
+test/
+.babelrc

resolvers/webpack/README.md

@@ -0,0 +1,27 @@
+# eslint-import-resolver-webpack
+
+[![npm](https://img.shields.io/npm/v/eslint-import-resolver-webpack.svg)](https://www.npmjs.com/package/eslint-import-resolver-webpack)
+
+Webpack-literate module resolution plugin for [`eslint-plugin-import`](https://www.npmjs.com/package/eslint-plugin-import).
+
+Published separately to allow pegging to a specific version in case of breaking
+changes.
+
+Will look for `webpack.config.js` as a sibling of the first ancestral `package.json`,
+or a `config` parameter may be provided with another filename/path relative to the
+`package.json`.
+
+```yaml
+---
+settings:
+  import/resolver: webpack  # take all defaults
+```
+
+or with explicit config file name:
+
+```yaml
+---
+settings:
+  import/resolver:
+    webpack: { config: 'webpack.dev.config.js' }
+```

resolvers/webpack/index.js

@@ -0,0 +1,87 @@
+var findRoot = require('find-root')
+  , path = require('path')
+  , resolve = require('resolve')
+  , get = require('lodash.get')
+
+var resolveAlias = require('./resolve-alias')
+
+/**
+ * Find the full path to 'source', given 'file' as a full reference path.
+ *
+ * resolveImport('./foo', '/Users/ben/bar.js') => '/Users/ben/foo.js'
+ * @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'
+ * TODO: take options as a third param, with webpack config file name
+ * @return {string?} the resolved path to source, undefined if not resolved, or null
+ *                   if resolved to a non-FS resource (i.e. script tag at page load)
+ */
+exports.resolveImport = function resolveImport(source, file, settings) {
+
+  // strip loaders
+  var finalBang = source.lastIndexOf('!')
+  if (finalBang >= 0) {
+    source = source.slice(finalBang + 1)
+  }
+
+  if (resolve.isCore(source)) return null
+
+  var webpackConfig
+  try {
+    var packageDir = findRoot(file)
+    if (!packageDir) throw new Error('package not found above ' + file)
+
+    webpackConfig = require(path.join(packageDir, get(settings, 'config', 'webpack.config.js')))
+  } catch (err) {
+    webpackConfig = {}
+  }
+
+  // externals
+  if (findExternal(source, webpackConfig.externals)) return null
+
+  // replace alias if needed
+  source = resolveAlias(source, get(webpackConfig, ['resolve', 'alias'], {}))
+
+  var paths = []
+
+  // root as first alternate path
+  var rootPath = get(webpackConfig, ['resolve', 'root'])
+  if (rootPath) paths.push(rootPath)
+
+  // otherwise, resolve "normally"
+  return resolve.sync(source, {
+    basedir: path.dirname(file),
+
+    // defined via http://webpack.github.io/docs/configuration.html#resolve-extensions
+    extensions: get(webpackConfig, ['resolve', 'extensions'])
+      || ['', '.webpack.js', '.web.js', '.js'],
+
+    // http://webpack.github.io/docs/configuration.html#resolve-modulesdirectories
+    moduleDirectory: get(webpackConfig, ['resolve', 'modulesDirectories'])
+      || ['web_modules', 'node_modules'],
+
+    paths: paths,
+  })
+}
+
+function findExternal(source, externals) {
+  if (!externals) return false
+
+  // string match
+  if (typeof externals === 'string') return (source === externals)
+
+  // array: recurse
+  if (externals instanceof Array) {
+    return externals.some(function (e) { return findExternal(source, e) })
+  }
+
+  if (externals instanceof RegExp) {
+    return externals.test(source)
+  }
+
+  if (typeof externals === 'function') {
+    throw new Error('unable to handle function externals')
+  }
+
+  // else, vanilla object
+  return Object.keys(externals).some(function (e) { return source === e })
+}

resolvers/webpack/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "eslint-import-resolver-webpack",
+  "version": "0.0.0",
+  "description": "Resolve paths to dependencies, given a webpack.config.js. Plugin for eslint-plugin-import.",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha --compilers js:babel-core/register"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/benmosher/eslint-plugin-import.git"
+  },
+  "keywords": [
+    "eslint-plugin-import",
+    "eslint",
+    "jsnext",
+    "modules",
+    "webpack"
+  ],
+  "author": "Ben Mosher (me@benmosher.com)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/benmosher/eslint-plugin-import/issues"
+  },
+  "homepage": "https://github.com/benmosher/eslint-plugin-import#readme",
+  "dependencies": {
+    "find-root": "^0.1.1",
+    "lodash.get": "^3.7.0",
+    "resolve": "^1.1.6"
+  },
+  "devDependencies": {
+    "babel-core": "^6.1.21",
+    "babel-preset-es2015": "^6.1.18",
+    "chai": "^3.4.1",
+    "mocha": "^2.3.3"
+  }
+}

resolvers/webpack/resolve-alias.js

@@ -0,0 +1,36 @@
+var path = require('path')
+
+// implements a rough version of
+// http://webpack.github.io/docs/configuration.html#resolve-alias
+module.exports = function resolveAlias(source, aliases) {
+
+  for (var alias in aliases) {
+    var match = matchAlias(source, alias, aliases[alias])
+    if (match) return match
+  }
+
+  // fail out
+  return source
+}
+
+function matchAlias(source, alias, value) {
+  var isExact = (alias[alias.length - 1] === '$')
+    , isFile = (path.extname(value) !== '')
+    , segments = source.split(path.sep)
+
+  if (isExact) alias = alias.slice(0, -1)
+
+  if (segments[0] === alias) {
+    // always return exact match
+    if (segments.length === 1) return value
+
+    // prefix match on exact match for file is an error
+    if (isFile && (isExact || !/^[./]/.test(value))) {
+      throw new Error('can\'t match file with exact alias prefix')
+    }
+
+    // otherwise, prefix match is fine for non-file paths
+    if (!isExact && !isFile) return [value].concat(segments.slice(1)).join(path.sep)
+  }
+
+}

resolvers/webpack/test/.eslintrc

@@ -0,0 +1,5 @@
+---
+env:
+  mocha: true
+rules:
+  quotes: 0