Skip to content
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.

Sign up for GitHub

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

Drop CoffeeScript #1380

Merged
merged 9 commits into from
Jun 13, 2017
Merged

Drop CoffeeScript #1380

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ff92667
Drop CoffeeScript
lipis Jun 12, 2017
ee4256e
Remove coffee lint
lipis Jun 12, 2017
db8189b
Merge branch 'dev' into drop-coffee
lipis Jun 12, 2017
3371d48
Merge branch 'dev' into drop-coffee
lipis Jun 12, 2017
320536f
Fixed drop
lipis Jun 12, 2017
94bd48f
Merge branch 'dev' into drop-coffee
lipis Jun 13, 2017
d33c327
Merge branch 'dev' into drop-coffee
lipis Jun 13, 2017
9cad5c9
Merge branch 'dev' into drop-coffee
lipis Jun 13, 2017
176fa5c
Merge branch 'dev' into drop-coffee
lipis Jun 13, 2017
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
3 changes: 0 additions & 3 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ module.exports = (grunt) => {
aws_s3: require('./grunt/config/aws_s3'),
bower: require('./grunt/config/bower'),
clean: require('./grunt/config/clean'),
coffee: require('./grunt/config/coffee'),
coffeelint: require('./grunt/config/coffeelint'),
compress: require('./grunt/config/compress'),
concat: require('./grunt/config/concat'),
connect: require('./grunt/config/connect'),
Expand Down Expand Up @@ -138,7 +136,6 @@ module.exports = (grunt) => {
grunt.config('karma.options.reporters', ['progress']);
grunt.task.run([
'scripts',
'newer:coffee:dist',
'newer:copy:dist_js',
`test_prepare:${test_name}`,
'karma:test',
Expand Down
161 changes: 0 additions & 161 deletions coffeelint.json
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions grunt/config/coffee.js
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions grunt/config/coffeelint.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions grunt/config/todo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ module.exports = {
},

src: [
'<%= dir.app_ %>/**/*.coffee',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add the js files instead. Otherwise the whole task is pointless.

'<%= dir.app_ %>/**/*.js',
'<%= dir.app.style %>/**/*.less',
'<%= dir.test.unit_tests %>/**/*.coffee',
'<%= dir.test_ %>/**/*.js',
],
};
7 changes: 0 additions & 7 deletions grunt/config/watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@
// https://github.com/gruntjs/grunt-contrib-watch

module.exports = {
coffee: {
files: ['<%= dir.app_ %>/**/*.coffee', 'sw.js'],
options: {
spawn: false,
},
tasks: ['coffee:dist'],
},
js: {
files: '<%= dir.app_ %>/**/*.js',
tasks: ['newer:copy:dist_js'],
Expand Down
7 changes: 1 addition & 6 deletions grunt/tasks/misc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ module.exports = (grunt) => {

grunt.registerTask('prepare_dist', [
'clean:dist',
'coffee:dist',
'less:dist',
'postcss:distribution',
'copy:dist',
Expand All @@ -74,8 +73,6 @@ module.exports = (grunt) => {

grunt.registerTask('prepare_staging', [
'clean:deploy',
'coffeelint:deploy',
'coffee:deploy',
'less:deploy',
'postcss:deploy',
'copy:deploy',
Expand All @@ -92,7 +89,6 @@ module.exports = (grunt) => {

grunt.registerTask('prepare_prod', [
'clean:deploy',
'coffee:deploy',
'less:deploy',
'postcss:deploy',
'copy:deploy',
Expand All @@ -113,11 +109,10 @@ module.exports = (grunt) => {

if (file !== undefined) {
const files = [file];
grunt.config('coffeelint.deploy.files.src', files);
grunt.config('todo.src', files);
}

grunt.task.run(['coffeelint:deploy', 'todo']);
grunt.task.run(['todo']);
});

return grunt.registerTask('host', function(port, open = true) {
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
// Do not write files or patterns here. Put them in grunt/config/karma.coffee
// Do not write files or patterns here. Put them in grunt/config/karma.js
],

proxies: {},
Expand Down
3 changes: 0 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
"license": "LicenseRef-LICENSE",
"devDependencies": {
"autoprefixer": "7.1.1",
"coffeelint": "1.16.0",
"eslint": "3.19.0",
"eslint-plugin-jsdoc": "3.1.0",
"grunt": "1.0.1",
"grunt-aws-s3": "1.0.0",
"grunt-bower-task": "0.4.0",
"grunt-cli": "1.2.0",
"grunt-coffeelint": "0.0.16",
"grunt-contrib-clean": "1.1.0",
"grunt-contrib-coffee": "1.0.0",
"grunt-contrib-compress": "1.4.3",
"grunt-contrib-concat": "1.0.1",
"grunt-contrib-connect": "1.0.2",
Expand Down
Loading