From 6dde2d268a9c3224af481e84b7f440a4dfa92bfb Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 17 Nov 2016 09:02:33 -0500 Subject: Updating client dependancies (excpet eslint) (#4567) --- webapp/i18n/i18n.jsx | 20 +++++++-------- webapp/package.json | 64 +++++++++++++++++++++++----------------------- webapp/utils/constants.jsx | 8 +++--- webapp/webpack.config.js | 39 ++++++++++++++-------------- 4 files changed, 65 insertions(+), 66 deletions(-) (limited to 'webapp') diff --git a/webapp/i18n/i18n.jsx b/webapp/i18n/i18n.jsx index 0513f1154..7b630c6f4 100644 --- a/webapp/i18n/i18n.jsx +++ b/webapp/i18n/i18n.jsx @@ -1,16 +1,16 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const de = require('!!file?name=i18n/[name].[hash].[ext]!./de.json'); -const es = require('!!file?name=i18n/[name].[hash].[ext]!./es.json'); -const fr = require('!!file?name=i18n/[name].[hash].[ext]!./fr.json'); -const ja = require('!!file?name=i18n/[name].[hash].[ext]!./ja.json'); -const ko = require('!!file?name=i18n/[name].[hash].[ext]!./ko.json'); -const nl = require('!!file?name=i18n/[name].[hash].[ext]!./nl.json'); -const pt_BR = require('!!file?name=i18n/[name].[hash].[ext]!./pt-BR.json'); //eslint-disable-line camelcase -const ru = require('!!file?name=i18n/[name].[hash].[ext]!./ru.json'); -const zh_TW = require('!!file?name=i18n/[name].[hash].[ext]!./zh_TW.json'); //eslint-disable-line camelcase -const zh_CN = require('!!file?name=i18n/[name].[hash].[ext]!./zh_CN.json'); //eslint-disable-line camelcase +const de = require('!!file-loader?name=i18n/[name].[hash].[ext]!./de.json'); +const es = require('!!file-loader?name=i18n/[name].[hash].[ext]!./es.json'); +const fr = require('!!file-loader?name=i18n/[name].[hash].[ext]!./fr.json'); +const ja = require('!!file-loader?name=i18n/[name].[hash].[ext]!./ja.json'); +const ko = require('!!file-loader?name=i18n/[name].[hash].[ext]!./ko.json'); +const nl = require('!!file-loader?name=i18n/[name].[hash].[ext]!./nl.json'); +const pt_BR = require('!!file-loader?name=i18n/[name].[hash].[ext]!./pt-BR.json'); //eslint-disable-line camelcase +const ru = require('!!file-loader?name=i18n/[name].[hash].[ext]!./ru.json'); +const zh_TW = require('!!file-loader?name=i18n/[name].[hash].[ext]!./zh_TW.json'); //eslint-disable-line camelcase +const zh_CN = require('!!file-loader?name=i18n/[name].[hash].[ext]!./zh_CN.json'); //eslint-disable-line camelcase import {addLocaleData} from 'react-intl'; import deLocaleData from 'react-intl/locale-data/de'; diff --git a/webapp/package.json b/webapp/package.json index 338829559..818050cc2 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -3,16 +3,16 @@ "version": "0.0.1", "private": true, "dependencies": { - "autolinker": "1.1.0", + "autolinker": "1.2.1", "bootstrap": "3.3.7", - "bootstrap-colorpicker": "2.3.5", - "chart.js": "2.3.0", + "bootstrap-colorpicker": "2.3.6", + "chart.js": "2.4.0", "compass-mixins": "0.12.10", "fastclick": "1.0.6", - "flux": "2.1.1", - "font-awesome": "4.6.3", - "highlight.js": "9.7.0", - "inobounce": "0.1.3", + "flux": "3.1.0", + "font-awesome": "4.7.0", + "highlight.js": "9.8.0", + "inobounce": "0.1.4", "intl": "1.2.5", "jasny-bootstrap": "3.1.3", "jquery": "3.1.1", @@ -20,33 +20,33 @@ "marked": "mattermost/marked#69736482dbad685c398a5eec33a59b5ab06057ac", "match-at": "0.1.0", "object-assign": "4.1.0", - "pdfjs-dist": "1.5.488", - "perfect-scrollbar": "0.6.12", - "react": "15.3.2", - "react-addons-pure-render-mixin": "15.3.2", - "react-bootstrap": "0.30.3", + "pdfjs-dist": "1.6.319", + "perfect-scrollbar": "0.6.14", + "react": "15.4.0", + "react-addons-pure-render-mixin": "15.4.0", + "react-bootstrap": "0.30.6", "react-custom-scrollbars": "4.0.0", - "react-dom": "15.3.2", + "react-dom": "15.4.0", "react-intl": "2.1.5", "react-router": "2.8.1", "react-select": "1.0.0-rc.2", "superagent": "2.3.0", "twemoji": "2.2.0", - "velocity-animate": "1.2.3", - "webrtc-adapter": "2.0.3", + "velocity-animate": "1.3.1", + "webrtc-adapter": "2.0.8", "xregexp": "3.1.1" }, "devDependencies": { - "babel-core": "6.14.0", + "babel-core": "6.18.2", "babel-eslint": "6.1.2", - "babel-loader": "6.2.5", - "babel-plugin-transform-runtime": "6.12.0", - "babel-polyfill": "6.13.0", - "babel-preset-es2015": "6.14.0", - "babel-preset-react": "6.11.1", - "babel-preset-stage-0": "6.5.0", - "copy-webpack-plugin": "3.0.1", - "cross-env": "3.0.0", + "babel-loader": "6.2.7", + "babel-plugin-transform-runtime": "6.15.0", + "babel-polyfill": "6.16.0", + "babel-preset-es2015": "6.18.0", + "babel-preset-react": "6.16.0", + "babel-preset-stage-0": "6.16.0", + "copy-webpack-plugin": "4.0.1", + "cross-env": "3.1.3", "css-loader": "0.25.0", "eslint": "3.5.0", "eslint-plugin-react": "6.3.0", @@ -54,24 +54,24 @@ "extract-text-webpack-plugin": "1.0.1", "file-loader": "0.9.0", "html-loader": "0.4.4", - "html-webpack-plugin": "2.22.0", + "html-webpack-plugin": "2.24.1", "image-webpack-loader": "2.0.0", "imports-loader": "0.6.5", "jquery-deferred": "0.3.1", - "jsdom": "9.5.0", + "jsdom": "9.8.3", "jsdom-global": "2.1.0", "json-loader": "0.5.4", - "mocha": "3.0.2", + "mocha": "3.1.2", "mocha-jsdom": "1.1.0", - "mocha-webpack": "0.6.0", - "node-sass": "3.8.0", + "mocha-webpack": "0.7.0", + "node-sass": "3.13.0", "raw-loader": "0.5.1", - "react-addons-test-utils": "15.3.2", + "react-addons-test-utils": "15.4.0", "sass-loader": "4.0.2", "style-loader": "0.13.1", "url-loader": "0.5.7", - "webpack": "2.1.0-beta.25", - "webpack-node-externals": "1.4.3" + "webpack": "2.1.0-beta.27", + "webpack-node-externals": "1.5.4" }, "scripts": { "check": "eslint --ext \".jsx\" --ignore-pattern node_modules --quiet .", diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index d8965516e..611f8ccd0 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -16,16 +16,16 @@ import genericIcon from 'images/icons/generic.png'; import logoImage from 'images/logo_compact.png'; import logoWebhook from 'images/webhook_icon.jpg'; -import solarizedDarkCSS from '!!file?name=files/code_themes/[hash].[ext]!highlight.js/styles/solarized-dark.css'; +import solarizedDarkCSS from '!!file-loader?name=files/code_themes/[hash].[ext]!highlight.js/styles/solarized-dark.css'; import solarizedDarkIcon from 'images/themes/code_themes/solarized-dark.png'; -import solarizedLightCSS from '!!file?name=files/code_themes/[hash].[ext]!highlight.js/styles/solarized-light.css'; +import solarizedLightCSS from '!!file-loader?name=files/code_themes/[hash].[ext]!highlight.js/styles/solarized-light.css'; import solarizedLightIcon from 'images/themes/code_themes/solarized-light.png'; -import githubCSS from '!!file?name=files/code_themes/[hash].[ext]!highlight.js/styles/github.css'; +import githubCSS from '!!file-loader?name=files/code_themes/[hash].[ext]!highlight.js/styles/github.css'; import githubIcon from 'images/themes/code_themes/github.png'; -import monokaiCSS from '!!file?name=files/code_themes/[hash].[ext]!highlight.js/styles/monokai.css'; +import monokaiCSS from '!!file-loader?name=files/code_themes/[hash].[ext]!highlight.js/styles/monokai.css'; import monokaiIcon from 'images/themes/code_themes/monokai.png'; import defaultThemeImage from 'images/themes/organization.png'; diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js index 4058abbd2..71e35a6d8 100644 --- a/webapp/webpack.config.js +++ b/webapp/webpack.config.js @@ -34,7 +34,7 @@ var config = { loaders: [ { test: /\.jsx?$/, - loader: 'babel', + loader: 'babel-loader', exclude: /(node_modules|non_npm_dependencies)/, query: { presets: [ @@ -49,15 +49,15 @@ var config = { { test: /\.json$/, exclude: /manifest\.json$/, - loader: 'json' + loader: 'json-loader' }, { test: /manifest\.json$/, - loader: 'file?name=files/[hash].[ext]' + loader: 'file-loader?name=files/[hash].[ext]' }, { test: /(node_modules|non_npm_dependencies)(\\|\/).+\.(js|jsx)$/, - loader: 'imports', + loader: 'imports-loader', query: { $: 'jquery', jQuery: 'jquery' @@ -65,22 +65,22 @@ var config = { }, { test: /\.scss$/, - loaders: ['style', 'css', 'sass'] + loaders: ['style-loader', 'css-loader', 'sass-loader'] }, { test: /\.css$/, - loaders: ['style', 'css'] + loaders: ['style-loader', 'css-loader'] }, { test: /\.(png|eot|tiff|svg|woff2|woff|ttf|gif|mp3|jpg)$/, loaders: [ - 'file?name=files/[hash].[ext]', - 'image-webpack' + 'file-loader?name=files/[hash].[ext]', + 'image-webpack-loader' ] }, { test: /\.html$/, - loader: 'html?attrs=link:href' + loader: 'html-loader?attrs=link:href' } ] }, @@ -88,13 +88,6 @@ var config = { new webpack.ProvidePlugin({ 'window.jQuery': 'jquery' }), - new CopyWebpackPlugin([ - {from: 'images/emoji', to: 'emoji'}, - {from: 'images/logo-email.png', to: 'images'}, - {from: 'images/circles.png', to: 'images'}, - {from: 'images/favicon', to: 'images/favicon'}, - {from: 'images/appIcons.png', to: 'images'} - ]), new webpack.LoaderOptionsPlugin({ minimize: !DEV, debug: false @@ -156,9 +149,6 @@ if (!DEV) { config.plugins.push( new webpack.optimize.OccurrenceOrderPlugin(true) ); - config.plugins.push( - new webpack.optimize.DedupePlugin() - ); } // Test mode configuration @@ -167,7 +157,7 @@ if (TEST) { config.target = 'node'; config.externals = [nodeExternals()]; } else { - // For some reason this breaks mocha. So it goes here. + // For some reason these break mocha. So they go here. config.plugins.push( new HtmlWebpackPlugin({ filename: 'root.html', @@ -175,6 +165,15 @@ if (TEST) { template: 'root.html' }) ); + config.plugins.push( + new CopyWebpackPlugin([ + {from: 'images/emoji', to: 'emoji'}, + {from: 'images/logo-email.png', to: 'images'}, + {from: 'images/circles.png', to: 'images'}, + {from: 'images/favicon', to: 'images/favicon'}, + {from: 'images/appIcons.png', to: 'images'} + ]) + ); } module.exports = config; -- cgit v1.2.3-1-g7c22