Skip to content

Commit

Permalink
Upgrade deps, formatting, node 8 in Travis (#573)
Browse files Browse the repository at this point in the history
* chore: Upgrade deps & add node 8 to travis

* Format code: prettier upgrade

* Remove node 7
  • Loading branch information
boopathi committed Jun 9, 2017
1 parent be3f3a7 commit 90ee63b
Show file tree
Hide file tree
Showing 13 changed files with 280 additions and 202 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -6,7 +6,7 @@ language: node_js
cache: yarn

node_js:
- '7'
- '8'
- '6'
- '4'

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
@@ -1,5 +1,5 @@
{
"lerna": "2.0.0-rc.4",
"lerna": "2.0.0-rc.5",
"version": "independent",
"commands": {
"publish": {
Expand Down
14 changes: 7 additions & 7 deletions package.json
Expand Up @@ -40,7 +40,7 @@
"babel-eslint": "^7.2.3",
"babel-jest": "^20.0.3",
"babel-plugin-transform-es2015-block-scoping": "^6.24.1",
"babel-preset-env": "^1.5.0",
"babel-preset-env": "^1.5.2",
"babel-traverse": "^6.24.1",
"butternut": "^0.4.6",
"bytes": "^2.5.0",
Expand All @@ -50,18 +50,18 @@
"codecov": "^2.2.0",
"commander": "^2.9.0",
"eslint": "^3.18.0",
"google-closure-compiler-js": "^20170423.0.0",
"google-closure-compiler-js": "^20170521.0.0",
"gulp": "github:gulpjs/gulp#4.0",
"gulp-babel": "^6.1.2",
"gulp-newer": "^1.1.0",
"gulp-util": "^3.0.8",
"jest-cli": "^20.0.3",
"lerna": "^2.0.0-rc.4",
"lerna-changelog": "^0.4.0",
"jest-cli": "^20.0.4",
"lerna": "^2.0.0-rc.5",
"lerna-changelog": "^0.5.0",
"markdown-table": "^1.1.0",
"prettier": "^1.3.1",
"prettier": "^1.4.4",
"request": "^2.81.0",
"through2": "^2.0.1",
"uglify-js": "^3.0.10"
"uglify-js": "^3.0.15"
}
}
6 changes: 4 additions & 2 deletions packages/babel-helper-flip-expressions/src/index.js
Expand Up @@ -27,8 +27,10 @@ module.exports = function(t) {
}

if (
!(t.isBinaryExpression(node) &&
t.EQUALITY_BINARY_OPERATORS.indexOf(node.operator) > -1)
!(
t.isBinaryExpression(node) &&
t.EQUALITY_BINARY_OPERATORS.indexOf(node.operator) > -1
)
) {
// Binary expressions wouldn't hurut because we know how to flip them
savings--;
Expand Down
Expand Up @@ -1177,7 +1177,8 @@ module.exports = ({ types: t, traverse }) => {
}

function getLabel(name, _path) {
let label, path = _path;
let label,
path = _path;
do {
label = path.scope.getLabel(name);
if (label) {
Expand Down
6 changes: 4 additions & 2 deletions packages/babel-plugin-minify-guarded-expressions/src/index.js
Expand Up @@ -67,8 +67,10 @@ module.exports = function({ types: t }) {

if (
!path.parentPath.isExpressionStatement() &&
!(path.parentPath.isSequenceExpression() &&
path.parentPath.parentPath.isExpressionStatement())
!(
path.parentPath.isSequenceExpression() &&
path.parentPath.parentPath.isExpressionStatement()
)
) {
return;
}
Expand Down
18 changes: 12 additions & 6 deletions packages/babel-plugin-minify-simplify/src/index.js
Expand Up @@ -137,9 +137,11 @@ module.exports = ({ types: t }) => {

// We need to make sure that the return type will always be boolean.
if (
!(t.isLogicalExpression(expr) ||
!(
t.isLogicalExpression(expr) ||
t.isConditionalExpression(expr) ||
t.isBinaryExpression(expr))
t.isBinaryExpression(expr)
)
) {
return;
}
Expand Down Expand Up @@ -417,8 +419,10 @@ module.exports = ({ types: t }) => {

if (
!path.isAssignmentExpression() ||
!(path.get("left").isIdentifier() ||
path.get("left").isMemberExpression())
!(
path.get("left").isIdentifier() ||
path.get("left").isMemberExpression()
)
) {
return true;
}
Expand Down Expand Up @@ -1584,8 +1588,10 @@ module.exports = ({ types: t }) => {
// issue#399
const deopt = !statements.every(stmt => {
if (
!(stmt.isVariableDeclaration({ kind: "let" }) ||
stmt.isVariableDeclaration({ kind: "const" }))
!(
stmt.isVariableDeclaration({ kind: "let" }) ||
stmt.isVariableDeclaration({ kind: "const" })
)
) {
return true;
}
Expand Down
Expand Up @@ -22,7 +22,8 @@ class ArrayCollapser extends Collapser {
return false;
}

const obj = callee.get("object"), prop = callee.get("property");
const obj = callee.get("object"),
prop = callee.get("property");
if (
!obj.isIdentifier() ||
obj.node.name !== objName ||
Expand Down
Expand Up @@ -22,7 +22,8 @@ class ArrayPropertyCollapser extends Collapser {
return false;
}

const obj = left.get("object"), prop = left.get("property");
const obj = left.get("object"),
prop = left.get("property");
if (!obj.isIdentifier() || obj.node.name !== objName) {
return false;
}
Expand Down
Expand Up @@ -70,7 +70,8 @@ function validateTopLevel(path) {
}

const declaration = declarations[0];
const id = declaration.get("id"), init = declaration.get("init");
const id = declaration.get("id"),
init = declaration.get("init");
if (!id.isIdentifier()) {
return;
}
Expand Down
Expand Up @@ -21,7 +21,8 @@ class ObjectCollapser extends Collapser {
return false;
}

const obj = left.get("object"), prop = left.get("property");
const obj = left.get("object"),
prop = left.get("property");
if (!obj.isIdentifier() || obj.node.name !== objName) {
return false;
}
Expand Down
Expand Up @@ -30,7 +30,8 @@ class SetCollapser extends Collapser {
return false;
}

const obj = callee.get("object"), prop = callee.get("property");
const obj = callee.get("object"),
prop = callee.get("property");
if (
!obj.isIdentifier() ||
obj.node.name !== objName ||
Expand Down

0 comments on commit 90ee63b

Please sign in to comment.