summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-05 18:43:13 +0000
committerPhil Hughes <me@iamphill.com>2017-05-05 18:43:13 +0000
commitecaa68a7095750ef7575fdefdb200ef01ef88748 (patch)
tree8728d073f15d64f8b5254ab8126804f6855aa4e4 /config
parent1bf9f012ccd744f415ffcb32c6af36dc04d7e07a (diff)
parent165bcec30506380efa912b3dba25815aeea9c92f (diff)
downloadgitlab-ce-ecaa68a7095750ef7575fdefdb200ef01ef88748.tar.gz
Merge branch 'balsalmiq-support' into 'master'
Initial balsamiq support See merge request !10564
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index a8ea57896c2..160dc9057f2 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -17,6 +17,10 @@ var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false';
var WEBPACK_REPORT = process.env.WEBPACK_REPORT;
var config = {
+ // because sqljs requires fs.
+ node: {
+ fs: "empty"
+ },
context: path.join(ROOT_PATH, 'app/assets/javascripts'),
entry: {
blob: './blob_edit/blob_bundle.js',
@@ -46,6 +50,7 @@ var config = {
notebook_viewer: './blob/notebook_viewer.js',
pdf_viewer: './blob/pdf_viewer.js',
pipelines: './pipelines/index.js',
+ balsamiq_viewer: './blob/balsamiq_viewer.js',
profile: './profile/profile_bundle.js',
protected_branches: './protected_branches/protected_branches_bundle.js',
protected_tags: './protected_tags',
@@ -140,6 +145,7 @@ var config = {
'notebook_viewer',
'pdf_viewer',
'pipelines',
+ 'balsamiq_viewer',
],
minChunks: function(module, count) {
return module.resource && (/vue_shared/).test(module.resource);