@tixyel/cli 2.6.0 → 2.6.2

package/dist/widget.js

@@ -15,7 +15,7 @@ import postcss from 'postcss';
 import cssnano from 'cssnano';
 import JSZip from 'jszip';
 import { transformSync } from 'esbuild';
-import { watermark } from './utils/watermark';
+import { watermark } from './utils/watermark.js';
 export async function createWidget(path, metadata, config, root) {
     try {
         console.log(`📁 Creating ${metadata?.name} at: ${path}`);
@@ -294,8 +294,17 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
         const list = normalizeList(patterns);
         if (!list.length)
             return [key, ''];
+        const check = (keys, formats) => {
+            !Array.isArray(keys) && (keys = [keys]);
+            !Array.isArray(formats) && (formats = [formats]);
+            return (
+            // check keys
+            keys.some((k) => key.toLowerCase() === k.toLowerCase()) ||
+                // check formats
+                list.some((p) => formats.some((f) => p.toLowerCase().endsWith(f.toLowerCase()))));
+        };
         // Process HTML
-        if (['html', 'HTML'].some((k) => key === k) || list.some((p) => p.toLowerCase().endsWith('.html'))) {
+        if (check('html', '.html')) {
             if (!usedWatermarks.has('html'))
                 result += watermark.html(widget) + '\n';
             usedWatermarks.add('html');
@@ -325,7 +334,7 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             const minified = await minifyHTML(mergedHTML, workspaceConfig.build?.obfuscation?.html);
             result += minified.trim();
         }
-        else if (['css', 'style', 'styles'].some((k) => key === k) || list.some((p) => p.toLowerCase().endsWith('.css'))) {
+        else if (check(['css', 'style', 'styles'], '.css')) {
             if (!usedWatermarks.has('css'))
                 result += watermark.css(widget) + '\n';
             usedWatermarks.add('css');
@@ -349,7 +358,7 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             }
             result += mergedCSS.trim();
         }
-        else if (['script', 'js', 'javascript'].some((k) => key === k) || list.some((p) => p.toLowerCase().endsWith('.js'))) {
+        else if (check(['script', 'js', 'javascript'], '.js')) {
             if (!usedWatermarks.has('script'))
                 result += watermark.script(widget) + '\n';
             usedWatermarks.add('script');
@@ -363,7 +372,7 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             }
             result += mergedJS.trim();
         }
-        else if (['typescript', 'ts'].some((k) => key === k) || list.some((p) => p.toLowerCase().endsWith('.ts'))) {
+        else if (check(['typescript', 'ts'], '.ts')) {
             if (!usedWatermarks.has('script'))
                 result += watermark.script(widget) + '\n';
             usedWatermarks.add('script');
@@ -389,7 +398,7 @@ export async function processBuild(widget, workspaceConfig, verbose = false) {
             const obfuscated = JavaScriptObfuscator.obfuscate(mergedTS.trim(), workspaceConfig.build?.obfuscation?.javascript);
             result += obfuscated.getObfuscatedCode();
         }
-        else if (['fields', 'FIELDS', 'fielddata', 'fieldData'].some((k) => key === k) || list.some((p) => p.toLowerCase().endsWith('.json'))) {
+        else if (check(['fields', 'fielddata', 'fieldData', 'cf', 'customfields'], '.json')) {
             if (verbose)
                 console.log(`  - Processing Json...`);
             const files = findAndRead(entryDir, list);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tixyel/cli",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "CLI tool for streamelements widgets",
   "keywords": [
     "cli",