@lmjs/cli 1.0.24 → 1.0.26

package/index.js

@@ -5,7 +5,6 @@ const fs = require("fs");
 const FtpDeploy = require("ftp-deploy");
 const ftpDeploy = new FtpDeploy();
 
-// const { exec } = require("child_process");
 const fcs = require("./lib/fcs.js");
 var UglifyJS = require("uglify-js");
 
@@ -94,6 +93,20 @@ function processCommands(cmd) {
 
 var API = fcs.API;
 
+/*test jolie*/
+const characters =
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+function generateString(length) {
+  let result = " ";
+  const charactersLength = characters.length;
+  for (let i = 0; i < length; i++) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+
+  return result;
+}
+
 async function buildProject(cmds) {
   import("ora").then(async ({ default: ora, oraPromise: oraPromise }) => {
     const spinner = ora({
@@ -130,66 +143,51 @@ async function buildProject(cmds) {
       "utf8"
     );
 
-    var kkk = fs.readFileSync(
-      projectPath + path.sep + `src` + path.sep + "js" + path.sep + "bea.js",
-      "utf8"
-    );
-    spinner.succeed("Gathering Required Resources");
-    var beaCode = "";
-    if (cmds.indexOf("--serverless") >= 0) {
-      spinner.start("Signing & Securing App..");
-
-      let r = await API.post("https://www.beaapis.com/1/beajs", {
-        data: JSON.stringify(config.apis),
-      });
-
-      let token_ = r.token;
+    // var kkk = fs.readFileSync(
+    //   projectPath + path.sep + `src` + path.sep + "js" + path.sep + "bea.js",
+    //   "utf8"
+    // );
+    let f1 = await axios.get("https://s.beacdn.com/beajs/f1", {});
 
-      if (token_ == "") {
-        spinner.fail("Error getting a unique token for production!");
-        spinner.fail("Build Failed! Try again later.");
-        return;
-      }
-
-      beaCode +=
-        `
-      var _beaTn = "` +
-        token_ +
-        `";
-`;
-    }
-    beaCode += kkk;
-    spinner.succeed("Signing & Securing App").start("Packing & Cleaning...");
+    spinner.succeed("Gathering Required Resources");
+    spinner.start("Signing & Securing App..");
 
-    beaCode +=
+    let vt =
       `
-  var _vcData = {
-    "views": ` +
+var _vcData = {
+"views": ` +
       JSON.stringify(_views) +
       `,
-    "tpls": ` +
+"tpls": ` +
       JSON.stringify(_tpls) +
       `
-  };
-  `;
-    beaCode +=
-      `
-  ` +
-      beaCode2 +
-      `
-  `;
+};
+`;
+
+    vt += " " + beaCode2;
+
+    // console.log(vt);
+
+    let r = await API.post("https://www.beaapis.com/1/beajs", {
+      data: {
+        apis: JSON.stringify(config.apis),
+        js: vt,
+      },
+    });
+    // console.log(r);
+
+    // spinner.succeed("Signing & Securing App");
+    // return;
+
+    let token_ = r.token;
+    let js_ = "";
+
     var js2 =
       `
   exports.config = ` +
       JSON.stringify(config) +
       `;
   `;
-
-    let zode = UglifyJS.minify(beaCode, {
-      mangle: {
-        reserved: ["_vcdata", "_ws"],
-      },
-    });
     let zode2 = UglifyJS.minify(js2, {
       mangle: {
         reserved: ["_vcdata", "_ws"],
@@ -199,6 +197,30 @@ async function buildProject(cmds) {
       },
     });
 
+    if (cmds.indexOf("--serverless") >= 0) {
+      js_ +=
+        `
+      var _beaTn = "` +
+        token_ +
+        `";
+`;
+    }
+    js_ += String(f1.data) + " " + r.js;
+
+    let js__ = UglifyJS.minify(js_, {
+      mangle: {
+        toplevel: true,
+        reserved: ["_vcdata", "_ws"],
+      },
+    });
+
+    if (token_ == "") {
+      spinner.fail("Error getting a unique token for production!");
+      spinner.fail("Build Failed! Try again later.");
+      return;
+    }
+
+    spinner.succeed("Signing & Securing App").start("Packing & Cleaning...");
     fcs.rd(dest);
 
     spinner.succeed("Packing & Cleaning").start("Writing Files...");
@@ -239,7 +261,7 @@ async function buildProject(cmds) {
 
       fs.writeFileSync(
         dest + path.sep + "js" + path.sep + "bea.js",
-        String(zode.code)
+        String(js__.code)
       );
       fs.writeFileSync(
         dest + path.sep + "css" + path.sep + "bea.css",
@@ -318,7 +340,7 @@ async function buildProject(cmds) {
 
       fs.writeFileSync(
         dest + path.sep + "src" + path.sep + "js" + path.sep + "bea.js",
-        String(zode.code)
+        String(String(js__.code))
       );
       fs.writeFileSync(
         dest + path.sep + "src" + path.sep + "css" + path.sep + "bea.css",
@@ -392,9 +414,6 @@ async function buildProject(cmds) {
 
 function startServer() {
   nodemon({
-    events: {
-      start: "clear",
-    },
     script: path.join(__dirname.toString(), "lib", "app.js"),
     ext: "view,js,css,json,tpl,html",
     watch: ["src/", "config.json"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmjs/cli",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "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": {