From edacfc12cb7467c78390c1ef6c6a176973cbb08b Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Fri, 9 Jul 2021 08:15:17 +0200
Subject: [PATCH] remove (unnecessary) double egw.min.js import

---
 api/js/jsapi/egw.js      | 6 ------
 api/js/jsapi/egw_data.js | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/api/js/jsapi/egw.js b/api/js/jsapi/egw.js
index 82bbbf9900..f6fe6127df 100644
--- a/api/js/jsapi/egw.js
+++ b/api/js/jsapi/egw.js
@@ -207,15 +207,9 @@ window.app = {classes: {}};
 		}));
 	}
 
-	const egw_modules = [
-		// TODO: Dev mode should remove .min or remap it with importmap
-		'egw.min'
-	];
 	// make our promise global, as legacy code calls egw_LAB.wait which we assign to egw_ready.then
 	window.egw_LAB = window.egw_ready =
 		legacy_js_import(include.filter((src) => src.match(legacy_js_regexp) !== null), window.egw_webserverUrl)
-			.then(Promise.all(egw_modules.map(mod => import(window.egw_webserverUrl+'/api/js/jsapi/'+mod+'.js')
-				.catch((err) => {console.error(rel_src+": "+err.message)}))))
 			.then(() => Promise.all(include.filter((src) => src.match(legacy_js_regexp) === null)	//.reverse()
 				.map(rel_src => import(window.egw_webserverUrl+'/'+rel_src)
 					.catch((err) => {window.setTimeout(() => {throw err;},0)})
diff --git a/api/js/jsapi/egw_data.js b/api/js/jsapi/egw_data.js
index 28a7f86631..51a7bea6d6 100644
--- a/api/js/jsapi/egw_data.js
+++ b/api/js/jsapi/egw_data.js
@@ -14,7 +14,7 @@
 	egw_core;
 	egw_debug;
 */
-import './egw_core.js';
+import './egw.js';
 import './egw_json.js';	// for egw.registerJSONPlugin
 
 /**