summaryrefslogtreecommitdiffstats
path: root/webapp/webpack.config.js
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-06-20 15:22:46 -0400
committerGitHub <noreply@github.com>2017-06-20 15:22:46 -0400
commit68ea0abfa665144164041c9421899bfc21412f8a (patch)
tree5d2f2aa5665a084bd1e544d8342e229a8fafc064 /webapp/webpack.config.js
parent270fc41c0ffe52266f821748db9fd8b4e9d10b36 (diff)
downloadchat-68ea0abfa665144164041c9421899bfc21412f8a.tar.gz
chat-68ea0abfa665144164041c9421899bfc21412f8a.tar.bz2
chat-68ea0abfa665144164041c9421899bfc21412f8a.zip
PLT-4457 Added AtMention component to better render at mentions (#6563)
* Moved Utils.searchForTerm into an action * Added easier importing of index.jsx files * PLT-4457 Added AtMention component to better render at mentions * Fixed client unit tests * Fixed merge conflict * Fixed merge conflicts
Diffstat (limited to 'webapp/webpack.config.js')
-rw-r--r--webapp/webpack.config.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js
index 6bc2834e0..16540d22d 100644
--- a/webapp/webpack.config.js
+++ b/webapp/webpack.config.js
@@ -241,7 +241,8 @@ var config = {
alias: {
jquery: 'jquery/dist/jquery',
superagent: 'node_modules/superagent/lib/client'
- }
+ },
+ extensions: ['.js', '.jsx']
},
performance: {
hints: 'warning'