Raise test bar to Node 6.

jdalton · jdalton · commit f378700a1acd · 2018-06-06T08:09:31.000-07:00
diff --git a/.babelrc b/.babelrc
@@ -4,6 +4,11 @@
     "lodash"
   ],
   "presets": [
-    ["@babel/env", { "targets": { "node": 4 } }]
+    ["@babel/env", {
+      "loose": true,
+      "targets": {
+        "node": 6
+      }
+    }]
   ]
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: node_js
 sudo: false
 node_js:
-  - 9
+  - 10
   - 8
   - 6
-  - 4
 
 cache:
   directories:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,33 +17,34 @@
     "test": "mocha --check-leaks --require @babel/register"
   },
   "devDependencies": {
-    "@storybook/addon-links": "^3.2.0",
-    "async": "^2.6.0",
-    "@babel/cli": "^7.0.0-beta.32",
-    "@babel/core": "^7.0.0-beta.32",
+    "@babel/cli": "^7.0.0-beta.49",
+    "@babel/core": "^7.0.0-beta.49",
+    "@babel/plugin-proposal-function-bind": "^7.0.0-beta.49",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.49",
+    "@babel/plugin-syntax-flow": "^7.0.0-beta.49",
+    "@babel/plugin-syntax-jsx": "^7.0.0-beta.49",
+    "@babel/plugin-transform-runtime": "^7.0.0-beta.49",
+    "@babel/preset-env": "^7.0.0-beta.49",
+    "@babel/preset-react": "^7.0.0-beta.49",
+    "@babel/preset-stage-0": "^7.0.0-beta.49",
+    "@babel/register": "^7.0.0-beta.49",
+    "@storybook/addon-links": "^3.4.6",
+    "async": "^2.6.1",
     "babel-plugin-add-module-exports": "~0.2.1",
     "babel-plugin-lodash": "3.3.2",
-    "@babel/plugin-syntax-flow": "^7.0.0-beta.32",
-    "@babel/plugin-syntax-jsx": "^7.0.0-beta.32",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.32",
-    "@babel/plugin-transform-runtime": "^7.0.0-beta.32",
-    "@babel/preset-env": "^7.0.0-beta.32",
-    "@babel/preset-react": "^7.0.0-beta.32",
-    "@babel/preset-stage-0": "^7.0.0-beta.32",
-    "@babel/register": "^7.0.0-beta.32",
     "chai": "^4.1.2",
     "lodash-bound": "^1.1.2",
     "lodash-compat": "^3.10.2",
-    "lodash-es": "^4.17.4",
-    "mocha": "^4.0.1",
+    "lodash-es": "^4.17.10",
+    "mocha": "^4.1.0",
     "ramda": "^0.25.0",
     "react-bootstrap": "^0.31.5"
   },
   "dependencies": {
-    "@babel/helper-module-imports": "^7.0.0-beta.32",
-    "@babel/types": "^7.0.0-beta.32",
+    "@babel/helper-module-imports": "^7.0.0-beta.49",
+    "@babel/types": "^7.0.0-beta.49",
     "glob": "^7.1.1",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.10",
     "require-package-name": "^2.0.1"
   },
   "files": [
diff --git a/src/index.js b/src/index.js
@@ -140,10 +140,11 @@ export default function lodash({ types }) {
         _.each(specs, (spec) => {
           const { imported, local } = spec
           const binding = file.scope.getBinding(local)
+          const { importKind = 'value' } = binding.path.parent
 
           // Skip type annotation imports.
-          if (! binding) {
-            return false
+          if (importKind != 'value') {
+            return
           }
 
           const isChain = isLodash && imported === 'chain'
diff --git a/test/.babelrc b/test/.babelrc
@@ -1,5 +1,9 @@
 {
   "presets": [
-    ["@babel/env", { "targets": { "node": 4 } }]
+    ["@babel/env", {
+      "targets": {
+        "node": 6
+      }
+    }]
   ]
 }
diff --git a/test/fixtures/compat-arguments/expected.js b/test/fixtures/compat-arguments/expected.js
@@ -6,4 +6,4 @@ var _capitalize2 = _interopRequireDefault(require("lodash-compat/string/capitali
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-(0, _map2.default)([], _capitalize2.default);
+(0, _map2.default)([], _capitalize2.default);
diff --git a/test/fixtures/compat-basic-default/expected.js b/test/fixtures/compat-basic-default/expected.js
@@ -10,7 +10,5 @@ var _map2 = _interopRequireDefault(require("lodash-compat/collection/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
-(0, _take2.default)((0, _reject2.default)(result), 1);
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
+(0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/compat-basic-member/expected.js b/test/fixtures/compat-basic-member/expected.js
@@ -10,7 +10,5 @@ var _add2 = _interopRequireDefault(require("lodash-compat/math/add"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
-(0, _take2.default)((0, _reject2.default)(result), 1);
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
+(0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/compat-default-and-member/expected.js b/test/fixtures/compat-default-and-member/expected.js
@@ -10,7 +10,5 @@ var _map2 = _interopRequireDefault(require("lodash-compat/collection/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
 (0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/compat-property-values/expected.js b/test/fixtures/compat-property-values/expected.js
@@ -13,7 +13,7 @@ var _camelCase2 = _interopRequireDefault(require("lodash-compat/string/camelCase
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var formatters = {
+const formatters = {
   camelCase: _camelCase2.default,
   'kebabCase': _kebabCase2.default,
   'snakeCase': _snakeCase2.default
diff --git a/test/fixtures/compat-variable-declarator-exports/expected.js b/test/fixtures/compat-variable-declarator-exports/expected.js
@@ -13,9 +13,9 @@ var _string = require("string");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var case1 = _camelCase2.default;
+const case1 = _camelCase2.default;
 exports.case1 = case1;
-var case2 = _kebabCase2.default;
+const case2 = _kebabCase2.default;
 exports.case2 = case2;
-var case3 = _string.snakeCase;
+const case3 = _string.snakeCase;
 exports.case3 = case3;
diff --git a/test/fixtures/es-basic-default/expected.js b/test/fixtures/es-basic-default/expected.js
@@ -10,7 +10,5 @@ var _map2 = _interopRequireDefault(require("lodash-es/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
 (0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/es-basic-member/expected.js b/test/fixtures/es-basic-member/expected.js
@@ -10,7 +10,5 @@ var _add2 = _interopRequireDefault(require("lodash-es/add"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
 (0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/es-default-and-member/expected.js b/test/fixtures/es-default-and-member/expected.js
@@ -10,7 +10,5 @@ var _map2 = _interopRequireDefault(require("lodash-es/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
 (0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/es-expression-default/expected.js b/test/fixtures/es-expression-default/expected.js
@@ -14,7 +14,7 @@ var _identity2 = _interopRequireDefault(require("lodash-es/identity"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var func1 = _identity2.default || _noop2.default;
-var func2 = _noop2.default ? _map2.default : _filter2.default;
+const func1 = _identity2.default || _noop2.default;
+const func2 = _noop2.default ? _map2.default : _filter2.default;
 _noop2.default;
 (bool ? _omit2.default : _pick2.default)(object);
diff --git a/test/fixtures/es-property-values/expected.js b/test/fixtures/es-property-values/expected.js
@@ -13,7 +13,7 @@ var _camelCase2 = _interopRequireDefault(require("lodash-es/camelCase"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var formatters = {
+const formatters = {
   camelCase: _camelCase2.default,
   'kebabCase': _kebabCase2.default,
   'snakeCase': _snakeCase2.default
diff --git a/test/fixtures/es-variable-declarator-exports/expected.js b/test/fixtures/es-variable-declarator-exports/expected.js
@@ -13,9 +13,9 @@ var _string = require("string");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var case1 = _camelCase2.default;
+const case1 = _camelCase2.default;
 exports.case1 = case1;
-var case2 = _kebabCase2.default;
+const case2 = _kebabCase2.default;
 exports.case2 = case2;
-var case3 = _string.snakeCase;
+const case3 = _string.snakeCase;
 exports.case3 = case3;
diff --git a/test/fixtures/fp-basic-default/expected.js b/test/fixtures/fp-basic-default/expected.js
@@ -10,6 +10,6 @@ var _map2 = _interopRequireDefault(require("lodash/fp/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var mapper = (0, _map2.default)((0, _add2.default)(1));
-var result = mapper([]);
+const mapper = (0, _map2.default)((0, _add2.default)(1));
+const result = mapper([]);
 (0, _take2.default)(1, (0, _reject2.default)(Boolean, result));
diff --git a/test/fixtures/fp-basic-member/expected.js b/test/fixtures/fp-basic-member/expected.js
@@ -10,6 +10,6 @@ var _add2 = _interopRequireDefault(require("lodash/fp/add"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var mapper = (0, _map2.default)((0, _add2.default)(1));
-var result = mapper([]);
+const mapper = (0, _map2.default)((0, _add2.default)(1));
+const result = mapper([]);
 (0, _take2.default)(1, (0, _reject2.default)(Boolean, result));
diff --git a/test/fixtures/fp-convert/expected.js b/test/fixtures/fp-convert/expected.js
@@ -8,7 +8,7 @@ var _convert = _interopRequireDefault(require("lodash-fp/convert"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var fp = (0, _convert.default)({
+const fp = (0, _convert.default)({
   filter: _filter2.default,
   map: _map2.default
-});
+});
diff --git a/test/fixtures/fp-default-and-member/expected.js b/test/fixtures/fp-default-and-member/expected.js
@@ -10,6 +10,6 @@ var _map2 = _interopRequireDefault(require("lodash/fp/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var mapper = (0, _map2.default)((0, _add2.default)(1));
-var result = mapper([1, 2, 3]);
+const mapper = (0, _map2.default)((0, _add2.default)(1));
+const result = mapper([1, 2, 3]);
 (0, _take2.default)(1, (0, _reject2.default)(Boolean, result));
diff --git a/test/fixtures/fp-property-values/expected.js b/test/fixtures/fp-property-values/expected.js
@@ -13,7 +13,7 @@ var _camelCase2 = _interopRequireDefault(require("lodash/fp/camelCase"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var formatters = {
+const formatters = {
   camelCase: _camelCase2.default,
   'kebabCase': _kebabCase2.default,
   'snakeCase': _snakeCase2.default
diff --git a/test/fixtures/fp-variable-declarator-exports/expected.js b/test/fixtures/fp-variable-declarator-exports/expected.js
@@ -13,9 +13,9 @@ var _string = require("string");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var case1 = _camelCase2.default;
+const case1 = _camelCase2.default;
 exports.case1 = case1;
-var case2 = _kebabCase2.default;
+const case2 = _kebabCase2.default;
 exports.case2 = case2;
-var case3 = _string.snakeCase;
+const case3 = _string.snakeCase;
 exports.case3 = case3;
diff --git a/test/fixtures/lodash-assignment/expected.js b/test/fixtures/lodash-assignment/expected.js
@@ -4,5 +4,5 @@ var _noop2 = _interopRequireDefault(require("lodash/noop"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var o = {};
+const o = {};
 o.a = _noop2.default;
diff --git a/test/fixtures/lodash-basic-default/expected.js b/test/fixtures/lodash-basic-default/expected.js
@@ -10,7 +10,5 @@ var _map2 = _interopRequireDefault(require("lodash/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
 (0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/lodash-basic-member/expected.js b/test/fixtures/lodash-basic-member/expected.js
@@ -10,7 +10,5 @@ var _add2 = _interopRequireDefault(require("lodash/add"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
-(0, _take2.default)((0, _reject2.default)(result), 1);
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
+(0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/lodash-basic-namespace/expected.js b/test/fixtures/lodash-basic-namespace/expected.js
@@ -10,7 +10,5 @@ var _map2 = _interopRequireDefault(require("lodash/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
 (0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/lodash-default-and-member/expected.js b/test/fixtures/lodash-default-and-member/expected.js
@@ -10,7 +10,5 @@ var _map2 = _interopRequireDefault(require("lodash/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result = (0, _map2.default)([], function (n) {
-  return (0, _add2.default)(1, n);
-});
+const result = (0, _map2.default)([], n => (0, _add2.default)(1, n));
 (0, _take2.default)((0, _reject2.default)(result), 1);
diff --git a/test/fixtures/lodash-property-values/expected.js b/test/fixtures/lodash-property-values/expected.js
@@ -13,7 +13,7 @@ var _camelCase2 = _interopRequireDefault(require("lodash/camelCase"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var formatters = {
+const formatters = {
   camelCase: _camelCase2.default,
   'kebabCase': _kebabCase2.default,
   'snakeCase': _snakeCase2.default
diff --git a/test/fixtures/lodash-reimports/expected.js b/test/fixtures/lodash-reimports/expected.js
@@ -4,7 +4,7 @@ var _map2 = _interopRequireDefault(require("lodash/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result1 = (0, _map2.default)([]);
-var result2 = (0, _map2.default)([]);
-var result3 = (0, _map2.default)([]);
-var result4 = (0, _map2.default)([]);
+const result1 = (0, _map2.default)([]);
+const result2 = (0, _map2.default)([]);
+const result3 = (0, _map2.default)([]);
+const result4 = (0, _map2.default)([]);
diff --git a/test/fixtures/lodash-repeat-identifiers/expected.js b/test/fixtures/lodash-repeat-identifiers/expected.js
@@ -4,5 +4,5 @@ var _noop2 = _interopRequireDefault(require("lodash/noop"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var array = [undefined, undefined, _noop2.default, _noop2.default, _noop2.default, _noop2.default];
+const array = [undefined, undefined, _noop2.default, _noop2.default, _noop2.default, _noop2.default];
 (0, _noop2.default)(_noop.placeholder, _noop.placeholder, _noop2.default, _noop2.default, _noop2.default, _noop2.default);
diff --git a/test/fixtures/lodash-repeat-use/expected.js b/test/fixtures/lodash-repeat-use/expected.js
@@ -4,7 +4,7 @@ var _map2 = _interopRequireDefault(require("lodash/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var result1 = (0, _map2.default)([]);
-var result2 = (0, _map2.default)([]);
-var result3 = (0, _map2.default)([]);
-var result4 = (0, _map2.default)([]);
+const result1 = (0, _map2.default)([]);
+const result2 = (0, _map2.default)([]);
+const result3 = (0, _map2.default)([]);
+const result4 = (0, _map2.default)([]);
diff --git a/test/fixtures/lodash-spread-operator/expected.js b/test/fixtures/lodash-spread-operator/expected.js
@@ -6,8 +6,5 @@ var _merge4 = _interopRequireDefault(require("lodash/merge"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
-
-_merge4.default.apply(void 0, [{}].concat(_toConsumableArray(args)));
-
-_merge3.default.apply(void 0, [{}].concat(_toConsumableArray(args)));
+(0, _merge4.default)({}, ...args);
+(0, _merge3.default)({}, ...args);
diff --git a/test/fixtures/lodash-variable-declarator-exports/expected.js b/test/fixtures/lodash-variable-declarator-exports/expected.js
diff --git a/test/fixtures/scoped-module/expected.js b/test/fixtures/scoped-module/expected.js
diff --git a/test/mixed-fixtures/async-bound-ramda/.babelrc b/test/mixed-fixtures/async-bound-ramda/.babelrc
diff --git a/test/mixed-fixtures/async-bound-ramda/expected.js b/test/mixed-fixtures/async-bound-ramda/expected.js
diff --git a/test/mixed-fixtures/lodash-and-fp/expected.js b/test/mixed-fixtures/lodash-and-fp/expected.js
diff --git a/test/mixed-fixtures/object-rest-spread/.babelrc b/test/mixed-fixtures/object-rest-spread/.babelrc
diff --git a/test/mixed-fixtures/object-rest-spread/expected.js b/test/mixed-fixtures/object-rest-spread/expected.js
diff --git a/test/mixed-fixtures/react-bootstrap/.babelrc b/test/mixed-fixtures/react-bootstrap/.babelrc
diff --git a/test/mixed-fixtures/react-bootstrap/expected.js b/test/mixed-fixtures/react-bootstrap/expected.js
diff --git a/test/mixed-fixtures/syntax-flow/.babelrc b/test/mixed-fixtures/syntax-flow/.babelrc
diff --git a/test/mixed-fixtures/syntax-flow/expected.js b/test/mixed-fixtures/syntax-flow/expected.js
diff --git a/test/mixed-fixtures/syntax-jsx/.babelrc b/test/mixed-fixtures/syntax-jsx/.babelrc
diff --git a/test/mixed-fixtures/syntax-jsx/expected.js b/test/mixed-fixtures/syntax-jsx/expected.js
diff --git a/test/parsing-fixtures/wildcard-exports/.babelrc b/test/parsing-fixtures/wildcard-exports/.babelrc

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,11 @@`
`4`	`4`	`"lodash"`
`5`	`5`	`],`
`6`	`6`	`"presets": [`
`7`		`- ["@babel/env", { "targets": { "node": 4 } }]`
	`7`	`+ ["@babel/env", {`
	`8`	`+ "loose": true,`
	`9`	`+ "targets": {`
	`10`	`+ "node": 6`
	`11`	`+ }`
	`12`	`+ }]`
`8`	`13`	`]`
`9`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"presets": [`
`3`		`- ["@babel/env", { "targets": { "node": 4 } }]`
	`3`	`+ ["@babel/env", {`
	`4`	`+ "targets": {`
	`5`	`+ "node": 6`
	`6`	`+ }`
	`7`	`+ }]`
`4`	`8`	`]`
`5`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ var _capitalize2 = _interopRequireDefault(require("lodash-compat/string/capitali`
`6`	`6`
`7`	`7`	`function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }`
`8`	`8`
`9`		`-(0, _map2.default)([], _capitalize2.default);`
	`9`	`+(0, _map2.default)([], _capitalize2.default);`