Updated build process, removed jQuery, added Jade

SpringRoll · Dec 17, 2015 · 3d7780b · 3d7780b
1 parent 08411f4
commit 3d7780b
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 203 deletions.
diff --git a/bower.json b/bower.json
@@ -1,8 +1,7 @@
 {
-	"name": "MyApp",
-	"version": "1.0.2",
+	"name": "SpringRoll",
+	"version": "1.0.3",
 	"dependencies": {
-		"jquery": "~1",
 		"normalize-less": "*"
 	},
 	"ignore": [

diff --git a/deploy/assets/js/libraries.js b/deploy/assets/js/libraries.js
diff --git a/deploy/assets/js/main.js b/deploy/assets/js/main.js
diff --git a/deploy/index.html b/deploy/index.html
@@ -1,34 +1 @@
-<!DOCTYPE html>
-<html class="no-js">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>SpringRoll</title>
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-        <link rel="stylesheet" href="assets/css/libraries.css?v=1.0.2">
-        <link rel="stylesheet" href="assets/css/main.css?v=1.0.2">
-        <link rel="shortcut icon" type="image/png" href="assets/images/favicon.ico">
-        <link href='http://fonts.googleapis.com/css?family=Titillium+Web:300' rel='stylesheet' type='text/css'>
-    </head>
-    <body>
-        <div class="frame">
-            <div class="splash">
-                <a href="https://github.com/SpringRoll/SpringRoll">
-                    <img src="assets/images/logo.png?v=1.0.2" alt="SpringRoll logo" width="128" height="128">
-                </a>
-                <h1>SpringRoll</h1>
-                <div class="links">
-                    <a href="https://github.com/SpringRoll/SpringRoll">Repo</a> |
-                    <a href="https://wiki.springroll.io">Wiki</a> | 
-                    <a href="http://api.springroll.io">API Docs</a> | 
-                    <a href="http://examples.springroll.io">Examples</a>
-                </div>
-            </div>
-            <div class="glow"></div>
-            <footer>&copy; CloudKid 2015. MIT License.</footer>
-        </div>
-		<script src="assets/js/libraries.js?v=1.0.2"></script>
-		<script src="assets/js/main.js?v=1.0.2"></script>
-    </body>
-</html>
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><title>SpringRoll</title><meta name="description" content=""><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"><link rel="stylesheet" href="assets/css/libraries.css?v=1.0.3"><link rel="stylesheet" href="assets/css/main.css?v=1.0.3"><link rel="shortcut icon" type="image/png" href="assets/images/favicon.ico"><link href="http://fonts.googleapis.com/css?family=Titillium+Web:300" rel="stylesheet" type="text/css"></head><body><div class="frame"><div class="splash"><a href="http://github.springroll.io"><img src="assets/images/logo.png?v=1.0.3" alt="SpringRoll logo" width="128" height="128"></a><h1>SpringRoll</h1><div class="links"><a href="http://github.springroll.io">Code | </a><a href="http://wiki.springroll.io">Wiki | </a><a href="http://api.springroll.io">API Docs | </a><a href="http://examples.springroll.io">Examples</a></div></div><div class="glow"></div><footer>&copy; CloudKid 2015. MIT License.</footer></div></body><script src="assets/js/main.js?v=1.0.3"></script></html>
diff --git a/package.json b/package.json
@@ -1,8 +1,10 @@
 {
-	"private": true,
-	"version": "1.0.2",
-	"dependencies": {
-		"grunt": "~0.4.5",
-		"project-grunt": "*"
-	}
-}
+  "private": true,
+  "version": "1.0.3",
+  "name": "SpringRoll",
+  "devDependencies": {
+    "grunt": "~0.4.5",
+    "project-grunt": "*",
+    "grunt-contrib-jade": "^0.15.0"
+  }
+}
diff --git a/project.json b/project.json
@@ -1,16 +1,14 @@
 {
 	"name": "SpringRoll",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"main": [
 		"src/main.js",
 		"src/main.less"
 	],
 	"libraries": [
-		"components/normalize-less/normalize.less",
-		"components/jquery/dist/jquery.min.js"
+		"components/normalize-less/normalize.less"
 	],
 	"librariesDebug": [
-		"components/normalize-less/normalize.less",
-		"components/jquery/dist/jquery.js"
+		"components/normalize-less/normalize.less"
 	]
 }
diff --git a/scripts/banner.js b/scripts/banner.js
diff --git a/scripts/config.json b/scripts/config.json
diff --git a/scripts/package.json b/scripts/package.json
diff --git a/scripts/push.js b/scripts/push.js
diff --git a/scripts/update.js b/scripts/update.js
diff --git a/src/main.jade b/src/main.jade
@@ -0,0 +1,25 @@
+doctype html
+html
+	head
+		meta(charset='utf-8')
+		meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
+		title=name
+		meta(name='description', content='')
+		meta(name='viewport', content='width=device-width, initial-scale=1.0, maximum-scale=1.0')
+		link(rel='stylesheet', href='assets/css/libraries.css?v=#{version}')
+		link(rel='stylesheet', href='assets/css/main.css?v=#{version}')
+		link(rel='shortcut icon', type='image/png', href='assets/images/favicon.ico')
+		link(href='http://fonts.googleapis.com/css?family=Titillium+Web:300', rel='stylesheet', type='text/css')
+	body: .frame
+		.splash
+			a(href='http://github.springroll.io')
+				img(src='assets/images/logo.png?v=#{version}', alt='SpringRoll logo', width='128', height='128')
+			h1=name
+			.links
+				a(href='http://github.springroll.io') Code | 
+				a(href='http://wiki.springroll.io') Wiki | 
+				a(href='http://api.springroll.io') API Docs | 
+				a(href='http://examples.springroll.io') Examples
+		.glow
+		footer &copy; CloudKid #{year}. MIT License.
+	script(src='assets/js/main.js?v=#{version}')
diff --git a/src/main.js b/src/main.js
@@ -1,8 +1,11 @@
-(function(){
-
-	if (DEBUG)
-	{
-		console.log("Application started!");
-	}
 
-}());
+// Google Analytics from Google
+/* jshint ignore:start */
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+/* jshint ignore:end */
+
+ga('create', 'UA-71529255-1', 'auto');
+ga('send', 'pageview');
diff --git a/tasks/aliases.js b/tasks/aliases.js
@@ -0,0 +1,21 @@
+module.exports = function(grunt)
+{
+	// HTML tasks
+	grunt.registerTask('html', 'Build the site HTML', [
+		'clean:html',
+		'jade:release'
+	]);
+
+	grunt.registerTask('html-debug', 'Build the site HTML in debug mode', [
+		'jade:debug'
+	]);
+
+	// Build hooks
+	grunt.registerTask('_pre-build', [
+		'html'
+	]);
+
+	grunt.registerTask('_pre-build-debug', [
+		'html-debug'
+	]);
+};
diff --git a/tasks/jade.js b/tasks/jade.js
@@ -0,0 +1,29 @@
+module.exports = {
+	release: {
+		options: {
+			data: {
+				debug: false,
+				name: "<%= project.name %>",
+				version: "<%= project.version %>",
+				year: "<%= new Date().getFullYear() %>"
+			}
+		},
+		files: {
+			'<%= distFolder %>/index.html': 'src/main.jade'
+		}
+	},
+	debug: {
+		options: {
+			pretty: true,
+			data: {
+				debug: true,
+				name: "<%= project.name %>",
+				version: "<%= project.version %>",
+				year: "<%= new Date().getFullYear() %>"
+			}
+		},
+		files: {
+			'<%= distFolder %>/index.html': 'src/main.jade'
+		}
+	}
+};
diff --git a/tasks/overrides/clean.js b/tasks/overrides/clean.js
@@ -0,0 +1,3 @@
+module.exports = {
+	html: ['<%= distFolder %>/*.html']
+};