From 61dc0298677899598b4e4c10a5061ab62df013f0 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Wed, 23 Jun 2021 10:43:06 +0300
Subject: [PATCH] diff changes

---
 js/diff.js | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/js/diff.js b/js/diff.js
index f9f94ba6e4..4fe5efed00 100644
--- a/js/diff.js
+++ b/js/diff.js
@@ -231,14 +231,17 @@ class Diff
                 }
             }
 
-            let deletedFileList = this._getDeletedFileList(versionFrom);
-            let tagList = this._getTagList();
-
-            this._getLibData({
+            let libData = this._getLibData({
                 versionFrom: versionFrom,
                 currentPath: currentPath,
             });
 
+            let deleteFileList = this._getDeletedFileList(versionFrom)
+                .concat(libData.filesToDelete)
+                .filter((item, i, list) => list.indexOf(item) === i);
+
+            let tagList = this._getTagList();
+
             process.chdir(buildPath);
 
             let fileList = [];
@@ -253,6 +256,8 @@ class Diff
                 fileList.push(file);
             });
 
+            libData.filesToCopy.forEach(item => fileList.push(item));
+
             fileList.push('client/espo.min.js');
             fileList.push('client/espo.min.js.map');
 
@@ -309,7 +314,7 @@ class Diff
                     "releaseDate": date,
                     "author": "EspoCRM",
                     "description": "",
-                    "delete": deletedFileList,
+                    "delete": deleteFileList,
                 };
 
                 let additionalManifestData = upgradeData.manifest || {};
@@ -478,7 +483,7 @@ class Diff
 
     _getLibData(dto) {
         let data = {
-            filesToRemove: [],
+            filesToDelete: [],
             filesToCopy: [],
         };
 
@@ -515,6 +520,9 @@ class Diff
 
         let libNewDataList = require(this.espoPath + '/frontend/libs.json');
 
+        let resolveItemDest = item =>
+            item.dest || 'client/lib/' + item.src.split('/').pop();
+
         libNewDataList.forEach(item => {
             let name = item.name;
 
@@ -548,19 +556,13 @@ class Diff
 
                 if (item.files) {
                     item.files.forEach(item =>
-                        data.filesToCopy.push({
-                            src: item.src,
-                            dest: item.dest || 'client/lib/' + item.src.split('/').pop(),
-                        })
+                        data.filesToCopy.push(resolveItemDest(item))
                     );
 
                     return;
                 }
 
-                data.filesToCopy.push({
-                    src: item.src,
-                    dest: item.dest || 'client/lib/' + item.src.split('/').pop(),
-                });
+                data.filesToCopy.push(resolveItemDest(item));
 
                 return;
             }
@@ -600,17 +602,13 @@ class Diff
 
             if (item.files) {
                 item.files.forEach(item =>
-                    data.filesToRemove.push({
-                        src: item.dest || 'client/lib/' + item.src.split('/').pop(),
-                    })
+                    data.filesToDelete.push(resolveItemDest(item))
                 );
 
                 return;
             }
 
-            data.filesToRemove.push({
-                src: item.dest || 'client/lib/' + item.src.split('/').pop(),
-            });
+            data.filesToDelete.push(resolveItemDest(item));
 
             return;
         });