@jamesblanksby/toolkit 1.3.0 → 1.5.0

package/README.md

@@ -1,4 +1,4 @@
-# 🧰 Toolkit
+# 🧰 toolkit
 
 > A customizable task automation tool.
 

package/build/sass.js

@@ -1,5 +1,6 @@
 import fs from 'fs/promises';
 import path from 'path';
+import url from 'url';
 
 import * as sass from 'sass';
 
@@ -13,7 +14,7 @@ async function findMainPaths(source) {
 
         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);
@@ -39,21 +40,27 @@ async function createCssAndMapFile(css, map, source) {
 
     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) {
+    const modulesDir = path.resolve(path.dirname(url.fileURLToPath(import.meta.url)), './../../..');
+
+    const options = {
+        loadPaths: [modulesDir,],
+        sourceMap: true,
+    };
+
     for await (const file of files) {
         const sassPaths = await findMainPaths(file.path);
 
         for (const sassPath of sassPaths) {
             let result;
             try {
-                result = sass.compile(sassPath, { sourceMap: true, });
+                result = sass.compile(sassPath, options);
             } catch (error) {
                 throw new Error(error.message);
             }

package/build/script.js

@@ -6,11 +6,14 @@ import uglifyjs from 'uglify-js';
 
 import { MemoryFile } from './../src/file.js';
 
+const { PWD, } = process.env;
+
 async function scriptLint(files) {
     const configDir = path.dirname(url.fileURLToPath(import.meta.url));
 
     const eslint = new ESLint({
-        overrideConfigFile: `${configDir}/../.eslintrc.json`,
+        cwd: PWD,
+        overrideConfigFile: `${configDir}/../eslint.config.mjs`,
     });
 
     let results = [];
@@ -19,7 +22,7 @@ async function scriptLint(files) {
         file = await file.read();
 
         const fileResult = await eslint.lintText(file.contents, { filePath: file.path, });
-        results = results.concat(fileResult);
+        results.push(...fileResult);
     }
 
     const formatter = await eslint.loadFormatter();

package/build/shopify.js

@@ -24,8 +24,12 @@ function flattenCss(file) {
 
     const result = file.contents
         .replace(new RegExp('../(font|gfx)/', 'g'), '')
-        .replace(new RegExp('url\\((.*?)\\)', 'g'), (_, match) => {
-            const resource = match.replace(new RegExp('/', 'g'), '_');
+        .replace(new RegExp('url\\([\'"]?(.*?)?[\'"]?\\)', 'g'), (_, match) => {
+            if (/^https?:\/\//.test(match)) {
+                return `url("${match}")`;
+            }
+        
+            const resource = match.replace(/\//g, '_');
             return `url({{ '${resource}' | asset_url }})`;
         });
 

package/eslint.config.mjs

@@ -0,0 +1,36 @@
+import globals from 'globals';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [...compat.extends('eslint:recommended'), {
+    ignores: [
+        'node_modules/*',
+    ],
+    
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.jquery,
+            ...globals.node,
+        },
+
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+    },
+
+    rules: {
+        'no-async-promise-executor': 'off',
+        'no-empty': 'off',
+        'no-unused-vars': 'warn',
+    },
+}];

package/package.json

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

package/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true,
-        "jquery": true,
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "rules": {
-        "no-async-promise-executor": "off",
-        "no-empty": "off",
-        "no-unused-vars": "warn"
-    }
-}