Use lodash by default

yeoman · May 10, 2014 · f7b0941 · f7b0941
1 parent e8a49e7
commit f7b0941
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/app/index.js b/app/index.js
@@ -72,7 +72,7 @@ Generator.prototype.askFor = function askFor() {
       value: 'coffee',
       checked: this.options.coffee || false
     }, {
-      name: 'Use RequireJs',
+      name: 'Use RequireJS',
       value: 'requirejs',
       checked: this.options.requirejs || false
     }]
@@ -89,7 +89,6 @@ Generator.prototype.askFor = function askFor() {
     this.includeRequireJS = hasFeature('requirejs');
     this.config.set('compassBootstrap', this.compassBootstrap);
 
-
     if (!this.options.coffee) {
       this.options.coffee = hasFeature('coffee');
       this.config.set('coffee', this.options.coffee);
@@ -99,6 +98,7 @@ Generator.prototype.askFor = function askFor() {
       this.options.requirejs = this.includeRequireJS;
       this.config.set('includeRequireJS', this.includeRequireJS);
     }
+
     cb();
   }.bind(this));
 };
@@ -151,7 +151,7 @@ Generator.prototype.writeIndex = function writeIndex() {
 
   var vendorJS = [
     'bower_components/jquery/dist/jquery.js',
-    'bower_components/underscore/underscore.js',
+    'bower_components/lodash/dist/lodash.js',
     'bower_components/backbone/backbone.js'
   ];
 

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -160,7 +160,7 @@ module.exports = function (grunt) {
                     specs : 'test/spec/**/*.js',
                     vendor : [
                         '<%%= yeoman.app %>/bower_components/jquery/dist/jquery.js',
-                        '<%%= yeoman.app %>/bower_components/underscore/underscore.js',
+                        '<%%= yeoman.app %>/bower_components/lodash/dist/lodash.js',
                         '<%%= yeoman.app %>/bower_components/backbone/backbone.js',
                         '.tmp/scripts/templates.js'
                     ]
@@ -217,7 +217,7 @@ module.exports = function (grunt) {
                     paths: {
                         'templates': '../../.tmp/scripts/templates',
                         'jquery': '../../<%%= yeoman.app %>/bower_components/jquery/dist/jquery',
-                        'underscore': '../../<%%= yeoman.app %>/bower_components/underscore/underscore',
+                        'underscore': '../../<%%= yeoman.app %>/bower_components/lodash/dist/lodash',
                         'backbone': '../../<%%= yeoman.app %>/bower_components/backbone/backbone'
                     },
                     // TODO: Figure out how to make sourcemaps work with grunt-usemin

diff --git a/app/templates/_bower.json b/app/templates/_bower.json
@@ -4,7 +4,7 @@
   "dependencies": {<% if (compassBootstrap) { %>
     "sass-bootstrap": "~3.0.2",<% } %>
     "jquery": "~2.1.0",
-    "underscore": "~1.6.0",
+    "lodash": "~2.4.1",
     "backbone": "~1.1.0",<% if (includeRequireJS) { %>
     "requirejs": "~2.1.10",
     "requirejs-text": "~2.0.10",<% } %>

diff --git a/templates/coffeescript/requirejs/main.coffee b/templates/coffeescript/requirejs/main.coffee
@@ -11,7 +11,7 @@ require.config
   paths:
     jquery: '../bower_components/jquery/dist/jquery'
     backbone: '../bower_components/backbone/backbone'
-    underscore: '../bower_components/underscore/underscore'<% if (compassBootstrap) { %>
+    underscore: '../bower_components/lodash/dist/lodash'<% if (compassBootstrap) { %>
     bootstrap: '../bower_components/sass-bootstrap/dist/js/bootstrap'<% } %><% if (templateFramework === 'handlebars') { %>
     handlebars: '../bower_components/handlebars/handlebars'<% } %>
 

diff --git a/templates/requirejs/main.js b/templates/requirejs/main.js
@@ -14,7 +14,7 @@ require.config({
     paths: {
         jquery: '../bower_components/jquery/dist/jquery',
         backbone: '../bower_components/backbone/backbone',
-        underscore: '../bower_components/underscore/underscore'<% if (compassBootstrap) { %>,
+        underscore: '../bower_components/lodash/dist/lodash'<% if (compassBootstrap) { %>,
         bootstrap: '../bower_components/sass-bootstrap/dist/js/bootstrap'<% } %><% if (templateFramework === 'handlebars') { %>,
         handlebars: '../bower_components/handlebars/handlebars'<% } %>
     }