cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the lodash.assign dependency (babel/babel-eslint#393)

Browse Source 
lodash.assign is deprecated:
```
npm WARN deprecated lodash.assign@4.2.0: This package is deprecated.
Use Object.assign.
```
This commit is contained in:
Ville Immonen 2016-09-27 18:32:52 +03:00
parent 33343e6688
commit ce6d9df192
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eslint/babel-eslint-parser/index.js
View File

@ -1,5 +1,4 @@
var babylonToEspree = require("./babylon-to-espree"); var babylonToEspree = require("./babylon-to-espree");
var assign = require("lodash.assign");
var pick = require("lodash.pickby"); var pick = require("lodash.pickby");
var Module = require("module"); var Module = require("module");
var path = require("path"); var path = require("path");
@ -54,13 +53,13 @@ function monkeypatch() {
// monkeypatch estraverse // monkeypatch estraverse
estraverse = estraverseRelative.require("estraverse"); estraverse = estraverseRelative.require("estraverse");
estraverses.push(estraverse); estraverses.push(estraverse);
assign(estraverse.VisitorKeys, t.VISITOR_KEYS); Object.assign(estraverse.VisitorKeys, t.VISITOR_KEYS);
// monkeypatch estraverse-fb (only for eslint < 2.3.0) // monkeypatch estraverse-fb (only for eslint < 2.3.0)
try { try {
var estraverseFb = eslintMod.require("estraverse-fb"); var estraverseFb = eslintMod.require("estraverse-fb");
estraverses.push(estraverseFb); estraverses.push(estraverseFb);
assign(estraverseFb.VisitorKeys, t.VISITOR_KEYS); Object.assign(estraverseFb.VisitorKeys, t.VISITOR_KEYS);
} catch (err) { } catch (err) {
// Ignore: ESLint v2.3.0 does not have estraverse-fb // Ignore: ESLint v2.3.0 does not have estraverse-fb
} }
@ -69,7 +68,7 @@ function monkeypatch() {
var estraverseOfEslint = eslintMod.require("estraverse"); var estraverseOfEslint = eslintMod.require("estraverse");
if (estraverseOfEslint !== estraverseFb) { if (estraverseOfEslint !== estraverseFb) {
estraverses.push(estraverseOfEslint); estraverses.push(estraverseOfEslint);
assign(estraverseOfEslint.VisitorKeys, t.VISITOR_KEYS); Object.assign(estraverseOfEslint.VisitorKeys, t.VISITOR_KEYS);
} }
estraverses.forEach(function (estraverse) { estraverses.forEach(function (estraverse) {

1
eslint/babel-eslint-parser/package.json
View File

@ -15,7 +15,6 @@
"babel-traverse": "^6.0.20", "babel-traverse": "^6.0.20",
"babel-types": "^6.0.19", "babel-types": "^6.0.19",
"babylon": "^6.11.2", "babylon": "^6.11.2",
"lodash.assign": "^4.0.0",
"lodash.pickby": "^4.0.0" "lodash.pickby": "^4.0.0"
}, },
"scripts": { "scripts": {

7
eslint/babel-eslint-parser/test/integration.js
View File

@ -1,5 +1,4 @@
var assert = require("assert"); var assert = require("assert");
var assign = require("lodash.assign");
var eslint = require("eslint"); var eslint = require("eslint");
var fs = require("fs"); var fs = require("fs");
var path = require("path"); var path = require("path");
@ -56,7 +55,7 @@ function strictSuite () {
var ruleId = "strict"; var ruleId = "strict";
describe("when set to 'never'", function () { describe("when set to 'never'", function () {
var eslintOpts = assign({}, baseEslintOpts, { var eslintOpts = Object.assign({}, baseEslintOpts, {
rules: {}, rules: {},
}); });
eslintOpts.rules[ruleId] = [errorLevel, "never"]; eslintOpts.rules[ruleId] = [errorLevel, "never"];
@ -81,7 +80,7 @@ function strictSuite () {
// describe // describe
describe("when set to 'global'", function () { describe("when set to 'global'", function () {
var eslintOpts = assign({}, baseEslintOpts, { var eslintOpts = Object.assign({}, baseEslintOpts, {
rules: {} rules: {}
}); });
eslintOpts.rules[ruleId] = [errorLevel, "global"]; eslintOpts.rules[ruleId] = [errorLevel, "global"];
@ -145,7 +144,7 @@ function strictSuite () {
// describe // describe
describe("when set to 'function'", function () { describe("when set to 'function'", function () {
var eslintOpts = assign({}, baseEslintOpts, { var eslintOpts = Object.assign({}, baseEslintOpts, {
rules: {} rules: {}
}); });
eslintOpts.rules[ruleId] = [errorLevel, "function"]; eslintOpts.rules[ruleId] = [errorLevel, "function"];