diff --git a/Gruntfile.js b/Gruntfile.js index c0af1ec0c0..c33706ecca 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -51,12 +51,12 @@ module.exports = grunt => { ...buildUtils.getPreparedBundleLibList(libs), ]; - let bundleFileMap = {'client/lib/espo.min.js': libsBundleFileList}; + let bundleFileMap = {'client/lib/espo.js': libsBundleFileList}; for (let name in bundleConfig.chunks) { let namePart = 'espo-' + name; - bundleFileMap[`client/lib/${namePart}.min.js`] = originalLibDir + `/${namePart}.js` + bundleFileMap[`client/lib/${namePart}.js`] = originalLibDir + `/${namePart}.js` } let copyJsFileList = buildUtils.getCopyLibDataList(libs); diff --git a/application/Espo/Resources/metadata/app/client.json b/application/Espo/Resources/metadata/app/client.json index f2e759472f..bf5938272f 100644 --- a/application/Espo/Resources/metadata/app/client.json +++ b/application/Espo/Resources/metadata/app/client.json @@ -1,7 +1,7 @@ { "scriptList": [ - "client/lib/espo.min.js", - "client/lib/espo-main.min.js" + "client/lib/espo.js", + "client/lib/espo-main.js" ], "developerModeScriptList": [ "client/src/loader.js" diff --git a/frontend/test/jasmine-browser.json b/frontend/test/jasmine-browser.json index dd8059a277..a56aee19f3 100644 --- a/frontend/test/jasmine-browser.json +++ b/frontend/test/jasmine-browser.json @@ -2,7 +2,7 @@ "srcDir": ".", "srcFiles": [ "frontend/test/init.js", - "client/lib/espo.min.js", + "client/lib/espo.js", "client/lib/transpiled/src/exceptions.js", "client/lib/transpiled/src/utils.js", "client/lib/transpiled/src/ajax.js", diff --git a/install/entry.php b/install/entry.php index 0c1b71ba0f..8a4b9af4c6 100644 --- a/install/entry.php +++ b/install/entry.php @@ -208,7 +208,7 @@ $loaderParamsProvider = $installer->getInjectableFactory()->create(LoaderParamsP if (!empty($actionFile) && file_exists('install/core/tpl/' . $tplName)) { /* check if EspoCRM is built */ - $isBuilt = file_exists('client/lib/espo.min.js'); + $isBuilt = file_exists('client/lib/espo.js'); $smarty->assign('isBuilt', $isBuilt); diff --git a/js/diff.js b/js/diff.js index b4b6dcf9cd..91540d28f3 100644 --- a/js/diff.js +++ b/js/diff.js @@ -281,15 +281,15 @@ class Diff libData.filesToCopy.forEach(item => fileList.push(item)); - fileList.push('client/lib/espo.min.js'); - fileList.push('client/lib/espo.min.js.map'); + fileList.push('client/lib/espo.js'); + fileList.push('client/lib/espo.js.map'); Object.keys(bundleConfig.chunks) .map(name => { let namePart = 'espo-' + name; - fileList.push(`client/lib/${namePart}.min.js`); - fileList.push(`client/lib/${namePart}.min.js.map`); + fileList.push(`client/lib/${namePart}.js`); + fileList.push(`client/lib/${namePart}.js.map`); }); fs.readdirSync('client/css/espo/').forEach(file => { diff --git a/package-lock.json b/package-lock.json index a60ba2a5a4..4c50bbd9a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,7 +49,7 @@ }, "devDependencies": { "archiver": "^5.3.0", - "espo-frontend-build-tools": "github:espocrm/frontend-build-tools#0.0.1", + "espo-frontend-build-tools": "github:espocrm/frontend-build-tools#0.0.2", "fstream": ">=1.0.12", "glob": "^10.2.6", "grunt": "^1.5.3", @@ -3095,8 +3095,8 @@ } }, "node_modules/espo-frontend-build-tools": { - "version": "0.0.1", - "resolved": "git+ssh://git@github.com/espocrm/frontend-build-tools.git#226e3af9574a241d45e933327b72a5b41bc5bdb5", + "version": "0.0.2", + "resolved": "git+ssh://git@github.com/espocrm/frontend-build-tools.git#5215ede102ae0ebe34b4b4d626076814ef99bec3", "dev": true, "license": "MIT", "dependencies": { @@ -9340,9 +9340,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "espo-frontend-build-tools": { - "version": "git+ssh://git@github.com/espocrm/frontend-build-tools.git#226e3af9574a241d45e933327b72a5b41bc5bdb5", + "version": "git+ssh://git@github.com/espocrm/frontend-build-tools.git#5215ede102ae0ebe34b4b4d626076814ef99bec3", "dev": true, - "from": "espo-frontend-build-tools@github:espocrm/frontend-build-tools#0.0.1", + "from": "espo-frontend-build-tools@github:espocrm/frontend-build-tools#0.0.2", "requires": { "@babel/cli": "^7.21.5", "@babel/core": "^7.22.1", diff --git a/package.json b/package.json index adaaead068..a2110fff27 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "license": "GPL-3.0", "devDependencies": { "archiver": "^5.3.0", - "espo-frontend-build-tools": "github:espocrm/frontend-build-tools#0.0.1", + "espo-frontend-build-tools": "github:espocrm/frontend-build-tools#0.0.2", "fstream": ">=1.0.12", "glob": "^10.2.6", "grunt": "^1.5.3", diff --git a/upgrades/7.6/data.json b/upgrades/7.6/data.json index ba084e8c67..60ec91eb56 100644 --- a/upgrades/7.6/data.json +++ b/upgrades/7.6/data.json @@ -2,7 +2,8 @@ "manifest": { "delete": [ "client/lib/original/espo.js", - "client/lib/original/espo.js", + "client/lib/espo.min.js", + "client/lib/espo.min.js.map", "client/cfg/pre-load.json" ] }