summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-06-30 20:55:09 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-06-30 20:55:09 +0000
commite48f54b5b23b4b865a4462151d576d2ff09d543e (patch)
treeff73231294c1ac2c6793fc9a46f3e93c88cd9734 /config
parent30c7fef03955bb4d2627b1de419be672c97a6df6 (diff)
parent598baa554c29c7f69191b4ea46a049c558c3dbe5 (diff)
downloadgitlab-ce-e48f54b5b23b4b865a4462151d576d2ff09d543e.tar.gz
Merge branch 'enable-webpack-code-splitting' into 'master'
Enable webpack code splitting Closes #32989 See merge request !12032
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 90ef6a5448b..cbb0a899638 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -71,6 +71,7 @@ var config = {
vue_merge_request_widget: './vue_merge_request_widget/index.js',
test: './test.js',
peek: './peek.js',
+ webpack_runtime: './webpack.js',
},
output: {
@@ -190,7 +191,7 @@ var config = {
// create cacheable common library bundles
new webpack.optimize.CommonsChunkPlugin({
- names: ['main', 'locale', 'common', 'runtime'],
+ names: ['main', 'locale', 'common', 'webpack_runtime'],
}),
],
@@ -245,7 +246,6 @@ if (IS_DEV_SERVER) {
hot: DEV_SERVER_LIVERELOAD,
inline: DEV_SERVER_LIVERELOAD
};
- config.output.publicPath = '//' + DEV_SERVER_HOST + ':' + DEV_SERVER_PORT + config.output.publicPath;
config.plugins.push(
// watch node_modules for changes if we encounter a missing module compile error
new WatchMissingNodeModulesPlugin(path.join(ROOT_PATH, 'node_modules'))