Skip to content

feat(gen): remove CoffeeScript #1287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,11 @@ export default class Generator extends Base {
type: 'list',
name: 'script',
message: 'What would you like to write scripts with?',
choices: [ 'JavaScript', 'JavaScript + Babel', 'CoffeeScript'],
choices: [ 'JavaScript', 'JavaScript + Babel'],
filter: function( val ) {
return {
'JavaScript': 'js',
'JavaScript + Babel': 'babel',
'CoffeeScript': 'coffee'
'JavaScript + Babel': 'babel'
}[val];
}
}, {
Expand Down Expand Up @@ -340,7 +339,6 @@ export default class Generator extends Base {
if(this.filters.ngroute) filters.push('ngroute');
if(this.filters.uirouter) filters.push('uirouter');
if(this.filters.babel) extensions.push('babel');
if(this.filters.coffee) extensions.push('coffee');
if(this.filters.js) extensions.push('js');
if(this.filters.html) extensions.push('html');
if(this.filters.jade) extensions.push('jade');
Expand Down
1 change: 0 additions & 1 deletion app/templates/.buildignore
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
*.coffee
34 changes: 3 additions & 31 deletions app/templates/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,6 @@ module.exports = function (grunt) {
jade: {
files: ['<%%= yeoman.client %>/{app,components}/**/*.jade'],
tasks: ['jade']
},<% } if (filters.coffee) { %>
coffee: {
files: ['<%%= yeoman.client %>/{app,components}/**/!(*.spec).{coffee,litcoffee,coffee.md}'],
tasks: ['newer:coffee', 'injector:scripts']
},
coffeeTest: {
files: ['<%%= yeoman.client %>/{app,components}/**/*.spec.{coffee,litcoffee,coffee.md}'],
tasks: ['karma']
},<% } %>
gruntfile: {
files: ['Gruntfile.js']
Expand Down Expand Up @@ -431,16 +423,14 @@ module.exports = function (grunt) {

// Run some tasks in parallel to speed up the build process
concurrent: {
server: [<% if(filters.coffee) { %>
'coffee',<% } if(filters.babel) { %>
server: [<% if(filters.babel) { %>
'newer:babel:client',<% } if(filters.jade) { %>
'jade',<% } if(filters.stylus) { %>
'stylus',<% } if(filters.sass) { %>
'sass',<% } if(filters.less) { %>
'less',<% } %>
],
test: [<% if(filters.coffee) { %>
'coffee',<% } if(filters.babel) { %>
test: [<% if(filters.babel) { %>
'newer:babel:client',<% } if(filters.jade) { %>
'jade',<% } if(filters.stylus) { %>
'stylus',<% } if(filters.sass) { %>
Expand All @@ -456,8 +446,7 @@ module.exports = function (grunt) {
logConcurrentOutput: true
}
},
dist: [<% if(filters.coffee) { %>
'coffee',<% } if(filters.babel) { %>
dist: [<% if(filters.babel) { %>
'newer:babel:client',<% } if(filters.jade) { %>
'jade',<% } if(filters.stylus) { %>
'stylus',<% } if(filters.sass) { %>
Expand Down Expand Up @@ -565,23 +554,6 @@ module.exports = function (grunt) {
ext: '.html'
}]
}
},<% } if (filters.coffee) { %>

// Compiles CoffeeScript to JavaScript
coffee: {
options: {
sourceMap: true,
sourceRoot: ''
},
server: {
files: [{
expand: true,
cwd: 'client',
src: ['{app,components}/**/!(*.spec).coffee'],
dest: '.tmp',
ext: '.js'
}]
}
},<% } %>

// Compiles ES6 to JavaScript using Babel
Expand Down
4 changes: 1 addition & 3 deletions app/templates/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
"grunt-contrib-imagemin": "^0.9.4",
"grunt-contrib-jshint": "~0.11.2",
"grunt-contrib-uglify": "^0.9.1",
"grunt-contrib-watch": "~0.6.1",<% if (filters.coffee) { %>
"grunt-contrib-coffee": "^0.13.0",<% } %><% if (filters.jade) { %>
"grunt-contrib-watch": "~0.6.1",<% if (filters.jade) { %>
"grunt-contrib-jade": "^0.15.0",<% } %><% if (filters.less) { %>
"grunt-contrib-less": "^1.0.0",<% } %><% if(filters.babel) { %>
"karma-babel-preprocessor": "^5.2.1",
Expand Down Expand Up @@ -99,7 +98,6 @@
"karma-chrome-launcher": "~0.2.0",
"requirejs": "~2.1.11",
"karma-requirejs": "~0.2.2",
"karma-coffee-preprocessor": "~0.3.0",
"karma-jade-preprocessor": "0.0.11",
"karma-phantomjs-launcher": "~0.2.0",
"karma": "~0.13.3",
Expand Down
59 changes: 0 additions & 59 deletions app/templates/client/app/account(auth)/account(coffee).coffee

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions app/templates/client/app/admin(auth)/admin(coffee).coffee

This file was deleted.

This file was deleted.

42 changes: 0 additions & 42 deletions app/templates/client/app/app(coffee).coffee

This file was deleted.

15 changes: 0 additions & 15 deletions app/templates/client/app/main/main(coffee).coffee

This file was deleted.

22 changes: 0 additions & 22 deletions app/templates/client/app/main/main.controller(coffee).coffee

This file was deleted.

32 changes: 0 additions & 32 deletions app/templates/client/app/main/main.controller.spec(coffee).coffee

This file was deleted.

Loading