From 6251151fff686a33e381b012649f48c4d8ccdf3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Queiruga?= <fqueiruga@cloudbees.com>
Date: Mon, 9 Dec 2019 16:18:22 +0100
Subject: [PATCH] Separates vendor scripts

---
 core/src/main/resources/lib/layout/html.jelly   |  2 ++
 core/src/main/resources/lib/layout/layout.jelly |  2 ++
 war/webpack.config.js                           | 16 ++++++++--------
 3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/core/src/main/resources/lib/layout/html.jelly b/core/src/main/resources/lib/layout/html.jelly
index 9a957defe8..8470fff330 100644
--- a/core/src/main/resources/lib/layout/html.jelly
+++ b/core/src/main/resources/lib/layout/html.jelly
@@ -161,6 +161,8 @@ THE SOFTWARE.
       <script src="${resURL}/scripts/msie.js" type="text/javascript"/>
     </j:if>
 
+    <!-- Load vendor scripts common to all JS modules -->
+    <script src="${resURL}/jsbundles/vendors.js" type="text/javascript"/>
   </head>
   <body id="jenkins" class="yui-skin-sam jenkins-${h.version}" data-version="${h.version}" data-model-type="${it.class.name}">
       <div id="main-panel" style="margin-left: 0;">
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 5693b11cfc..3e6994c418 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -173,6 +173,8 @@ THE SOFTWARE.
       <script src="${resURL}/scripts/msie.js" type="text/javascript"/>
     </j:if>
 
+    <!-- Load vendor scripts common to all JS modules -->
+    <script src="${resURL}/jsbundles/vendors.js" type="text/javascript"/>
     <script src="${resURL}/jsbundles/page-init.js" type="text/javascript"/>
 
   </head>
diff --git a/war/webpack.config.js b/war/webpack.config.js
index 71bde39a12..1ffee26ff1 100644
--- a/war/webpack.config.js
+++ b/war/webpack.config.js
@@ -80,14 +80,14 @@ module.exports = {
   },
   optimization: {
     splitChunks: {
-      // chunks: 'async',
-      // cacheGroups: {
-      //   commons: {
-      //     test: /[\\/]node_modules[\\/]/,
-      //     name: 'vendors',
-      //     chunks: 'all'
-      //   }
-      // }
+       chunks: 'async',
+       cacheGroups: {
+         commons: {
+           test: /[\\/]node_modules[\\/]/,
+           name: 'vendors',
+           chunks: 'all'
+         }
+       }
     }
   },
   resolve: {
-- 
GitLab

