summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-11-07 17:26:48 -0500
committerJacob Schatz <jschatz1@gmail.com>2017-11-07 17:26:48 -0500
commitc2555e7298cb1549214afc319e8eda6e7248215d (patch)
tree04fccfa714a0f338c8f39340f541df17b8328957 /config
parentd9313795e744c83d1b2c7235b34438a87554562d (diff)
downloadgitlab-ce-c2555e7298cb1549214afc319e8eda6e7248215d.tar.gz
Adds typescript support in webpack. With Mike G.
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index f7a7182a627..67d7cae3ccf 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -108,6 +108,10 @@ var config = {
loader: 'vue-loader',
},
{
+ test: /\.ts$/,
+ loader: 'ts-loader',
+ },
+ {
test: /\.svg$/,
loader: 'raw-loader',
},
@@ -252,7 +256,7 @@ var config = {
],
resolve: {
- extensions: ['.js'],
+ extensions: ['.js', '.ts'],
alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
'emojis': path.join(ROOT_PATH, 'fixtures/emojis'),