Merge branch...

Merge branch '39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles' into 'master'

Resolve "d3.js is being included in the user_profile and graphs_show bundles"

Closes #39033

See merge request gitlab-org/gitlab-ce!14826

app/assets/javascripts/dispatcher.js

@@ -634,12 +634,6 @@ import U2FAuthenticate from './u2f/authenticate';
               shortcut_handler = new ShortcutsNavigation();
           }
           break;
-        case 'users':
-          const action = path[1];
-          import(/* webpackChunkName: 'user_profile' */ './users')
-            .then(user => user.default(action))
-            .catch(() => {});
-          break;
       }
       // If we haven't installed a custom shortcut handler, install the default one
       if (!shortcut_handler) {

app/assets/javascripts/users/index.js

 import Cookies from 'js-cookie';
 import UserTabs from './user_tabs';
 
-export default function initUserProfile(action) {
+function initUserProfile(action) {
   // place profile avatars to top
   $('.profile-groups-avatars').tooltip({
     placement: 'top',
@@ -17,3 +17,9 @@ export default function initUserProfile(action) {
     $(this).parents('.project-limit-message').remove();
   });
 }
+
+document.addEventListener('DOMContentLoaded', () => {
+  const page = $('body').attr('data-page');
+  const action = page.split(':')[1];
+  initUserProfile(action);
+});

app/views/users/show.html.haml

@@ -4,6 +4,9 @@
 - page_description @user.bio
 - header_title     @user.name, user_path(@user)
 - @no_container = true
+- content_for :page_specific_javascripts do
+  = webpack_bundle_tag 'common_d3'
+  = webpack_bundle_tag 'users'
 
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")

changelogs/unreleased/39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles.yml

+---
+title: Removed d3.js from the graph and users bundles and used the common_d3 bundle
+  instead
+merge_request: 14826
+author:
+type: other

config/webpack.config.js

@@ -84,6 +84,7 @@ var config = {
     vue_merge_request_widget: './vue_merge_request_widget/index.js',
     test:                 './test.js',
     two_factor_auth:      './two_factor_auth.js',
+    users:                './users/index.js',
     performance_bar:      './performance_bar.js',
     webpack_runtime:      './webpack.js',
   },
@@ -215,7 +216,9 @@ var config = {
       name: 'common_d3',
       chunks: [
         'graphs',
+        'graphs_show',
         'monitoring',
+        'users',
       ],
     }),