fix(all): Fix gruntfile for browserify

Author: forrestbthomas

Diff for: Gruntfile.js

@@ -4,7 +4,20 @@ module.exports = function(grunt) {
     pkg: grunt.file.readJSON('package.json'),
 
     browserify: {
-      'public/app.js': ['public/bundle']
+      options: {
+        debug: true
+      },
+      dev: {
+        src: ['public/app.js'],
+        dest: 'public/browserify-bundle.js'
+      },
+      production: {
+        options: {
+          debug: false
+        },
+        src: '<%= browserify.dev.src %>',
+        dest: 'public/browserify-bundle.js'
+      }
     },
 
     mochaTest: {
@@ -49,7 +62,7 @@ module.exports = function(grunt) {
         separator: ';'
       },
       js: {
-        src: ['public/js/**/*.js','public/app.js'],
+        src: ['public/js/**/*.js'],
         dest: 'public/dist/<%= pkg.name %>.js'
       }
     },
@@ -89,11 +102,11 @@ module.exports = function(grunt) {
   });
 
 
+  grunt.loadNpmTasks('grunt-browserify');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-browserify');
   // grunt.loadNpmTasks('grunt-blanket');
   grunt.loadNpmTasks('grunt-mocha-test');
   grunt.loadNpmTasks('grunt-contrib-watch');
@@ -128,7 +141,7 @@ module.exports = function(grunt) {
   grunt.registerTask('local', ['jshint', 'test', 'nodemon']);
 
 
-  grunt.registerTask('default', ['concat', 'uglify', 'cssmin']);
+  grunt.registerTask('default', ['browserify', 'concat', 'uglify', 'cssmin']);
 
 
   // grunt.registerTask('upload', function(n) {

Diff for: public/app.js

@@ -14,7 +14,4 @@ app.navbarView = new NavbarView({ model: app.user });
 $('.navbar').append(app.navbarView.$el);
 
 app.rulesView = new RulesView({ model: app.game });
-$('#rules').append(app.rulesView.$el);
-
-
-
+$('#rules').append(app.rulesView.$el);

Diff for: public/bundle renamed to public/browserify-bundle.js

@@ -16,10 +16,6 @@ $('.navbar').append(app.navbarView.$el);
 
 app.rulesView = new RulesView({ model: app.game });
 $('#rules').append(app.rulesView.$el);
-
-
-
-
 },{"./game_classes/Game.js":4,"./helpers.js":9}],2:[function(require,module,exports){
 var Unoccupied = require('./Unoccupied.js');
 

Diff for: public/dist/javascript-battle-website.js

@@ -730,23 +730,4 @@ $('.navbar-collapse ul li a').click(function() {
       this.$el.append(heroView.$el);
     }.bind(this));
   }
-});;var app = {};
-
-app.game = new Game();
-
-var initialGame = require('./game_classes/Game.js');
-app.game.clientSideGame[0] = new initialGame(12);
-
-app.game.helpers = require('./helpers.js');
-
-app.gameView = new GameView({ model: app.game });
-$('.gamegrid-content').append(app.gameView.$el);
-
-app.navbarView = new NavbarView({ model: app.user });
-$('.navbar').append(app.navbarView.$el);
-
-app.rulesView = new RulesView({ model: app.game });
-$('#rules').append(app.rulesView.$el);
-
-
-
+});

Diff for: public/dist/javascript-battle-website.min.js

@@ -108,7 +108,7 @@ <h2 class="winner-msg">Simulated Game</h2>
   <script src="./js/game/GameView.js"></script>
   <script src="./js/rules/RulesView.js"></script>
   <!-- // <script src="./app.js"></script> -->
-  <script src="./bundle"></script>
+  <script src="./browserify-bundle.js"></script>
   <!-- // <script src="./dist/javascript-battle-website.min.js"></script> -->
 
 </body>