From 393b88e7a81c1e3c9b48b30b0384dc33c6b1f8dc Mon Sep 17 00:00:00 2001 From: andela-jkimani Date: Tue, 14 Mar 2017 19:33:49 +0300 Subject: [PATCH 1/4] Update babel-preset-metalab and eslint-config-metalab --- package.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index d728dae..5631aa6 100644 --- a/package.json +++ b/package.json @@ -26,13 +26,14 @@ }, "devDependencies": { "babel-cli": "^6.14.0", - "babel-preset-metalab": "^0.2.1", - "eslint": "^2.10.2", - "eslint-config-metalab": "^4.0.1", - "eslint-plugin-filenames": "^0.2.0", - "eslint-plugin-import": "^1.13.0", - "eslint-plugin-lodash-fp": "^1.2.0", - "eslint-plugin-react": "^5.1.1", + "babel-preset-metalab": "^1.0.0", + "eslint": "^3.5.0", + "eslint-config-metalab": "^6.0.1", + "eslint-plugin-babel": "^4.1.1", + "eslint-plugin-filenames": "^1.1.0", + "eslint-plugin-import": "^2.2.0", + "eslint-plugin-lodash-fp": "^2.1.3", + "eslint-plugin-react": "^6.10.0", "react": "^15.3.0", "react-redux": "^4.4.5", "react-router": "^2.7.0", From 8d08225bb4c7d0ae27cfa580981cec98430d463a Mon Sep 17 00:00:00 2001 From: andela-jkimani Date: Wed, 15 Mar 2017 18:00:19 +0300 Subject: [PATCH 2/4] Add node target to babel --- .babelrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.babelrc b/.babelrc index 71e7188..0e2edb4 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,9 @@ { "presets": [ - "metalab" + "metalab", { + "targets": { + "node": 4 + } + } ] } From f2d1f7e7d9ebb86f70faecb5a5eb38d3e397f837 Mon Sep 17 00:00:00 2001 From: andela-jkimani Date: Wed, 15 Mar 2017 18:47:46 +0300 Subject: [PATCH 3/4] Add browser targets --- .babelrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.babelrc b/.babelrc index 0e2edb4..424a6a3 100644 --- a/.babelrc +++ b/.babelrc @@ -2,7 +2,7 @@ "presets": [ "metalab", { "targets": { - "node": 4 + "browsers": [">1%"] } } ] From 7a13a4d48fa2401d78d32987e283b5875369d8ab Mon Sep 17 00:00:00 2001 From: andela-jkimani Date: Wed, 15 Mar 2017 23:56:25 +0300 Subject: [PATCH 4/4] Fix babelrc file --- .babelrc | 5 +++-- src/connect.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.babelrc b/.babelrc index 424a6a3..200eee8 100644 --- a/.babelrc +++ b/.babelrc @@ -1,9 +1,10 @@ { "presets": [ - "metalab", { + ["metalab", { "targets": { + "node": 4, "browsers": [">1%"] } - } + }] ] } diff --git a/src/connect.js b/src/connect.js index 93349d9..b2c748b 100644 --- a/src/connect.js +++ b/src/connect.js @@ -67,7 +67,7 @@ export default ({scope, ...defaultProps} = {}) => (WrappedComponent) => { const { ___relocationState___, ___relocationDispatch___, - ...childProps, + ...childProps } = this.props; /* eslint-enable no-unused-vars */