From acea881bb012cce0b59f3d5874a630b16d0caaef Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Fri, 7 Apr 2017 23:38:43 -0400 Subject: Initial balsamiq support --- config/webpack.config.js | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index e3bc939d578..42638d47cfa 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -39,6 +39,7 @@ var config = { notebook_viewer: './blob/notebook_viewer.js', sketch_viewer: './blob/sketch_viewer.js', pdf_viewer: './blob/pdf_viewer.js', + balsamiq_viewer: './blob/balsamiq_viewer.js', profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', protected_tags: './protected_tags', -- cgit v1.2.3 From ef07200cd0f059a2e0493779263aa526a2ade2e3 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Sat, 8 Apr 2017 00:18:37 -0400 Subject: Get initial sql values back from file which is database --- config/webpack.config.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index 42638d47cfa..bc4126bce02 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -15,6 +15,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: { common: './commons/index.js', @@ -118,6 +122,7 @@ var config = { 'merge_conflicts', 'notebook_viewer', 'pdf_viewer', + 'balsamiq_viewer', 'vue_pipelines', ], minChunks: function(module, count) { -- cgit v1.2.3 From f74d0ba195079260d3b3217cd72b2fd9b0483c00 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 27 Apr 2017 17:58:51 +0100 Subject: Fix webpack config conflicts bad resolution --- config/webpack.config.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index f61e65c0e5b..8b5354809e7 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -46,6 +46,7 @@ var config = { network: './network/network_bundle.js', 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', @@ -129,6 +130,7 @@ var config = { 'merge_conflicts', 'notebook_viewer', 'pdf_viewer', + 'pipelines', 'balsamiq_viewer', ], minChunks: function(module, count) { -- cgit v1.2.3