@jamesblanksby/toolkit 1.1.1 → 1.3.0

package/build/sass.js

@@ -5,72 +5,60 @@ import * as sass from 'sass';
 
 import { MemoryFile } from './../src/file.js';
 
-let sassPath = null;
+async function findMainPaths(source) {
+    const partialDir = path.dirname(source);
 
-async function findMainPath(partialPath) {
-    const partialDir = path.dirname(partialPath);
-
-    async function findMainPathRec(directory) {
+    async function findMainPathsRec(directory, matches = []) {
         const files = await fs.readdir(directory);
 
-        const mainPath = files.find((file) => !file.startsWith('_') && file.endsWith('.scss'));
-        if (mainPath) {
-            return path.join(directory, mainPath);
-        }
+        const matchedFiles = files.filter((file) => !file.startsWith('_') && file.endsWith('.scss'));
+        const fullPaths = matchedFiles.map((file) => path.join(directory, file));
+        
+        matches.push(...fullPaths);
 
         const parentDir = path.dirname(directory);
         if (parentDir !== directory) {
-            return findMainPathRec(parentDir);
+            return findMainPathsRec(parentDir, matches);
         }
 
-        return null;
+        return matches;
     }
 
-    return findMainPathRec(partialDir);
-}
-
-function createCssFile(css, target) {
-    return new MemoryFile(target, css);
-}
-
-async function createMapFile(map, target) {
-    const sassDir = path.resolve(sassPath, './../..');
-
-    map.sources = map.sources.map((source) => source.replace(`file://${sassDir}`, '..'));
-
-    await fs.writeFile(target, JSON.stringify(map));
+    return findMainPathsRec(partialDir);
 }
 
-async function createCssFileWithMap(file, source) {
-    const mapName = path.basename(source);
+async function createCssAndMapFile(css, map, source) {
+    const cssPath = source.replace(/sass|scss/g, 'css');
+    const mapPath = `${cssPath}.map`;
+    const mapName = path.basename(mapPath);
 
-    file = await file.read();
-
-    file = new MemoryFile(file.path, [
-        file.contents,
+    const file = new MemoryFile(cssPath, [
+        css,
         `/*# sourceMappingURL=${mapName} */`,
     ].join('\n'));
 
+    const sassDir = path.resolve(source, './../..');
+    map.sources = map.sources.map((source) => source.replace(`file://${sassDir}`, '..'));
+    
+    await fs.writeFile(mapPath, JSON.stringify(map));
+
     return file;
 }
 
+
 export default async function* sassCompile(files) {
     for await (const file of files) {
-        sassPath = await findMainPath(file.path);
+        const sassPaths = await findMainPaths(file.path);
 
-        let result;
-        try {
-            result = sass.compile(sassPath, { sourceMap: true, });
-        } catch (error) {
-            throw error.message;
-        }
-
-        const cssPath = sassPath.replace(/sass|scss/g, 'css');
-        let cssFile = createCssFile(result.css, cssPath);
+        for (const sassPath of sassPaths) {
+            let result;
+            try {
+                result = sass.compile(sassPath, { sourceMap: true, });
+            } catch (error) {
+                throw new Error(error.message);
+            }
 
-        const mapPath = `${cssPath}.map`;
-        await createMapFile(result.sourceMap, mapPath);
-
-        yield await createCssFileWithMap(cssFile, mapPath);
+            yield await createCssAndMapFile(result.css, result.sourceMap, sassPath);
+        }
     }
 }

package/build/shopify.js

@@ -4,11 +4,12 @@ import uglifyjs from 'uglify-js';
 
 import { MemoryFile } from './../index.js';
 
-const { PWD, } = process.env;
-
 function flattenAsset(file, type) {
-    const name = path.relative(PWD, file.path)
-        .replace(new RegExp(`src/${type}/?`), '')
+    const assetDir = process.env.ASSET_DIR || process.env.PWD;
+
+    const name = path.relative(assetDir, file.path)
+        .replace(new RegExp(`src/?`), '')
+        .replace(new RegExp(`${type}/?`), '')
         .replace(new RegExp('/', 'g'), '_');
 
     return new MemoryFile(name, file.buffer);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jamesblanksby/toolkit",
-    "version": "1.1.1",
+    "version": "1.3.0",
     "main": "index.js",
     "repository": {
         "type": "git",

package/toolkit.config.js

@@ -13,8 +13,8 @@ const { PWD, } = process.env;
 const pattern = {
     html: `${PWD}/**/*.{html,php}`,
     sass: `${PWD}/**/{sass,scss}/**/*.{sass,scss}`,
-    css: `${PWD}/**/css/*.css`,
-    script: `${PWD}/**/script/*.js`,
+    css: `${PWD}/**/css/**/*.css`,
+    script: `${PWD}/**/script/**/*.js`,
 };
 
 function sync() {
@@ -63,10 +63,11 @@ function minify() {
 
 async function shopify() {
     const shopifyDir = `${PWD}/../shopify/assets`;
+    const assetDir = process.env.ASSET_DIR || PWD;
 
     await src(`${shopifyDir}/**`).rm().toArray();
 
-    return src(`${PWD}/**/(css|font|gfx|plugin|script)/**`, { ignore: '**/node_modules/**', })
+    return src(`${assetDir}/**/(css|font|gfx|plugin|script)/**`, { ignore: '**/node_modules/**', })
         .pipe(shopifyFlatten)
         .dest(shopifyDir);
 }