Merge branch 'master' into 'dispatcher-cleanup'

# Conflicts:
#   config/webpack.config.js

1 files changed, 27 insertions, 2 deletions

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 65785385554..d8ba3c06d3a 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -44,7 +44,6 @@ function generateEntries() {
 
   const manualEntries = {
     balsamiq_viewer:      './blob/balsamiq_viewer.js',
-    cycle_analytics:      './cycle_analytics/cycle_analytics_bundle.js',
     environments:         './environments/environments_bundle.js',
     monitoring:           './monitoring/monitoring_bundle.js',
     mr_notes:             './mr_notes/index.js',
@@ -59,7 +58,6 @@ function generateEntries() {
     terminal:             './terminal/terminal_bundle.js',
     two_factor_auth:      './two_factor_auth.js',
 
-
     common:               './commons/index.js',
     common_vue:           './vue_shared/vue_resource_interceptor.js',
     locale:               './locale/index.js',
@@ -225,6 +223,33 @@ const config = {
       return `${moduleNames[0]}-${hash.substr(0, 6)}`;
     }),
 
+    // create cacheable common library bundle for all vue chunks
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'common_vue',
+      chunks: [
+        'boards',
+        'deploy_keys',
+        'environments',
+        'filtered_search',
+        'groups',
+        'monitoring',
+        'mr_notes',
+        'notebook_viewer',
+        'pdf_viewer',
+        'pipelines',
+        'pipelines_details',
+        'registry_list',
+        'ide',
+        'schedule_form',
+        'schedules_index',
+        'sidebar',
+        'vue_merge_request_widget',
+      ],
+      minChunks: function(module, count) {
+        return module.resource && (/vue_shared/).test(module.resource);
+      },
+    }),
+
     // create cacheable common library bundles
     new webpack.optimize.CommonsChunkPlugin({
       names: ['main', 'common', 'webpack_runtime'],