Merge branch 'update_react' into 'master'

Update js dependencies

See merge request !90

package.json

@@ -5,51 +5,50 @@
         "build": "NODE_ENV=production ./node_modules/webpack/bin/webpack.js -p --progress --colors"
     },
     "dependencies": {
-        "babel-polyfill": "^6.16.0",
+        "babel-cli": "^6.26.0",
+        "babel-polyfill": "^6.26.0",
+        "babel-preset-env": "^1.6.1",
+        "babel-preset-stage-2": "^6.24.1",
         "bootstrap": "^3.3.6",
         "bootswatch": "^3.3.7",
         "font-awesome": "^4.7.0",
         "fuzzy": "^0.1.3",
-        "history": "^4.4.0",
+        "history": "^4.7.2",
         "immutable": "^3.8.1",
         "jquery": "^2.2.4",
         "jwt-decode": "^2.1.0",
-        "react": "^15.3.2",
+        "react": "^16.2.0",
-        "react-bootstrap": "^0.30.6",
+        "react-bootstrap": "^0.32.1",
-        "react-bootstrap-sweetalert": "^3.0.0",
+        "react-bootstrap-sweetalert": "^4.2.3",
-        "react-bootstrap-toggle": "^2.0.8",
+        "react-bootstrap-toggle": "^2.2.6",
-        "react-dom": "^15.3.2",
+        "react-dom": "^16.2.0",
         "react-infinite-scroller": "^1.0.4",
-        "react-loading": "^0.0.9",
+        "react-loading": "^1.0.3",
-        "react-redux": "^4.4.6",
+        "react-redux": "^5.0.6",
-        "react-router": "^3.0.0",
+        "react-router": "^3.2.0",
         "react-router-bootstrap": "^0.23.1",
-        "react-router-redux": "^4.0.7",
+        "react-router-redux": "^4.0.8",
-        "redux": "^3.6.0",
+        "redux": "^3.7.2",
-        "redux-logger": "^2.7.4",
+        "redux-logger": "^3.0.6",
-        "redux-thunk": "^2.1.0",
+        "redux-thunk": "^2.2.0",
-        "universal-cookie": "^2.0.7"
+        "universal-cookie": "^2.1.2",
+        "webpack": "^3.11.0"
     },
     "devDependencies": {
-        "axios": "^0.15.2",
+        "axios": "^0.17.1",
-        "babel": "^6.5.2",
+        "babel-core": "^6.26.0",
-        "babel-core": "^6.18.2",
+        "babel-eslint": "^8.2.1",
-        "babel-eslint": "^7.2.3",
+        "babel-loader": "^7.1.2",
-        "babel-loader": "^6.2.7",
+        "babel-preset-react": "^6.24.1",
-        "babel-preset-es2015": "^6.18.0",
-        "babel-preset-latest": "^6.16.0",
-        "babel-preset-react": "^6.16.0",
         "css-loader": "^0.26.0",
-        "del": "^2.2.2",
+        "del": "^3.0.0",
-        "eslint": "^3.19.0",
+        "eslint": "^4.17.0",
-        "eslint-plugin-react": "^7.0.1",
+        "eslint-plugin-react": "^7.6.1",
         "file-loader": "^0.9.0",
-        "gulp": "^3.9.1",
+        "less": "^2.3.1",
-        "gulp-babel": "^6.1.2",
+        "less-loader": "^4.0.5",
-        "less": "^2.7.1",
+        "style-loader": "^0.20.1",
-        "less-loader": "^2.2.3",
+        "url-loader": "^0.6.2",
-        "style-loader": "^0.13.1",
+        "webpack-stream": "^4.0.1"
-        "url-loader": "^0.5.7",
-        "webpack-stream": "^3.2.0"
     }
 }

src/public/js/store.js

@@ -13,8 +13,7 @@ const middlewares = [thunk, routingMiddleware];
 
 // Only use in development mode (set in webpack)
 if (process.env.NODE_ENV === "development") {
-  const createLogger = require("redux-logger");
+  const { logger } = require("redux-logger");
-  const logger = createLogger();
   middlewares.push(logger);
 }
 

src/public/less/app.less

@@ -2,7 +2,7 @@
 @import "~bootswatch/superhero/variables.less";
 @import "~bootswatch/superhero/bootswatch.less";
 @import "~font-awesome/less/font-awesome.less";
-@import "~react-bootstrap-toggle/src/bootstrap2-toggle.css";
+@import "~react-bootstrap-toggle/dist/bootstrap2-toggle.css";
 
 body {
   padding-top: @navbar-height + 10px;

webpack.config.js

@@ -1,56 +1,66 @@
 var webpack = require("webpack");
 var path = require("path");
 
-var BUILD_DIR = path.resolve(__dirname, 'build/public/');
+var BUILD_DIR = path.resolve(__dirname, "build/public/");
-if (process.env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === "production") {
-  BUILD_DIR = path.resolve(__dirname, 'canapeapp/public/');
+  BUILD_DIR = path.resolve(__dirname, "canapeapp/public/");
 }
 
-var SRC_DIR = path.resolve(__dirname, 'src/public/js');
+var SRC_DIR = path.resolve(__dirname, "src/public/js");
 
 const config = {
-  entry: path.join(SRC_DIR, 'app.js'),
+  entry: path.join(SRC_DIR, "app.js"),
   output: {
     path: BUILD_DIR,
-    filename: 'js/app.js',
+    filename: "js/app.js",
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.jsx?$/,
-        loader: 'babel-loader',
         exclude: /node_modules/,
-        query: {
+        use: {
-          compact: false,
+          loader: "babel-loader",
-          presets: ["es2015", "react" ]
+          options: {
+            presets: ["env", "react", "stage-2"]
+          }
         }
       },
       {
         test: /\.less$/,
-        loader: 'style-loader!css-loader!less-loader',
+        use: [{
+          loader: "style-loader" // creates style nodes from JS strings
+        }, {
+          loader: "css-loader" // translates CSS into CommonJS
+        }, {
+          loader: "less-loader" // compiles Less to CSS
+        }]
       },
       {
         test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: "url-loader?limit=10000&mimetype=application/font-woff"
+        use: [{
-
+          loader: "url-loader?limit=10000&mimetype=application/font-woff"
+        }]
       },
       {
         test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: "file-loader"
+        use: [{
+          loader: "file-loader"
+        }]
       }
     ]
   },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+      "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
     })
   ],
   resolve: {
-    extensions: ['', '.js', '.jsx']
+    extensions: [".js", ".jsx"]
   },
 };
 
-if (process.env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === "production") {
   config.plugins.push(
     new webpack.optimize.UglifyJsPlugin()
   )