dist/esm: polish file paths for theme css imports #6725

Author: tobiu

buildScripts/buildESModules.mjs

@@ -35,7 +35,7 @@ async function minifyDirectory(inputDir, outputDir) {
                         const jsonContent = JSON.parse(content);
 
                         if (dirent.name === 'neo-config.json') {
-                            jsonContent.basePath    = '../../' + jsonContent.basePath;
+                            //jsonContent.basePath    = '../../' + jsonContent.basePath;
                             jsonContent.environment = 'dist/esm';
                         }
 

src/main/addon/Stylesheet.mjs

@@ -43,13 +43,18 @@ class Stylesheet extends Base {
         super.construct(config);
 
         let neoConfig = Neo.config,
+            env       = neoConfig.environment,
             faPath;
 
         if (neoConfig.useFontAwesome) {
-            if (neoConfig.environment === 'development' || neoConfig.environment === 'dist/esm') {
-                faPath = neoConfig.basePath + 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
+            if (env === 'development' || env === 'dist/esm') {
+                faPath = neoConfig.basePath + 'node_modules/@fortawesome/fontawesome-free/css/all.min.css';
+
+                if (env === 'dist/esm') {
+                    faPath = '../../' + faPath
+                }
             } else {
-                faPath = neoConfig.basePath.substr(6) + 'resources/fontawesome-free/css/all.min.css'
+                faPath = neoConfig.basePath.substring(6) + 'resources/fontawesome-free/css/all.min.css'
             }
 
             this.createStyleSheet(null, null, faPath)
@@ -73,6 +78,10 @@ class Stylesheet extends Base {
 
         document.body.classList.add(themes[0]);
 
+        if (env === 'dist/esm') {
+            path = '../../' + path;
+        }
+
         folders.forEach(folder => {
             if (folder.startsWith('neo-')) {
                 folder = folder.substring(4)
@@ -100,6 +109,10 @@ class Stylesheet extends Base {
             promises    = [],
             rootPath    = config.basePath.substring(6);
 
+        if (env === 'dist/esm') {
+            path = '../../' + path;
+        }
+
         if (className.startsWith('Neo.')) {
             className = className.substring(4)
         }