vanilla-jet 1.0.7 → 1.0.9

package/.scripts/generate_packages_json.js

@@ -0,0 +1,48 @@
+// -- Vars
+const path = require("path"),
+	fs = require("fs");
+
+// -- Call main
+main();
+
+// -- Main function
+async function main() {
+
+    // -- Create the object to be write in the file
+    const json = {
+        coreDependencies: {
+            "modernizr": "//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js",
+            "respond": "//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js",
+            "jquery": "//cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js",
+            "underscore": "//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js"
+        },
+        dependencies: {},
+        styles: {},
+        fonts: {}
+    };
+    //console.log(json);
+    console.log("Creating the package.json file...");
+
+    // -- Create the file
+    await createFileIfnotExists(JSON.stringify(json, null, 2));
+}
+
+// -- Step 0
+async function createFileIfnotExists(content) {
+
+    const fileName = 'vanillaJet.package.json';
+    const filePath = path.join(processCwd(), '/' + fileName);
+    const exists = await fs.promises.access(filePath, fs.constants.F_OK).then(() => true).catch(() => false);
+    
+    if (!exists) {
+        // -- Create the file with the json content
+        fs.writeFileSync(filePath, content, 'utf8');
+    }
+}
+
+// -- Helpers
+function processCwd() {
+    return process.cwd()
+        .replace('/.grunt', '')
+        .replace('/.scripts', '');
+}

package/framework/dipper.js

