@lmjs/cli 1.0.31 → 1.0.32

package/index.js

@@ -6,7 +6,6 @@ const FtpDeploy = require("ftp-deploy");
 const ftpDeploy = new FtpDeploy();
 
 const fcs = require("./lib/fcs.js");
-var UglifyJS = require("uglify-js");
 
 exports.processCommand = processCommands;
 exports.startServer = startServer;
@@ -141,7 +140,7 @@ var _vcData = {
 };
 `;
     vt += " " + String(indexJs);
-    let f1 = await axios.get("https://s.beacdn.com/beajs/f1", {});
+    let f1 = await API.get("https://s.beacdn.com/beajs/f1", {});
 
     spinner
       .succeed("Gathering Required Resources")
@@ -157,20 +156,12 @@ var _vcData = {
     let token_ = r.token;
     let js_ = "";
 
-    var js2 =
+    var configData =
       `
   exports.config = ` +
       JSON.stringify(config) +
       `;
   `;
-    let configData = UglifyJS.minify(js2, {
-      mangle: {
-        reserved: ["_vcdata", "_ws"],
-      },
-      output: {
-        beautify: true,
-      },
-    });
 
     if (cmds.indexOf("--serverless") >= 0) {
       js_ +=
@@ -180,14 +171,7 @@ var _beaTn = "` +
         `";
 `;
     }
-    js_ += String(f1.data) + " " + r.js;
-
-    let js__ = UglifyJS.minify(js_, {
-      mangle: {
-        toplevel: true,
-        reserved: ["_vcdata", "_ws"],
-      },
-    });
+    js_ += String(f1) + " " + r.js;
 
     if (token_ == "") {
       spinner.fail("Error getting a unique token for production!");
@@ -236,7 +220,7 @@ var _beaTn = "` +
 
       fs.writeFileSync(
         dest + path.sep + "js" + path.sep + "bea.js",
-        String(js__.code)
+        String(js_)
       );
       fs.writeFileSync(
         dest + path.sep + "css" + path.sep + "bea.css",
@@ -314,7 +298,7 @@ var _beaTn = "` +
 
       fs.writeFileSync(
         dest + path.sep + "src" + path.sep + "js" + path.sep + "bea.js",
-        String(String(js__.code))
+        String(js_)
       );
       fs.writeFileSync(
         dest + path.sep + "src" + path.sep + "css" + path.sep + "bea.css",
@@ -326,7 +310,7 @@ var _beaTn = "` +
           .split('<script src="/index.js" type="text/javascript"></script>')
           .join("")
       );
-      fs.writeFileSync(dest + path.sep + "config.js", String(configData.code));
+      fs.writeFileSync(dest + path.sep + "config.js", String(configData));
     }
 
     if (cmds.indexOf("--deploy") >= 0) {

package/lib/fcs.js

@@ -1,6 +1,7 @@
 const axios = require("axios").default;
 const path = require("path");
 const fs = require("fs");
+var minify = require("html-minifier").minify;
 
 const BEA_Libs = {
   BEACSS: "https://s.beacdn.com/beacss/latest",
@@ -18,7 +19,7 @@ function _mini(st) {
     // st[key] = st[key].replace(" let ", " ;let ");
     // st[key] = st[key].replace(" const ", " ;const ");
     st[key] = st[key].replace(/(\t)/g, "");
-    st[key] = st[key].replace(/\s\s+/g, " ");
+    // st[key] = st[key].replace(/\s\s+/g, " ");
   }
   return st;
 }
@@ -38,7 +39,40 @@ function getAllFiles(dirPath, arrayOfFiles) {
           .split("\\")
           .join("/")
       ).toString("base64");
-      arrayOfFiles[fileKey] = fs.readFileSync(filePath, { encoding: "utf8" });
+      var result = minify(fs.readFileSync(filePath, { encoding: "utf8" }), {
+        removeAttributeQuotes: false,
+        caseSensitive: true,
+        collapseWhitespace: true,
+        collapseInlineTagWhitespace: true,
+        conservativeCollapse: true,
+        minifyJS: true,
+        minifyCSS: false,
+        removeComments: true,
+        processConditionalComments: true,
+        collapseBooleanAttributes: true,
+        decodeEntities: true,
+        html5: true,
+        includeAutoGeneratedTags: false,
+        keepClosingSlash: true,
+        maxLineLength: null,
+        minifyURLs: "",
+        preserveLineBreaks: false,
+        preventAttributesEscaping: false,
+        processScripts: ["text/html"],
+        quoteCharacter: "",
+        removeEmptyAttributes: true,
+        removeEmptyElements: false,
+        removeOptionalTags: true,
+        removeRedundantAttributes: true,
+        removeScriptTypeAttributes: true,
+        removeStyleLinkTypeAttributes: true,
+        removeTagWhitespace: false,
+        sortAttributes: false,
+        sortClassName: true,
+        trimCustomFragments: true,
+        useShortDoctype: true,
+      });
+      arrayOfFiles[fileKey] = result;
     }
   });
   return _mini(arrayOfFiles);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmjs/cli",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "LumenJS is a tiny robust reactive javascript framework for building scalable and high-performant web applications and web user interfaces, be it simple or complex, with standard HTML, CSS and JavaScript",
   "main": "./index.js",
   "bin": {
@@ -37,7 +37,7 @@
     "lumen bea"
   ],
   "dependencies": {
-    "@lmjs/core": "^1.0.3"
+    "@lmjs/core": "^1.0.5"
   },
   "engines": {
     "node": ">=12.0.0"