@jamesblanksby/toolkit 1.5.0 → 1.6.1

package/build/{script.js → js.js}

@@ -4,11 +4,11 @@ import url from 'url';
 import { ESLint } from 'eslint';
 import uglifyjs from 'uglify-js';
 
-import { MemoryFile } from './../src/file.js';
+import { MemoryFile } from '../src/file.js';
 
 const { PWD, } = process.env;
 
-async function scriptLint(files) {
+async function jsLint(files) {
     const configDir = path.dirname(url.fileURLToPath(import.meta.url));
 
     const eslint = new ESLint({
@@ -35,7 +35,7 @@ async function scriptLint(files) {
     console.log(result);
 }
 
-async function* scriptMinify(files) {
+async function* jsMinify(files) {
     for await (let file of files) {
         file = await file.read();
 
@@ -52,6 +52,6 @@ async function* scriptMinify(files) {
 }
 
 export {
-    scriptLint,
-    scriptMinify,
+    jsLint,
+    jsMinify,
 };

package/build/shopify.js

@@ -56,7 +56,7 @@ export default async function* shopifyFlatten(files) {
             file = flattenAsset(file, 'font');
         } else if (file.path.includes('/gfx/')) {
             file = flattenAsset(file, 'gfx');
-        } else if (file.path.includes('/script/')) {
+        } else if (file.path.match(/\/(js|script)\//)) {
             file = flattenScript(file);
         } else {
             file = new MemoryFile(path.basename(file.path), file.contents);

package/package.json

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

package/toolkit.config.js

@@ -3,7 +3,7 @@ import browsersync from 'browser-sync';
 import browserReload from './build/browser.js';
 import cssTransform from './build/css.js';
 import sassCompile from './build/sass.js';
-import { scriptLint, scriptMinify } from './build/script.js';
+import { jsLint, jsMinify } from './build/js.js';
 import shopifyFlatten from './build/shopify.js';
 
 import { parallel, series, src, watch } from './index.js';
@@ -14,7 +14,7 @@ const pattern = {
     html: `${PWD}/**/*.{html,php}`,
     sass: `${PWD}/**/{sass,scss}/**/*.{sass,scss}`,
     css: `${PWD}/**/css/**/*.css`,
-    script: `${PWD}/**/script/**/*.js`,
+    js: `${PWD}/**/{js,script}/**/*.js`,
 };
 
 function sync() {
@@ -47,17 +47,17 @@ function observe() {
     watch(pattern.html, reload);
     watch(pattern.sass, series(sass, css));
     watch(pattern.css, reload);
-    watch(pattern.script, reload);
+    watch(pattern.js, reload);
 }
 
 function lint() {
-    return src(pattern.script, { ignore: ['**.min.js',], })
-        .pipe(scriptLint);
+    return src(pattern.js, { ignore: ['**.min.js',], })
+        .pipe(jsLint);
 }
 
 function minify() {
-    return src(pattern.script, { ignore: ['**.min.js',], })
-        .pipe(scriptMinify)
+    return src(pattern.js, { ignore: ['**.min.js',], })
+        .pipe(jsMinify)
         .dest();
 }
 
@@ -67,7 +67,7 @@ async function shopify() {
 
     await src(`${shopifyDir}/**`).rm().toArray();
 
-    return src(`${assetDir}/**/(css|font|gfx|plugin|script)/**`, { ignore: '**/node_modules/**', })
+    return src(`${assetDir}/**/(css|font|gfx|js|plugin|script)/**`, { ignore: '**/node_modules/**', })
         .pipe(shopifyFlatten)
         .dest(shopifyDir);
 }