chore: merge from master

Talend · Sep 8, 2016 · af85243 · af85243
2 parents 2c88dd4 + 6616838
commit af85243
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,11 @@
 language: node_js
+cache:
+  directories:
+    - node_modules
 node_js:
   - "6"
+before_script:
+  - npm prune
 after_success:
   - npm run test:cov
   - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "clean:coverage": "rimraf ./coverage",
     "dev": "webpack --progress --colors --watch --env.dev",
     "lint": "npm run lint:es",
-    "lint:es": "eslint --config .eslintrc src/app/**/*.js",
+    "lint:es": "eslint --config .eslintrc src/**/*.js",
     "prepublish": "npm run build",
     "test": "jest --no-cache",
     "test:watch": "jest --watch",
@@ -86,6 +86,7 @@
     "d3-shape": "1.0.3",
     "d3-zoom": "1.0.2",
     "invariant": "2.2.1",
+    "lodash": "4.15.0",
     "react-immutable-proptypes": "2.1.0"
   }
 }
diff --git a/webpack.config.babel.js b/webpack.config.babel.js
@@ -24,6 +24,7 @@ const CONFIG = {
     devtool: 'source-map',
     externals: {
         'immutable': 'immutable',
+		'lodash': 'lodash',
         'react': 'react',
         'react-dom': 'react-dom',
         'react-redux': 'react-redux',