Merge branch 'master' into 13931-custom-emoji-implementation13931-custom-emoji-implementation

 Conflicts:
	app/assets/javascripts/dispatcher.js
	app/assets/javascripts/pages/projects/shared/project_avatar.js

1 files changed, 31 insertions, 11 deletions

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 5f95255334c..783677b5b8d 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var crypto = require('crypto');
 var fs = require('fs');
 var path = require('path');
 var webpack = require('webpack');
@@ -43,9 +44,6 @@ var config = {
     graphs:               './graphs/graphs_bundle.js',
     graphs_charts:        './graphs/graphs_charts.js',
     graphs_show:          './graphs/graphs_show.js',
-    group:                './group.js',
-    groups:               './groups/index.js',
-    groups_list:          './groups_list.js',
     help:                 './help/help.js',
     how_to_merge:         './how_to_merge.js',
     issue_show:           './issue_show/index.js',
@@ -65,7 +63,6 @@ var config = {
     pipelines_times:      './pipelines/pipelines_times.js',
     profile:              './profile/profile_bundle.js',
     project_import_gl:    './projects/project_import_gitlab_project.js',
-    project_new:          './projects/project_new.js',
     prometheus_metrics:   './prometheus_metrics',
     protected_branches:   './protected_branches',
     protected_tags:       './protected_tags',
@@ -85,7 +82,6 @@ var config = {
     test:                 './test.js',
     two_factor_auth:      './two_factor_auth.js',
     users:                './users/index.js',
-    performance_bar:      './performance_bar.js',
     webpack_runtime:      './webpack.js',
   },
 
@@ -119,7 +115,12 @@ var config = {
       {
         test: /\_worker\.js$/,
         use: [
-          { loader: 'worker-loader' },
+          {
+            loader: 'worker-loader',
+            options: {
+              inline: true
+            }
+          },
           { loader: 'babel-loader' },
         ],
       },
@@ -179,15 +180,34 @@ var config = {
       if (chunk.name) {
         return chunk.name;
       }
-      return chunk.mapModules((m) => {
+
+      const moduleNames = [];
+
+      function collectModuleNames(m) {
+        // handle ConcatenatedModule which does not have resource nor context set
+        if (m.modules) {
+          m.modules.forEach(collectModuleNames);
+          return;
+        }
+
         const pagesBase = path.join(ROOT_PATH, 'app/assets/javascripts/pages');
+
         if (m.resource.indexOf(pagesBase) === 0) {
-          return path.relative(pagesBase, m.resource)
+          moduleNames.push(path.relative(pagesBase, m.resource)
             .replace(/\/index\.[a-z]+$/, '')
-            .replace(/\//g, '__');
+            .replace(/\//g, '__'));
+        } else {
+          moduleNames.push(path.relative(m.context, m.resource));
         }
-        return path.relative(m.context, m.resource);
-      }).join('_');
+      }
+
+      chunk.forEachModule(collectModuleNames);
+
+      const hash = crypto.createHash('sha256')
+        .update(moduleNames.join('_'))
+        .digest('hex');
+
+      return `${moduleNames[0]}-${hash.substr(0, 6)}`;
     }),
 
     // create cacheable common library bundle for all vue chunks