From 6fcd6bc6e46f1bf4e14f7402a0a7baf5a768312c Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Wed, 14 Jun 2023 10:57:51 +0300
Subject: [PATCH] loader bundler fixes

---
 .../src/views/user/password-change-request.js |  2 +-
 frontend/bundle-config.json                   | 14 +++++++++++---
 frontend/libs.json                            |  6 +++---
 js/bundler/bundler-general.js                 |  4 +++-
 js/bundler/bundler.js                         | 19 ++++++++++++-------
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/client/src/views/user/password-change-request.js b/client/src/views/user/password-change-request.js
index 9e576ee8fa..3e9e3434b7 100644
--- a/client/src/views/user/password-change-request.js
+++ b/client/src/views/user/password-change-request.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-define('views/user/password-change-request', ['view', 'model', 'lib!Espo'], function (Dep, Model, Espo) {
+define('views/user/password-change-request', ['view', 'model', 'lib!espo'], function (Dep, Model, Espo) {
 
     return Dep.extend({
 
diff --git a/frontend/bundle-config.json b/frontend/bundle-config.json
index 3e767b1cf8..93209ff3ac 100644
--- a/frontend/bundle-config.json
+++ b/frontend/bundle-config.json
@@ -13,13 +13,16 @@
     "chunks": {
         "main": {
             "files": [
-                "src/namespace.js",
-                "src/loader.js",
                 "src/exceptions.js",
                 "src/utils.js"
             ],
+            "ignoreFiles": [
+                "src/namespace.js",
+                "src/loader.js",
+                "src/pre-loader.js"
+            ],
             "patterns": [
-                "src/!(pre-loader|namespace|loader).js",
+                "src/*.js",
                 "src/ui/**/*.js",
                 "src/views/*.js",
                 "src/views/site/*.js",
@@ -115,6 +118,11 @@
             "patterns": [
                 "src/**/*.js"
             ],
+            "ignoreFiles": [
+                "src/namespace.js",
+                "src/loader.js",
+                "src/pre-loader.js"
+            ],
             "noDuplicates": true
         }
     },
diff --git a/frontend/libs.json b/frontend/libs.json
index d9c7893cb6..7e3e7911e7 100644
--- a/frontend/libs.json
+++ b/frontend/libs.json
@@ -90,12 +90,12 @@
     {
         "src": "node_modules/jquery-ui-espo/dist/jquery-ui.js",
         "bundle": true,
-        "suppressAmd": true
+        "suppressAmd": true,
+        "key": "jquery-ui"
     },
     {
         "src": "node_modules/jquery-ui-touch-punch/jquery.ui.touch-punch.js",
-        "bundle": true,
-        "suppressAmd": true
+        "bundle": true
     },
     {
         "name": "gridstack",
diff --git a/js/bundler/bundler-general.js b/js/bundler/bundler-general.js
index 8f58e3ec78..79975c9046 100644
--- a/js/bundler/bundler-general.js
+++ b/js/bundler/bundler-general.js
@@ -38,6 +38,7 @@ class BundlerGeneral {
      *   chunks: Object.<string, {
      *     files?: string[],
      *     patterns?: string[],
+     *     ignoreFiles?: string[],
      *     lookupPatterns?: string[],
      *     templatePatterns?: string[],
      *     noDuplicates?: boolean,
@@ -181,7 +182,8 @@ class BundlerGeneral {
                 patterns: patterns,
                 lookupPatterns: lookupPatterns,
                 libs: this.libs,
-                ignoreFiles: ignoreFiles,
+                ignoreFullPathFiles: ignoreFiles,
+                ignoreFiles: params.ignoreFiles,
                 dependentOn: params.dependentOn,
             });
 
diff --git a/js/bundler/bundler.js b/js/bundler/bundler.js
index 169c034c8d..b6c76d4abf 100644
--- a/js/bundler/bundler.js
+++ b/js/bundler/bundler.js
@@ -58,8 +58,9 @@ class Bundler {
      *   name: string,
      *   files?: string[],
      *   patterns: string[],
-     *   lookupPatterns?: string[],
      *   ignoreFiles?: string[],
+     *   lookupPatterns?: string[],
+     *   ignoreFullPathFiles?: string[],
      *   dependentOn?: string[],
      *   libs: {
      *     src?: string,
@@ -75,11 +76,15 @@ class Bundler {
      * }}
      */
     bundle(params) {
-        let files = []
+        let ignoreFullPathFiles = params.ignoreFullPathFiles ?? [];
+        let files = params.files ?? [];
+        let ignoreFiles = params.ignoreFiles ?? [];
+
+        let fullPathFiles = []
             .concat(this.#normalizePaths(params.files || []))
-            .concat(this.#obtainFiles(params.patterns, params.files))
+            .concat(this.#obtainFiles(params.patterns, [...files, ...ignoreFiles]))
             // @todo Check if working.
-            .filter(file => !params.ignoreFiles.includes(file));
+            .filter(file => !ignoreFullPathFiles.includes(file));
 
         let allFiles = this.#obtainFiles(params.lookupPatterns || params.patterns);
 
@@ -92,10 +97,10 @@ class Bundler {
 
         let sortedFiles = this.#sortFiles(
             params.name,
-            files,
+            fullPathFiles,
             allFiles,
             ignoreLibs,
-            params.ignoreFiles || [],
+            ignoreFullPathFiles,
             notBundledModules,
             params.dependentOn || null,
         );
@@ -132,7 +137,7 @@ class Bundler {
      */
     #obtainFiles(patterns, ignoreFiles) {
         let files = [];
-        ignoreFiles = ignoreFiles || [];
+        ignoreFiles = this.#normalizePaths(ignoreFiles || []);
 
         this.#normalizePaths(patterns).forEach(pattern => {
             let itemFiles = globSync(pattern, {})