vanilla-jet 1.0.31 → 1.0.33

package/.grunt/compile_html.js

@@ -1,10 +1,9 @@
-console.log("Init Templete Compile/Rendering");
-
 // -- Add dependencies
 const path = require("path"),
 	fs = require("fs"),
 	nunjucks = require('nunjucks'),
-    identifier = 'templates';
+  identifier = 'templates',
+  chalk = require('chalk');
 
 let Functions = require('../framework/functions.js');
 let Dipper = require('../framework/dipper.js');
@@ -21,7 +20,7 @@ let settings = Config.settings;
 settings['shared']['environment'] = env;
 
 let opts = settings[env] || {},
-    shared = settings['shared'] || {};
+  shared = settings['shared'] || {};
 const dipper = new Dipper(opts, shared);
 
 // -- Hydrate dipper
@@ -30,7 +29,7 @@ Functions.hydrate(dipper);
 // -- Making nunjucks
 let nunjucksPath = path.join(processCwd(), '/assets');
 nunjucks.configure(nunjucksPath, {
-    autoescape: false,
+  autoescape: false,
 	throwOnUndefined: true,
 	noCache: true
 });
@@ -44,98 +43,98 @@ main();
 // -- Define mainfunctions on other functions
 function main() {
 
-    // -- Get template files
-    const templates = getTemplates(templatesDirectoryPath);
-    //console.log(templates);
-
-    // -- Get home.html
-    let homePageName = 'home.html';
-    getHtmlFromPage(homePageName).then((htmlContent) => {
-        if (htmlContent) {
-            // -- Divide content line by line
-            const htmlContentLines = htmlContent.split('\n');
-            let lines = Array.from(htmlContentLines);
-            // -- Iterate over each line
-            for (let line of htmlContentLines) {
-                let originalLine = line;
-                // -- Remove spaces and tabs
-                line = cleanALine(line);
-                // -- Check is not empty and not a tag
-                if (line.length != 0 && !line.includes('<')) {
-
-                    // -- Get template name
-                    var templateName = line.replace('include::', '');
-                    // -- Check if its name "templates" add all templates if not add specific one
-                    if (templateName === identifier) {
-
-                        let allTemplatesCompiled = '';
-                        for (let templateName in templates) {
-                            if (templateName.includes('template.html')) {
-                                let templatePath = templates[templateName];
-                                let templateCompiled = compileTemplate(templatePath);
-                                allTemplatesCompiled += templateCompiled;
-                            }
-                        }
-                        lines = replaceInclude(lines, originalLine, allTemplatesCompiled);
-
-                    } else {
-                        let templatePath = templates[templateName];
-                        let templateCompiled = compileTemplate(templatePath);
-                        lines = replaceInclude(lines, originalLine, templateCompiled);
-                    }
-                }
+  // -- Get template files
+  const templates = getTemplates(templatesDirectoryPath);
+  //console.log(templates);
+
+  // -- Get home.html
+  let homePageName = 'home.html';
+  getHtmlFromPage(homePageName).then((htmlContent) => {
+    if (htmlContent) {
+      // -- Divide content line by line
+      const htmlContentLines = htmlContent.split('\n');
+      let lines = Array.from(htmlContentLines);
+      // -- Iterate over each line
+      for (let line of htmlContentLines) {
+        let originalLine = line;
+        // -- Remove spaces and tabs
+        line = cleanALine(line);
+        // -- Check is not empty and not a tag
+        if (line.length != 0 && !line.includes('<')) {
+
+          // -- Get template name
+          var templateName = line.replace('include::', '');
+          // -- Check if its name "templates" add all templates if not add specific one
+          if (templateName === identifier) {
+
+            let allTemplatesCompiled = '';
+            for (let templateName in templates) {
+              if (templateName.includes('template.html')) {
+                let templatePath = templates[templateName];
+                let templateCompiled = compileTemplate(templatePath);
+                allTemplatesCompiled += templateCompiled;
+              }
             }
-            // -- Join lines
-            const newHtml = lines.join('\n');
-            // -- Create HTML file
-            createHTMLFile(newHtml, homePageName);
-            // -- Console finish
-            console.log("VanillaJet - Finish build");
+            lines = replaceInclude(lines, originalLine, allTemplatesCompiled);
+
+          } else {
+            let templatePath = templates[templateName];
+            let templateCompiled = compileTemplate(templatePath);
+            lines = replaceInclude(lines, originalLine, templateCompiled);
+          }
         }
-    });
+      }
+      // -- Join lines
+      const newHtml = lines.join('\n');
+      // -- Create HTML file
+      createHTMLFile(newHtml, homePageName);
+      // -- Console finish
+      console.log(chalk.green("\n\nVanillaJet - Finish build"));
+    }
+  });
 }
 
 // -- Step 0
 function getTemplates(directory) {
     
-    const results = {};
-
-    // -- Sub functions
-    function exploreDirectory(dir) {
-        const files = fs.readdirSync(dir);
-        files.forEach(function (file) {
-            //console.log(file);
-            if (!checkExcludes(file)) {
-                const filePath = path.join(dir, file);
-                //console.log(filePath);
-                const stats = fs.statSync(filePath);
-                if (stats.isFile()) {
-                    const extension = path.extname(file).toLowerCase();
-                    if (extension === '.html') {
-                        results[file] = filePath;
-                    }
-                } else if (stats.isDirectory()) {
-                    exploreDirectory(filePath);
-                }
-            }
-        });
-    }
+  const results = {};
+
+  // -- Sub functions
+  function exploreDirectory(dir) {
+    const files = fs.readdirSync(dir);
+    files.forEach(function (file) {
+      //console.log(file);
+      if (!checkExcludes(file)) {
+        const filePath = path.join(dir, file);
+        //console.log(filePath);
+        const stats = fs.statSync(filePath);
+        if (stats.isFile()) {
+          const extension = path.extname(file).toLowerCase();
+          if (extension === '.html') {
+            results[file] = filePath;
+          }
+        } else if (stats.isDirectory()) {
+          exploreDirectory(filePath);
+        }
+      }
+    });
+  }
 
-    function checkExcludes(file) {
+  function checkExcludes(file) {
 
-        const excludes = ['.DS_Store'];
-        for (const esclude of excludes) {
-            if (file.includes(esclude)) {
-                return true;
-            }
-        }
-        return false;
+    const excludes = ['.DS_Store'];
+    for (const esclude of excludes) {
+      if (file.includes(esclude)) {
+        return true;
+      }
     }
+    return false;
+  }
 
-    // -- Main code
-    const templatesPath = path.join(processCwd(), directory);
-    exploreDirectory(templatesPath);
-    return results;
+  // -- Main code
+  const templatesPath = path.join(processCwd(), directory);
+  exploreDirectory(templatesPath);
+  return results;
 }
 
 // -- Step 1
@@ -144,19 +143,19 @@ async function getHtmlFromPage(page) {
     const filename = path.join(processCwd(), '/assets/');
     const exists = await fs.promises.access(filename, fs.constants.F_OK).then(() => true).catch(() => false);
     if (!exists) {
-        console.log("Assets folder doesnt exists");
-        return null;
+      console.log("Assets folder doesnt exists");
+      return null;
     }
   
     let fileContent;
     if (await fs.promises.stat(filename).then((stats) => stats.isDirectory())) {
-        const filePath = path.join(filename, 'pages/' + page);
-        try {
-            fileContent = await fs.promises.readFile(filePath, { encoding: 'utf8' });
-        } catch (err) {
-            console.log("Error in Home");
-            return null;
-        }
+      const filePath = path.join(filename, 'pages/' + page);
+      try {
+        fileContent = await fs.promises.readFile(filePath, { encoding: 'utf8' });
+      } catch (err) {
+        console.log("Error in Home");
+        return null;
+      }
     }
     return fileContent;
 }
@@ -164,58 +163,58 @@ async function getHtmlFromPage(page) {
 // -- Step 2
 function compileTemplate(path) {
 
-    // -- Data
-    let data = { 'app': dipper }
-    
-    // -- Render
-    return nunjucks.render(path, data);
+  // -- Data
+  let data = { 'app': dipper }
+  
+  // -- Render
+  return nunjucks.render(path, data);
 }
 
 // -- Step 3
 function replaceInclude(lines, originalLine, templateCompiled) {
-    const index = lines.indexOf(originalLine);
-    if (index !== -1) {
-        lines.splice(index, 1, templateCompiled);
-    }
-    return lines;
+  const index = lines.indexOf(originalLine);
+  if (index !== -1) {
+    lines.splice(index, 1, templateCompiled);
+  }
+  return lines;
 }
 
 // -- Step 4
 async function createHTMLFile(content, filePath) {
 
-    //const { html } = require('js-beautify');
-    ///content = html(content);
-
-    const { minify } = require('html-minifier-terser');
-    //console.log(typeof content);
-    const minified = await minify(content, {
-        collapseWhitespace: true,
-        collapseInlineTagWhitespace: true,
-        removeComments: true,
-        collapseBooleanAttributes: true,
-        useShortDoctype: true,
-        removeEmptyAttributes: true,
-        removeOptionalTags: true,
-        minifyJS: true
-      });
-
-    const publicPath = path.join(processCwd(), '/public/pages');
-    fs.mkdirSync(publicPath, { recursive: true });
-    const absolutePath = path.join(publicPath, filePath);
-    fs.writeFileSync(absolutePath, minified, 'utf8');
-    //console.log(`Html :) file created at: ${absolutePath}`);
+  //const { html } = require('js-beautify');
+  ///content = html(content);
+
+  const { minify } = require('html-minifier-terser');
+  //console.log(typeof content);
+  const minified = await minify(content, {
+    collapseWhitespace: true,
+    collapseInlineTagWhitespace: true,
+    removeComments: true,
+    collapseBooleanAttributes: true,
+    useShortDoctype: true,
+    removeEmptyAttributes: true,
+    removeOptionalTags: true,
+    minifyJS: true
+  });
+
+  const publicPath = path.join(processCwd(), '/public/pages');
+  fs.mkdirSync(publicPath, { recursive: true });
+  const absolutePath = path.join(publicPath, filePath);
+  fs.writeFileSync(absolutePath, minified, 'utf8');
+  //console.log(`Html :) file created at: ${absolutePath}`);
 }
 
 // -- Helpers
 function cleanALine(line) {
-    line = line.replaceAll(' ', '');
-    line = line.replaceAll('\t', '');
-    line = line.replaceAll('\n', '');
-    return line;
+  line = line.replaceAll(' ', '');
+  line = line.replaceAll('\t', '');
+  line = line.replaceAll('\n', '');
+  return line;
 }
 
 function processCwd() {
-    return process.cwd()
-        .replace('/.grunt', '')
-        .replace('/node_modules/vanilla-jet', '');
+  return process.cwd()
+    .replace('/.grunt', '')
+    .replace('/node_modules/vanilla-jet', '');
 }

package/bin.js

@@ -3,10 +3,10 @@
 const path = require('path');
 const args = process.argv.slice(2);
 const { execSync } = require('child_process');
+const chalk = require('chalk');
 
 const generatePackagesJson = require(path.join(__dirname, './.scripts/generate_packages_json.js'));
 
-console.log(args[0]);
 switch (args[0]) {
 
     case 'setup':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vanilla-jet",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "VannilaJet framework",
   "main": "index.js",
   "bin": {
@@ -29,14 +29,7 @@
   "homepage": "https://github.com/nalancer08/VanillaJet#readme",
   "dependencies": {
     "blueimp-md5": "2.8.0",
-    "html-minifier-terser": "7.2.0",
-    "js-beautify": "1.14.8",
-    "jsrsasign": "11.0.0",
-    "jwt-simple": "0.5.3",
-    "minimist": "1.2.6",
-    "nunjucks": "3.2.4",
-    "underscore": ">= 1.12.x",
-    "zlib": "1.0.5",
+    "chalk": "4.1.2",
     "grunt": "1.6.1",
     "grunt-cli": "1.4.3",
     "grunt-contrib-clean": "2.0.1",
@@ -48,7 +41,15 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-run": "0.8.1",
     "grunt-shell": "4.0.0",
+    "html-minifier-terser": "7.2.0",
     "jit-grunt": "0.10.0",
-    "nodemon": "3.0.1"
+    "js-beautify": "1.14.8",
+    "jsrsasign": "11.0.0",
+    "jwt-simple": "0.5.3",
+    "minimist": "1.2.6",
+    "nodemon": "3.0.1",
+    "nunjucks": "3.2.4",
+    "underscore": ">= 1.12.x",
+    "zlib": "1.0.5"
   }
 }