diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-09-23 10:22:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-23 10:22:35 -0400 |
commit | 214f9c13a261064733c23d762fa521444fbd7a9c (patch) | |
tree | e02c19d673d05b7de6d2e2e36698f61fabee836e /webapp | |
parent | 90f113dcda43a6455e431029a87e35ab8c537a73 (diff) | |
download | chat-214f9c13a261064733c23d762fa521444fbd7a9c.tar.gz chat-214f9c13a261064733c23d762fa521444fbd7a9c.tar.bz2 chat-214f9c13a261064733c23d762fa521444fbd7a9c.zip |
Updating client dependancies (#4083)
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/package.json | 68 | ||||
-rw-r--r-- | webapp/utils/text_formatting.jsx | 4 | ||||
-rw-r--r-- | webapp/webpack.config.js | 10 |
3 files changed, 43 insertions, 39 deletions
diff --git a/webapp/package.json b/webapp/package.json index f1d07a475..b2012b433 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -3,74 +3,74 @@ "version": "0.0.1", "private": true, "dependencies": { - "autolinker": "0.27.0", - "bootstrap": "3.3.6", - "bootstrap-colorpicker": "2.3.3", - "chart.js": "2.1.6", + "autolinker": "1.1.0", + "bootstrap": "3.3.7", + "bootstrap-colorpicker": "2.3.5", + "chart.js": "2.3.0", "compass-mixins": "0.12.10", "fastclick": "1.0.6", "flux": "2.1.1", "font-awesome": "4.6.3", - "highlight.js": "9.5.0", - "intl": "1.2.4", + "highlight.js": "9.7.0", + "intl": "1.2.5", "jasny-bootstrap": "3.1.3", - "jquery": "3.1.0", + "jquery": "3.1.1", "keymirror": "0.1.1", "marked": "mattermost/marked#69736482dbad685c398a5eec33a59b5ab06057ac", "match-at": "0.1.0", "object-assign": "4.1.0", - "pdfjs-dist": "1.5.374", + "pdfjs-dist": "1.5.488", "perfect-scrollbar": "0.6.12", - "react": "15.2.1", - "react-addons-pure-render-mixin": "15.2.1", - "react-bootstrap": "0.29.5", + "react": "15.3.2", + "react-addons-pure-render-mixin": "15.3.2", + "react-bootstrap": "0.30.3", "react-custom-scrollbars": "4.0.0", - "react-dom": "15.2.1", - "react-intl": "2.1.3", - "react-router": "2.5.2", - "react-select": "1.0.0-beta13", - "react-textarea-autosize": "4.0.3", - "superagent": "2.1.0", - "twemoji": "2.0.5", + "react-dom": "15.3.2", + "react-intl": "2.1.5", + "react-router": "2.8.1", + "react-select": "1.0.0-rc.2", + "react-textarea-autosize": "4.0.5", + "superagent": "2.3.0", + "twemoji": "2.2.0", "velocity-animate": "1.2.3", "webrtc-adapter": "2.0.3", "xregexp": "3.1.1" }, "devDependencies": { - "babel-core": "6.13.2", + "babel-core": "6.14.0", "babel-eslint": "6.1.2", - "babel-loader": "6.2.4", - "babel-plugin-transform-runtime": "6.9.0", - "babel-polyfill": "6.9.1", - "babel-preset-es2015": "6.13.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", - "css-loader": "0.23.1", + "css-loader": "0.25.0", "eslint": "3.0.1", "eslint-plugin-react": "5.2.2", "exports-loader": "0.6.3", "extract-text-webpack-plugin": "1.0.1", "file-loader": "0.9.0", - "html-loader": "0.4.3", + "html-loader": "0.4.4", "html-webpack-plugin": "2.22.0", "imports-loader": "0.6.5", "image-webpack-loader": "2.0.0", - "jquery-deferred": "0.3.0", - "jsdom": "9.4.1", - "jsdom-global": "2.0.0", + "jquery-deferred": "0.3.1", + "jsdom": "9.5.0", + "jsdom-global": "2.1.0", "json-loader": "0.5.4", - "mocha": "2.5.3", + "mocha": "3.0.2", "mocha-jsdom": "1.1.0", - "mocha-webpack": "0.4.0", + "mocha-webpack": "0.6.0", "node-sass": "3.8.0", "raw-loader": "0.5.1", - "react-addons-test-utils": "15.2.1", - "sass-loader": "4.0.0", + "react-addons-test-utils": "15.3.2", + "sass-loader": "4.0.2", "style-loader": "0.13.1", "url-loader": "0.5.7", - "webpack": "2.1.0-beta.13", - "webpack-node-externals": "1.2.0" + "webpack": "2.1.0-beta.25", + "webpack-node-externals": "1.4.3" }, "scripts": { "check": "eslint --ext \".jsx\" --ignore-pattern node_modules --quiet .", diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx index 23e286b45..3b96a1b42 100644 --- a/webapp/utils/text_formatting.jsx +++ b/webapp/utils/text_formatting.jsx @@ -117,7 +117,7 @@ export function sanitizeHtml(text) { // Convert emails into tokens function autolinkEmails(text, tokens) { - function replaceEmailWithToken(autolinker, match) { + function replaceEmailWithToken(match) { const linkText = match.getMatchedText(); let url = linkText; @@ -141,7 +141,7 @@ function autolinkEmails(text, tokens) { urls: false, email: true, phone: false, - twitter: false, + mention: false, hashtag: false, replaceFn: replaceEmailWithToken }); diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js index d0947f1a3..153b07339 100644 --- a/webapp/webpack.config.js +++ b/webapp/webpack.config.js @@ -84,9 +84,6 @@ var config = { } ] }, - sassLoader: { - includePaths: ['node_modules/compass-mixins/lib'] - }, plugins: [ new webpack.ProvidePlugin({ 'window.jQuery': 'jquery' @@ -102,6 +99,13 @@ var config = { minimize: !DEV, debug: false }), + new webpack.LoaderOptionsPlugin({ + options: { + sassLoader: { + includePaths: ['node_modules/compass-mixins/lib'] + } + } + }), new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('production') |