mage-obsidian 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mage-obsidian",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Mage Obsidian Ultis",
   "main": "./src/scripts/buildThemes.js",
   "keywords": [

package/src/service/cssResolver.js

@@ -1,7 +1,7 @@
 import themeResolver from './themeResolverSync.js';
 import path from 'node:path';
 import { MODULE_WEB_PATH, THEME_CSS_FOLDER, THEME_MODULE_WEB_PATH } from '../config/default.js';
-import { resolveFileByTheme } from './moduleResolver.js';
+import { resolveFileByTheme, getAllJsVueFilesWithInheritanceCached } from './moduleResolver.js';
 import configResolver from './configResolver.js';
 import fs from 'node:fs/promises';
 
@@ -35,11 +35,21 @@ function resolveModuleCssSourcePath(moduleName, themeName) {
     return moduleConfigSourcePath;
 }
 
+async function getVueComponentsSource(themeName) {
+    const vueComponents = await getAllJsVueFilesWithInheritanceCached(themeName);
+    // split with @source al inicio
+    const vueComponentSources = Object.entries(vueComponents).map(([name, url]) => {
+        return `@source "${url}";\n`;
+    })
+    return vueComponentSources.join('');
+}
+
 async function getCssImports(themeName) {
     const themeConfig = themeResolver.getThemeConfig(themeName);
     const excludedModules = new Set(themeConfig.ignoredCssFromModules || []);
     const modulesConfig = getModulesConfigArray();
 
+    let cssSource = await getVueComponentsSource(themeName);
     let cssImports = '';
 
     if (themeConfig.ignoredCssFromModules !== 'all') {
@@ -57,7 +67,7 @@ async function getCssImports(themeName) {
     }
 
     cssImports += await getThemeImports(themeName);
-    return cssImports;
+    return `${cssSource}\n${cssImports}`;
 }
 
 export default getCssImports;

package/src/service/moduleResolver.js

@@ -186,5 +186,5 @@ export default {
     resolveFileByTheme
 };
 
-export { getModuleConfigByThemeConfig, resolveFileByTheme };
+export { getModuleConfigByThemeConfig, resolveFileByTheme, getAllJsVueFilesWithInheritance, getAllJsVueFilesWithInheritanceCached };
 

package/src/service/preCompileMagentoFiles.js

@@ -10,7 +10,7 @@ export default async (themeName) => {
     execSync('rm -rf .precompiled/*', { stdio: 'inherit' });
     execSync(`mkdir -p .precompiled/${themeName}`, { stdio: 'inherit' });
     console.log('Generating precompiled files');
-    await precompileCss(themeName);
     await precompileJs(themeName);
+    await precompileCss(themeName);
     isPrecompiled = true;
 }