neo.mjs 4.3.19 → 4.3.21

package/buildScripts/buildThemes.mjs

@@ -13,14 +13,15 @@ const __dirname          = path.resolve(),
       cwd                = process.cwd(),
       requireJson        = path => JSON.parse(fs.readFileSync((path))),
       packageJson        = requireJson(path.resolve(cwd, 'package.json')),
-      neoPath            = packageJson.name === 'neo.mjs' ? './' : './node_modules/neo.mjs/',
+      neoPath            = path.resolve(packageJson.name === 'neo.mjs' ? './' : './node_modules/neo.mjs/'),
+      insideNeo          = packageJson.name === 'neo.mjs',
       programName        = `${packageJson.name} buildThemes`,
       program            = new Command(),
       regexComments      = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm,
       regexLineBreak     = /(\r\n|\n|\r)/gm,
       regexSassImport    = /@import[^'"]+?['"](.+?)['"];?/g,
-      scssFolders        = fs.readdirSync(path.join(neoPath, '/resources/scss')),
       scssPath           = 'resources/scss/',
+      scssFolders        = fs.readdirSync(path.resolve(scssPath)),
       themeMapFile       = 'resources/theme-map.json',
       themeMapFileNoVars = 'resources/theme-map-no-vars.json',
       themeFolders       = [],
@@ -165,10 +166,19 @@ if (programOpts.info) {
          * @returns {Object[]}
          */
         function getAllScssFiles(dirPath) {
-            const files = getScssFiles(path.resolve(neoPath, dirPath));
+            let files    = [],
+                scssPath = path.resolve(neoPath, dirPath);
+
+            if (fs.existsSync(scssPath)) {
+                files.push(...getScssFiles(scssPath));
+            }
 
             if (!insideNeo) {
-                files.push(...getScssFiles(path.resolve(cwd, dirPath)));
+                scssPath = path.resolve(cwd, dirPath);
+
+                if (fs.existsSync(scssPath)) {
+                    files.push(...getScssFiles(scssPath));
+                }
             }
 
             return files;
@@ -266,12 +276,13 @@ if (programOpts.info) {
          * @param {Boolean} useCssVars
          */
         function parseScssFiles(files, mode, target, useCssVars) {
-            let data      = '',
-                devMode   = mode === 'development',
-                mixinPath = path.resolve(neoPath, 'resources/scss/mixins/_all.scss'),
-                suffix    = useCssVars ? ''     : '-no-vars',
-                varsFlag  = useCssVars ? 'vars' : 'noVars',
-                map, neoThemePath, themeBuffer, themePath, workspaceThemePath;
+            let data        = '',
+                devMode     = mode === 'development',
+                mixinPath   = path.resolve(neoPath, 'resources/scss/mixins/_all.scss'),
+                suffix      = useCssVars ? ''     : '-no-vars',
+                themeBuffer = '',
+                varsFlag    = useCssVars ? 'vars' : 'noVars',
+                dirName, map, neoThemePath, themePath, workspaceThemePath;
 
             totalFiles[mode][varsFlag] += files.length;
 
@@ -284,7 +295,11 @@ if (programOpts.info) {
                 neoThemePath = path.resolve(neoPath, themePath);
 
                 if (!sassThemes[target]) {
-                    themeBuffer = scssCombine(fs.readFileSync(neoThemePath).toString(), path.dirname(neoThemePath));
+                    dirName = path.dirname(neoThemePath);
+
+                    if (fs.existsSync(dirName)) {
+                        themeBuffer += scssCombine(fs.readFileSync(neoThemePath).toString(), dirName);
+                    }
 
                     if (!insideNeo) {
                         workspaceThemePath = path.resolve(cwd, themePath);
@@ -325,7 +340,7 @@ if (programOpts.info) {
 
                 fs.readFile(file.path).then(content => {
                     let result = sass.renderSync({
-                        data          : data + scssCombine(content.toString(), path.resolve(neoPath, scssPath, target, file.relativePath)),
+                        data          : data + scssCombine(content.toString(), path.join(neoPath, scssPath, target, file.relativePath)),
                         outFile       : destPath,
                         sourceMap     : devMode,
                         sourceMapEmbed: false
@@ -399,8 +414,12 @@ if (programOpts.info) {
         function scssCombine (content, baseDir) {
             if (regexSassImport.test(content)) {
                 content = content.replace(regexSassImport, (m, capture) => {
-                    let parse = path.parse(path.resolve(baseDir, capture)),
-                        file  = path.resolve(`${parse.dir}/${parse.name}.scss`);
+                    if (!insideNeo && capture.startsWith('../')) {
+                        capture = '../../' + capture;
+                    }
+
+                    let parse = path.parse(path.join(baseDir, capture)),
+                        file  = path.join(`${parse.dir}/${parse.name}.scss`);
 
                     if (!fs.existsSync(file)) {
                         file = path.resolve(`${parse.dir}/_${parse.name}.scss`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "4.3.19",
+    "version": "4.3.21",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {