Updated make to condense libs

deployd · May 16, 2012 · ded7b9d · ded7b9d
1 parent 75bd67b
commit ded7b9d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 22 deletions.
diff --git a/app.js b/app.js
@@ -79,7 +79,8 @@ app.configure('production', function(){
 });
 
 app.helpers({
-  template: require('./util/template-html')
+    template: require('./util/template-html')
+  , libs: require('./client-libs')
 });
 
 // Routes

diff --git a/client-libs.js b/client-libs.js
@@ -0,0 +1,16 @@
+module.exports = [
+    'jquery-1.7.2.js'
+  , 'jquery.plugins.js'
+  , 'bootstrap.js'
+  , 'underscore.js'
+  , 'underscore.string.min.js'
+  , 'backbone.js'
+  , 'knockout-2.0.0.js'
+  , 'knockout.mapping.js'
+  , 'ace-noconflict.js'
+  , 'ace-mode-javascript-noconflict.js'
+  , 'ace-mode-css-noconflict.js'
+  , 'ace-mode-html-noconflict.js'
+  , 'theme-twilight-noconflict.js'
+  , 'prettify.js'
+];
diff --git a/make.js b/make.js
@@ -3,6 +3,7 @@ require('shelljs/make');
 var requirejs = require('requirejs');
 var ejs = require('ejs');
 
+var libs = require('./client-libs');
 var templateHelper = require('./util/template-html');
 templateHelper.root = '../views/templates';
 
@@ -32,17 +33,21 @@ target.build = function() {
   mkdir('js');
 
   //Lib
-  mkdir('js/lib');
-  var lib = '../public/js/lib/';
-  ls(lib).forEach(function(file) {
-    exec('uglifyjs ' + lib + file, {silent: true}).output.to('js/lib/' + file);
+
+  var libFolder = '../public/js/lib/'
+  var libsjs = '';
+  libs.forEach(function(file) {
+    libsjs += exec('uglifyjs ' + libFolder + file, {silent: true}).output + '\n;\n';
   });
+  libsjs.to('js/lib.js');
+
+  cp('../public/js/lib/require.js', 'js/require.js');
 
   //require.js
   var config = {
     baseUrl: '../public/js/app',
     name: 'entry',
-    out: '../build/js/app/entry.js'
+    out: '../build/js/entry.js'
   };
   requirejs.optimize(config);
 

diff --git a/views/index.ejs b/views/index.ejs
@@ -54,22 +54,16 @@
 
     <%- template('empty-html') %>
 
-    <script type="text/javascript" src="js/lib/jquery-1.7.2.js"></script>
-    <script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="js/lib/jquery.plugins.js"></script>
-    <script type="text/javascript" src="js/lib/bootstrap.js"></script>
-    <script type="text/javascript" src="js/lib/underscore.js"></script>
-    <script type="text/javascript" src="js/lib/underscore.string.min.js"></script>
-    <script type="text/javascript" src="js/lib/backbone.js"></script>
-    <script type="text/javascript" src="js/lib/knockout-2.0.0.js"></script>
-    <script type="text/javascript" src="js/lib/knockout.mapping.js"></script>
-    <script type="text/javascript" src="js/lib/ace-noconflict.js"></script>
-    <script type="text/javascript" src="js/lib/ace-mode-javascript-noconflict.js"></script>
-    <script type="text/javascript" src="js/lib/ace-mode-css-noconflict.js"></script>
-    <script type="text/javascript" src="js/lib/ace-mode-html-noconflict.js"></script>
-    <script type="text/javascript" src="js/lib/theme-twilight-noconflict.js"></script>
-    <script type="text/javascript" src="js/lib/prettify.js"></script>
+    <% if (typeof compile !== 'undefined') { %>
+        <script type="text/javascript" src="js/lib.js"></script>
+        <script src="js/require.js" data-main="js/entry.js"></script>
+    <% } else { %>
+        <% libs.forEach(function(lib) { %>
+            <script type="text/javascript" src="js/lib/<%- lib %>"></script>
+        <% }); %>
+         <script src="js/lib/require.js" data-main="js/app/entry.js"></script>
+    <% } %>
 
-    <script src="js/lib/require.js" data-main="js/app/entry.js"></script>
+
   </body>
 </html>