summaryrefslogtreecommitdiff
path: root/config/webpack.config.js
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-03-02 22:05:45 +0000
committerFatih Acet <acetfatih@gmail.com>2017-03-02 22:05:45 +0000
commit1ca2f3798a6bd8c64fe4ee0bbcb6bb5e7b3419e8 (patch)
tree160f97638885d0f9a76e89bb647e9dc3154ef12a /config/webpack.config.js
parent6178c500a220909f67ad14f98e8b642773548891 (diff)
parent52e104b2a41d4bbc55853bc62045232fc29e5e57 (diff)
downloadgitlab-ce-1ca2f3798a6bd8c64fe4ee0bbcb6bb5e7b3419e8.tar.gz
Merge branch 'add-svg-loader' into 'master'
Fixes Tech debt: No need to pass svgs as props into Vue with Webpack Closes #27692 and #27840 See merge request !9522
Diffstat (limited to 'config/webpack.config.js')
-rw-r--r--config/webpack.config.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index e91794208e6..13273902b0e 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -64,6 +64,10 @@ var config = {
'stage-2'
]
}
+ },
+ {
+ test: /\.svg$/,
+ use: 'raw-loader'
}
]
},
@@ -87,6 +91,7 @@ var config = {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
'bootstrap/js': 'bootstrap-sass/assets/javascripts/bootstrap',
'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'),
+ 'icons': path.join(ROOT_PATH, 'app/views/shared/icons'),
'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'),
'vue$': 'vue/dist/vue.common.js',
}