Merge changes from ProPuke

.gitignore

@@ -1,3 +1,12 @@
+# Build files
+dist/css
+dist/js
+docs/assets/css
+docs/dist/css
+docs/dist/fonts
+docs/dist/js
+docs/dist/template-app
+
 # Ignore docs files
 _gh_pages
 _site

Gruntfile.js

@@ -20,7 +20,8 @@ module.exports = function(grunt) {
         docsAssetsPath: 'docs/assets/',
         docsDistPath:   'docs/dist/',
         docsPath:       'docs/',
-        srcPath:        'sass/',
+        sassPath:       'sass/',
+        jsPath:         'js/',
     },
 
     banner: '/*!\n' +
@@ -34,7 +35,12 @@ module.exports = function(grunt) {
             ' */\n',
 
     clean: {
-      dist: ['<%= meta.distPath %>/css', '<%= meta.docsDistPath %>/css']
+      dist: [
+        '<%= meta.distPath %>/css',
+        '<%= meta.distPath %>/js',
+        '<%= meta.docsDistPath %>/css',
+        '<%= meta.docsDistPath %>/js'
+      ]
     },
 
     sass: {
@@ -83,6 +89,16 @@ module.exports = function(grunt) {
       }
     },
 
+    concat: {
+      js: {
+        src: [
+          '<%= meta.jsPath %>/photon.js',
+          '<%= meta.jsPath %>/*.js'
+        ],
+        dest: '<%= meta.distPath %>/js/photon.js'
+      },
+    },
+
     cssmin: {
       options: {
         keepSpecialComments: '*' // keep all important comments
@@ -104,9 +120,13 @@ module.exports = function(grunt) {
         port: 8000
       },
       css: {
-        files: '<%= meta.srcPath %>**/*.scss',
+        files: '<%= meta.sassPath %>**/*.scss',
         tasks: ['dist-css', 'copy']
       },
+      js: {
+        files: '<%= meta.jsPath %>/*.js',
+        tasks: ['concat']
+      },
       html: {
         files: '<%= meta.docsPath %>**',
         tasks: ['jekyll']
@@ -146,7 +166,7 @@ module.exports = function(grunt) {
 
   // Tasks
   grunt.registerTask('dist-css', ['sass', 'usebanner', 'cssmin']);
-  grunt.registerTask('dist', ['clean', 'dist-css', 'copy']);
+  grunt.registerTask('dist', ['clean', 'dist-css', 'copy', 'concat']);
   grunt.registerTask('server', ['dist', 'jekyll:docs', 'connect', 'watch']);
 
   grunt.registerTask('default', ['dist']);