From cfd3d0fd377c3438c6ce8bc2f20b11f86b43a785 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 4 Apr 2017 14:58:45 +0100 Subject: [ci skip] Remove loadscript class in favour of backend conditional --- config/webpack.config.js | 1 + 1 file changed, 1 insertion(+) (limited to 'config/webpack.config.js') diff --git a/config/webpack.config.js b/config/webpack.config.js index 70d98b022c1..62118522606 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -45,6 +45,7 @@ var config = { u2f: ['vendor/u2f'], users: './users/users_bundle.js', vue_pipelines: './vue_pipelines_index/index.js', + raven: './raven/index.js', }, output: { -- cgit v1.2.3 From e22bd9650d7bebfea0909fdaf5be7dcf746b53f7 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 15 Apr 2017 03:38:59 +0100 Subject: Updated specs, added rewire, updated layouts to move conditional raven and gon to head --- config/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/webpack.config.js') diff --git a/config/webpack.config.js b/config/webpack.config.js index 62118522606..77d703e008a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -61,7 +61,7 @@ var config = { { test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, - loader: 'babel-loader' + loader: 'babel-loader?plugins=rewire' }, { test: /\.svg$/, -- cgit v1.2.3 From 69e49a095ded719ccfb1287b6100646663de3f03 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 15 Apr 2017 11:52:37 +0100 Subject: Only rewire in dev --- config/webpack.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config/webpack.config.js') diff --git a/config/webpack.config.js b/config/webpack.config.js index f034a8ae27d..79c1d66a242 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -15,6 +15,7 @@ var DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost'; var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808; var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false'; var WEBPACK_REPORT = process.env.WEBPACK_REPORT; +var rewirePlugin = IS_PRODUCTION ? '?plugins=rewire' : ''; var config = { context: path.join(ROOT_PATH, 'app/assets/javascripts'), @@ -52,7 +53,7 @@ var config = { vue_pipelines: './vue_pipelines_index/index.js', raven: './raven/index.js', issue_show: './issue_show/index.js', - group: './group.js' + group: './group.js', }, output: { @@ -68,7 +69,7 @@ var config = { { test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, - loader: 'babel-loader?plugins=rewire', + loader: `babel-loader${rewirePlugin}`, }, { test: /\.vue$/, -- cgit v1.2.3 From 86b4f49c8c76a322d2f12f61e5a2d27d3c5c4671 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 15 Apr 2017 12:29:46 +0100 Subject: Removed rewire and fixed tests --- config/webpack.config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config/webpack.config.js') diff --git a/config/webpack.config.js b/config/webpack.config.js index 79c1d66a242..2153c8bbaf2 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -15,7 +15,6 @@ var DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost'; var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808; var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false'; var WEBPACK_REPORT = process.env.WEBPACK_REPORT; -var rewirePlugin = IS_PRODUCTION ? '?plugins=rewire' : ''; var config = { context: path.join(ROOT_PATH, 'app/assets/javascripts'), @@ -69,7 +68,7 @@ var config = { { test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, - loader: `babel-loader${rewirePlugin}`, + loader: 'babel-loader', }, { test: /\.vue$/, -- cgit v1.2.3