Merge branch 'core-v2' into v2: #234 lives again

Author: benmosher

.babelrc

@@ -1,4 +1,4 @@
 {
-  "presets": [ "es2015-loose" ],
+  "presets": [ "es2015-argon" ],
   "sourceMaps": "inline"
 }

.travis.yml

@@ -1,7 +1,5 @@
 language: node_js
 node_js:
-  - 0.10
-  # - 0.12 # assume 0.12 works if 0.10 does.
   - 4
   - 6
 

CHANGELOG.md

@@ -101,6 +101,9 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 ### Changed
 - Rearranged rule groups in README in preparation for more style guide rules
 
+### Removed
+- support for Node 0.10, via `es6-*` ponyfills. Using native Map/Set/Symbol.
+
 ## [1.4.0] - 2016-03-25
 ### Added
 - Resolver plugin interface v2: more explicit response format that more clearly covers the found-but-core-module case, where there is no path.

memo-parser/index.js

@@ -1,8 +1,8 @@
 "use strict"
 
 const crypto = require('crypto')
-    , moduleRequire = require('../lib/core/module-require').default
-    , hashObject = require('../lib/core/hash').hashObject
+    , moduleRequire = require('eslint-module-utils/module-require').default
+    , hashObject = require('eslint-module-utils/hash').hashObject
 
 const cache = new Map()
 
@@ -22,7 +22,7 @@ exports.parse = function parse(content, options) {
 
   const keyHash = crypto.createHash('sha256')
   keyHash.update(content)
-  hashObject(keyHash, options)
+  hashObject(options, keyHash)
 
   const key = keyHash.digest('hex')
 

package.json

@@ -2,6 +2,7 @@
   "name": "eslint-plugin-import",
   "version": "1.10.1",
   "description": "Import with sanity.",
+  "engines": { "node": ">=4" },
   "main": "lib/index.js",
   "directories": {
     "test": "tests"
@@ -43,14 +44,14 @@
   "homepage": "https://github.com/benmosher/eslint-plugin-import",
   "devDependencies": {
     "babel-eslint": "next",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-preset-es2015-loose": "^7.0.0",
+    "babel-preset-es2015-argon": "*",
     "chai": "^3.4.0",
     "coveralls": "^2.11.4",
     "cross-env": "^1.0.7",
     "eslint": "3.x",
     "eslint-import-resolver-node": "file:./resolvers/node",
     "eslint-import-resolver-webpack": "file:./resolvers/webpack",
+    "eslint-module-utils": "file:./utils",
     "glob": "^6.0.2",
     "gulp": "^3.9.0",
     "gulp-babel": "6.1.2",
@@ -68,16 +69,11 @@
     "builtin-modules": "^1.1.1",
     "contains-path": "^0.1.0",
     "doctrine": "1.2.x",
-    "es6-map": "^0.1.3",
-    "es6-set": "^0.1.4",
-    "es6-symbol": "*",
     "eslint-import-resolver-node": "^0.2.0",
     "lodash.cond": "^4.3.0",
     "lodash.endswith": "^4.0.1",
     "lodash.find": "^4.3.0",
     "lodash.findindex": "^4.3.0",
-    "object-assign": "^4.0.1",
-    "pkg-dir": "^1.0.0",
     "pkg-up": "^1.0.0"
   }
 }