Updating client dependancies except ESLint and react-router (mattermo…

…st#5750)

package.json

@@ -4,61 +4,61 @@
  "version": "0.0.1",
  "private": true,
  "dependencies": {
- "autolinker": "1.4.0",
+ "autolinker": "1.4.2",
  "bootstrap": "3.3.7",
- "bootstrap-colorpicker": "2.3.6",
- "chart.js": "2.4.0",
+ "bootstrap-colorpicker": "2.5.1",
+ "chart.js": "2.5.0",
  "compass-mixins": "0.12.10",
  "fastclick": "1.0.6",
  "flux": "3.1.2",
  "font-awesome": "4.7.0",
- "highlight.js": "9.9.0",
+ "highlight.js": "9.10.0",
  "inobounce": "0.1.4",
  "intl": "1.2.5",
  "jasny-bootstrap": "3.1.3",
  "jquery": "3.1.1",
  "marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317",
  "match-at": "0.1.0",
  "object-assign": "4.1.1",
- "pdfjs-dist": "1.7.235",
+ "pdfjs-dist": "1.7.363",
  "perfect-scrollbar": "0.6.16",
  "react": "15.4.2",
  "react-addons-pure-render-mixin": "15.4.2",
- "react-bootstrap": "0.30.7",
- "react-custom-scrollbars": "4.0.1",
+ "react-bootstrap": "0.30.8",
+ "react-custom-scrollbars": "4.0.2",
  "react-dom": "15.4.2",
  "react-intl": "2.2.3",
  "react-router": "2.8.1",
- "react-select": "1.0.0-rc.2",
- "superagent": "3.4.1",
- "twemoji": "2.2.3",
- "velocity-animate": "1.4.2",
- "webrtc-adapter": "3.1.0",
+ "react-select": "1.0.0-rc.3",
+ "superagent": "3.5.0",
+ "twemoji": "2.2.5",
+ "velocity-animate": "1.4.3",
+ "webrtc-adapter": "3.2.0",
  "xregexp": "3.1.1"
  },
  "devDependencies": {
- "babel-core": "6.22.1",
- "babel-eslint": "7.1.0",
- "babel-loader": "6.2.10",
- "babel-plugin-transform-runtime": "6.22.0",
- "babel-polyfill": "6.22.0",
- "babel-preset-es2015": "6.22.0",
- "babel-preset-react": "6.22.0",
+ "babel-core": "6.24.0",
+ "babel-eslint": "7.1.1",
+ "babel-loader": "6.4.0",
+ "babel-plugin-transform-runtime": "6.23.0",
+ "babel-polyfill": "6.23.0",
+ "babel-preset-es2015": "6.24.0",
+ "babel-preset-react": "6.23.0",
  "babel-preset-stage-0": "6.22.0",
  "copy-webpack-plugin": "4.0.1",
- "cross-env": "3.1.4",
- "css-loader": "0.26.1",
+ "cross-env": "3.2.3",
+ "css-loader": "0.27.3",
  "eslint": "3.10.2",
  "eslint-plugin-react": "6.7.1",
- "exports-loader": "0.6.3",
- "extract-text-webpack-plugin": "1.0.1",
- "file-loader": "0.10.0",
- "html-loader": "0.4.4",
+ "exports-loader": "0.6.4",
+ "extract-text-webpack-plugin": "2.1.0",
+ "file-loader": "0.10.1",
+ "html-loader": "0.4.5",
  "html-webpack-plugin": "2.28.0",
  "image-webpack-loader": "3.2.0",
- "imports-loader": "0.7.0",
+ "imports-loader": "0.7.1",
  "jquery-deferred": "0.3.1",
- "jsdom": "9.9.1",
+ "jsdom": "9.12.0",
  "jsdom-global": "2.1.1",
  "json-loader": "0.5.4",
  "mocha": "3.2.0",
@@ -67,9 +67,9 @@
  "node-sass": "4.5.0",
  "raw-loader": "0.5.1",
  "react-addons-test-utils": "15.4.2",
- "sass-loader": "4.1.1",
- "style-loader": "0.13.1",
- "url-loader": "0.5.7",
+ "sass-loader": "6.0.3",
+ "style-loader": "0.13.2",
+ "url-loader": "0.5.8",
  "webpack": "2.2.1",
  "webpack-node-externals": "1.5.4"
  },

webpack.config.js

@@ -65,7 +65,16 @@ var config = {
  },
  {
  test: /\.scss$/,
- loaders: ['style-loader', 'css-loader', 'sass-loader']
+ use: [{
+ loader: 'style-loader'
+ }, {
+ loader: 'css-loader'
+ }, {
+ loader: 'sass-loader',
+ options: {
+ includePaths: ['node_modules/compass-mixins/lib']
+ }
+ }]
  },
  {
  test: /\.css$/,
@@ -92,13 +101,6 @@ var config = {
  minimize: !DEV,
  debug: false
  }),
- new webpack.LoaderOptionsPlugin({
- options: {
- sassLoader: {
- includePaths: ['node_modules/compass-mixins/lib']
- }
- }
- }),
  new webpack.optimize.CommonsChunkPlugin({
  minChunks: 2,
  children: true