remove coffeescript in default scaffold

yeoman · Jan 30, 2014 · d5ac3da · d5ac3da
1 parent c9385e4
commit d5ac3da
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -31,15 +31,15 @@ module.exports = function (grunt) {
             options: {
                 nospawn: true,
                 livereload: true
-            },
+            },<% if (options.coffee) { %>
             coffee: {
                 files: ['<%%= yeoman.app %>/scripts/{,*/}*.coffee'],
                 tasks: ['coffee:dist']
             },
             coffeeTest: {
                 files: ['test/spec/{,*/}*.coffee'],
                 tasks: ['coffee:test']
-            },<% if (compassBootstrap) { %>
+            },<% } %><% if (compassBootstrap) { %>
             compass: {
                 files: ['<%%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
                 tasks: ['compass']
@@ -166,7 +166,7 @@ module.exports = function (grunt) {
                     ]
                 }
             }
-        }<% } %>,
+        }<% } %>,<% if (options.coffee) { %>
         coffee: {
             dist: {
                 files: [{
@@ -188,7 +188,7 @@ module.exports = function (grunt) {
                     ext: '.js'
                 }]
             }
-        },<% if (compassBootstrap) { %>
+        },<% } %><% if (compassBootstrap) { %>
         compass: {
             options: {
                 sassDir: '<%%= yeoman.app %>/styles',
@@ -366,9 +366,9 @@ module.exports = function (grunt) {
         grunt.file.write('.tmp/scripts/templates.js', 'this.JST = this.JST || {};');
     });
 
-    grunt.registerTask('server', function () {
+    grunt.registerTask('server', function (target) {
         grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.');
-        grunt.task.run(['serve:' + target]);
+        grunt.task.run(['serve' + (target ? ':' + target : '')]);
     });
 
     grunt.registerTask('serve', function (target) {
@@ -378,8 +378,8 @@ module.exports = function (grunt) {
 
         if (target === 'test') {
             return grunt.task.run([
-                'clean:server',
-                'coffee',
+                'clean:server',<% if (options.coffee) { %>
+                'coffee',<% } %>
                 'createDefaultTemplate',<% if (templateFramework === 'mustache' ) { %>
                 'mustache',<% } else if (templateFramework === 'handlebars') { %>
                 'handlebars',<% } else { %>
@@ -392,24 +392,24 @@ module.exports = function (grunt) {
         }
 
         grunt.task.run([
-            'clean:server',
-            'coffee:dist',
+            'clean:server',<% if (options.coffee) { %>
+            'coffee:dist',<% } %>
             'createDefaultTemplate',<% if (templateFramework === 'mustache') { %>
             'mustache',<% } else if (templateFramework === 'handlebars') { %>
             'handlebars',<% } else { %>
             'jst',<% } %><% if (compassBootstrap) { %>
             'compass:server',<% } %>
             'connect:livereload',
             'open:server',
-            'watch'
+            'focus:server'
         ]);
     });
 
     grunt.registerTask('test', function (isConnected) {
         isConnected = Boolean(isConnected);
         var testTasks = [
-                'clean:server',
-                'coffee',
+                'clean:server',<% if (options.coffee) { %>
+                'coffee',<% } %>
                 'createDefaultTemplate',<% if (templateFramework === 'mustache' ) { %>
                 'mustache',<% } else if (templateFramework === 'handlebars') { %>
                 'handlebars',<% } else { %>
@@ -431,8 +431,8 @@ module.exports = function (grunt) {
     });
 
     grunt.registerTask('build', [
-        'clean:dist',
-        'coffee',
+        'clean:dist',<% if (options.coffee) { %>
+        'coffee',<% } %>
         'createDefaultTemplate',<% if (templateFramework === 'mustache' ) { %>
         'mustache',<% } else if (templateFramework === 'handlebars') { %>
         'handlebars',<% } else { %>

diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -5,8 +5,8 @@
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-copy": "~0.4.0",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-coffee": "~0.7.0",<% if (templateFramework === 'mustache') { %>
+    "grunt-contrib-concat": "~0.3.0",<% if (options.coffee) { %>
+    "grunt-contrib-coffee": "~0.7.0",<% } %><% if (templateFramework === 'mustache') { %>
     "grunt-mustache": "~0.1.4",<% } else if (templateFramework === 'handlebars') { %>
     "grunt-contrib-handlebars": "~0.5.8",<% } else { %>
     "grunt-contrib-jst": "~0.5.0",<% } %>
@@ -34,4 +34,4 @@
   "engines": {
     "node": ">=0.8.0"
   }
-}
+}