@@ -32,11 +32,14 @@ function Dipper(options, shared) {
 	this.enqueued_scripts = [];
 	this.enqueued_styles = [];
 
-	// -- Base
-	this.registerScript('modernizr', '//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js');
-	this.registerScript('respond', '//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js');
-	this.registerScript('jquery', '//cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js');
-	this.registerScript('underscore', '//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js');
+	// -- Base scripts
+	let vanillaJetJson = this.openJsonFile('vanillaJet.package.json');
+	if (vanillaJetJson) {
+		let coreDependencies = vanillaJetJson.coreDependencies;
+		for (let key in coreDependencies) {
+			this.registerScript(key, coreDependencies[key]);
+		}
+	}
 }
 
 Dipper.prototype.getPageTitle = function() {
@@ -519,4 +522,26 @@ Dipper.prototype.includeEnvironment = function() {
 		</script>`;
 }
 
+// -- Helpers
+Dipper.prototype.processCwd = function() {
+
+	return process.cwd()
+		.replace('/.grunt', '')
+		.replace('/.scripts', '');
+}
+
+Dipper.prototype.openJsonFile = function(fileName) {
+
+	let data = null;
+	const fs = require('fs'),
+		path = require('path'),
+		filePath = path.join(this.processCwd(), '/' + fileName),
+		exists = fs.existsSync(filePath);
+	
+	if (exists) {
+		data = fs.readFileSync(filePath, 'utf8');
+	}
+	return JSON.parse(data);
+}
+
 module.exports = Dipper;

package/framework/functions.js

@@ -0,0 +1,98 @@
+function Functions(endpoints) {
+
+	// Dipper
+	dipper = global.dipper;
+
+	// -- Hydrate
+	Functions.hydrate(dipper);
+
+	// Creating endpoints array
+	this.endpoints = endpoints || {};
+}
+
+Functions.hydrate = function(dipper) {
+
+    // -- Get vanillaJet.package.json
+    let json = dipper.openJsonFile('vanillaJet.package.json');
+
+	// -- Google Fonts
+    if (json.fonts && json.fonts.length > 0) {
+        dipper.registerStyle('google-fonts', dipper.get_google_fonts(json.fonts));
+    }
+
+	// - Styles
+    let stylesKeys = [];
+    if (json.styles && json.styles.length > 0) {
+
+        // -- Gettign the keys
+        stylesKeys = Object.keys(json.styles);
+
+        // -- Add google-fonts to keys
+        stylesKeys.push('google-fonts');
+
+        // -- Adding styles
+        for (let key in json.styles) {
+            // -- Check if init with http or https
+            let url = json.styles[key];
+            if (!/^https?:\/\//.test(url)) {
+                dipper.registerStyle(key, dipper.style(url));
+            } else {
+                dipper.registerStyle(key, url);
+            }
+        }
+    }
+	dipper.registerStyle('app', dipper.style('app.min.css'), stylesKeys);
+	dipper.enqueueStyle('app');
+
+    // -- Scripts
+    let scriptsKeys = [];
+    if (json.dependencies && json.dependencies.length > 0) {
+
+        // -- Adding scripts
+        for (let key in json.dependencies) {
+
+            // -- Key name and requires
+            let keyParts = key.split(':');
+            let keyName = keyParts[0];
+            let keyRequires = keyParts[1] || '';
+
+            // -- Add key to scriptsKeys
+            scriptsKeys.push(keyName);
+
+            // -- Check if init with http or https
+            let url = json.dependencies[key];
+            if (!/^https?:\/\//.test(url)) {
+                if  (keyRequires !== '') {
+                    dipper.registerScript(keyName, dipper.script(url), [keyRequires]);
+                } else {
+                    dipper.registerScript(keyName, dipper.script(url));
+                }
+            } else {
+                if (keyRequires !== '') {
+                    dipper.registerScript(keyName, url, [keyRequires]);
+                } else {
+                    dipper.registerScript(key, url);
+                }
+            }
+        }
+    }
+	dipper.registerScript('vanillaJet', dipper.script('core/vanillaJet.js'), scriptsKeys);
+	dipper.enqueueScript('vanillaJet');
+
+	// -- Main app
+	dipper.registerScript('vanilla', dipper.script('vanilla.js'));
+	dipper.enqueueScript('vanilla');
+
+	// Adding meta tags
+	dipper.addMeta('UTF-8', '', 'charset');
+	dipper.addMeta('viewport', 'width=device-width, minimum-scale=1');
+	dipper.addMeta('og:title', dipper.getPageTitle(), 'property');
+	dipper.addMeta('og:site_name', dipper.getSiteTitle(), 'property');
+	dipper.addMeta('og:description', dipper.getDescription(), 'property');
+	dipper.addMeta('og:image', dipper.img('logo.png'), 'property');
+	dipper.addMeta('og:type', 'website', 'property');
+	dipper.addMeta('og:url', dipper.urlTo(''), 'property');
+	dipper.addMeta('theme-color', '#ffffff', '');
+}
+
+module.exports = Functions;

package/framework/router.js

@@ -139,7 +139,7 @@ class Router {
 								var acceptEncoding = (req.headers['accept-encoding'] != undefined) ? req.headers['accept-encoding'] : '';
 								var fileStream = fs.createReadStream(filename);
 
-								if (ext === 'js' && !route.match(/vanilla\.min\.js$/)) {
+								if (ext === 'js' && !route.match(/(vanilla\.min\.js|vanillaJet\.min\.js)$/)) {
 									extHeader['Cache-Control'] = 'public, max-age=15552000'; 
 									extHeader['Expires'] = new Date(Date.now() + 15552000000).toUTCString();
 								}

package/framework/server.js

@@ -7,24 +7,27 @@ const path = require('path');
 
 let Router = require('./router.js');
 let Dipper = require('./dipper.js');
+let Functions = require('./functions.js');
 
 class Server {
 
-	constructor(options, functionsModule) {
-
-		console.log(functionsModule);
+	constructor(options, endpoints) {
 
 		this.httpx = null;
 		this.verbose = true;
 		this.router = null;
 		this.functions = null;
 		this.dipper = null;
-		this.init(options, functionsModule);
+		this.init(options, endpoints);
 	}
 
-	init(options, functionsModule) {
+	init(options, endpoints) {
 
-		let obj = this, settings = options.settings, opts = settings[options.profile] || {}, shared = settings['shared'] || {}, security = settings['security'] || {};
+		let obj = this, 
+			settings = options.settings, 
+			opts = settings[options.profile] || {}, 
+			shared = settings['shared'] || {}, 
+			security = settings['security'] || {};
 
 		_.defaults(opts, {
 			base_url: '',
@@ -59,7 +62,7 @@ class Server {
 
 		} else if (/^((https):\/\/)/.test(obj.options.site_url)) {
 
-			certs = {
+			let certs = {
 				key: fs.readFileSync(obj.security.key, 'utf8'),
 				cert: fs.readFileSync(obj.security.cert, 'utf8'),
 				allowHTTP1: true
@@ -75,7 +78,7 @@ class Server {
 		obj.router = new Router(obj);
 
 		// Setting endpoints
-		obj.functions = new functionsModule(obj);
+		obj.functions = new Functions(endpoints);
 	}
 
 	start() {

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "vanilla-jet",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "VannilaJet framework",
   "main": "index.js",
   "scripts": {
+    "setup": "node ./.scripts/generate_packages_json.js",
     "dev": "grunt --env=development & nodemon index.js --ignore '**/public/**'",
     "build:qa": "grunt build --env=qa",
     "build:prod": "grunt build --env=production",