fix webpack, update dependencies

bertho-zero · bertho-zero · commit 31d6fffb8bae · 2017-05-05T21:26:35.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ dist: trusty
 language: node_js
 
 node_js:
-  - "4.0"
   - "4"
   - "5"
   - "stable"
diff --git a/package.json b/package.json
@@ -122,7 +122,7 @@
     "feathers-authentication-oauth1": "^0.2.3",
     "feathers-authentication-oauth2": "^0.2.3",
     "feathers-errors": "^2.5.0",
-    "feathers-hooks": "^1.7.1",
+    "feathers-hooks": "^2.0.1",
     "feathers-hooks-common": "^2.0.3",
     "feathers-nedb": "^2.6.0",
     "feathers-rest": "^1.6.0",
@@ -141,9 +141,9 @@
     "pretty-error": "^2.0.2",
     "prop-types": "^15.5.8",
     "react": "^15.4.2",
-    "react-bootstrap": "^0.30.7",
+    "react-bootstrap": "^0.31.0",
     "react-dom": "^15.4.2",
-    "react-helmet": "^4.0.0",
+    "react-helmet": "^5.0.3",
     "react-redux": "^5.0.2",
     "react-router": "^3.0.2",
     "react-router-bootstrap": "^0.23.1",
@@ -164,9 +164,9 @@
     "autoprefixer-loader": "^3.2.0",
     "babel-eslint": "^7.1.1",
     "babel-jest": "^19.0.0",
-    "babel-loader": "^6.3.2",
+    "babel-loader": "^7.0.0",
     "better-npm-run": "^0.0.15",
-    "bootstrap-loader": "2.0.0",
+    "bootstrap-loader": "^2.1.0",
     "bootstrap-sass": "^3.3.7",
     "chai": "^3.5.0",
     "clean-webpack-plugin": "^0.1.15",
@@ -179,7 +179,7 @@
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.10.0",
     "extract-text-webpack-plugin": "2.1.0",
-    "file-loader": "^0.10.0",
+    "file-loader": "^0.11.1",
     "font-awesome": "^4.7.0",
     "font-awesome-webpack": "^0.0.4",
     "happypack": "^3.0.2",
@@ -212,8 +212,8 @@
     "sass-loader": "^6.0.1",
     "sinon": "^2.1.0",
     "strip-loader": "^0.1.2",
-    "style-loader": "^0.16.1",
-    "sw-precache-webpack-plugin": "^0.9.0",
+    "style-loader": "^0.17.0",
+    "sw-precache-webpack-plugin": "^0.11.0",
     "timekeeper": "^1.0.0",
     "url-loader": "^0.5.7",
     "webpack": "^2.2.1",
diff --git a/src/helpers/Html.js b/src/helpers/Html.js
@@ -27,7 +27,7 @@ export default class Html extends Component {
   render() {
     const { assets, component, store } = this.props;
     const content = component ? ReactDOM.renderToString(component) : '';
-    const head = Helmet.rewind();
+    const head = Helmet.renderStatic();
 
     return (
       <html lang="en-US">
diff --git a/webpack/prod.config.js b/webpack/prod.config.js
@@ -190,7 +190,7 @@ module.exports = {
 
       // Ensure all our static, local assets are cached.
       staticFileGlobs: [path.dirname(assetsPath) + '/**/*.{js,html,css,png,jpg,gif,svg,eot,ttf,woff,woff2}'],
-      stripPrefix: assetsPath + '/',
+      stripPrefix: path.dirname(assetsPath),
 
       directoryIndex: '/',
       verbose: true,
