Skip to content

Commit

Permalink
cleaned out old dependicies from gruntfile
Browse files Browse the repository at this point in the history
  • Loading branch information
atruskie committed Nov 13, 2013
1 parent e9aa68e commit fd1e641
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 71 deletions.
69 changes: 1 addition & 68 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-coffee');
grunt.loadNpmTasks('grunt-conventional-changelog');
grunt.loadNpmTasks('grunt-bump');
grunt.loadNpmTasks('grunt-coffeelint');
/*grunt.loadNpmTasks('grunt-recess');*/
// grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-sass');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-ngmin');
Expand Down Expand Up @@ -305,26 +301,6 @@ module.exports = function (grunt) {
}
},

/**
* `grunt coffee` compiles the CoffeeScript sources. To work well with the
* rest of the build, we have a separate compilation task for sources and
* specs so they can go to different places. For example, we need the
* sources to live with the rest of the copied JavaScript so we can include
* it in the final build, but we don't want to include our specs there.
*/
coffee: {
source: {
options: {
bare: true
},
expand: true,
cwd: '.',
src: [ '<%= app_files.coffee %>' ],
dest: '<%= build_dir %>',
ext: '.js'
}
},

/**
* `ng-min` annotates the sources before minifying. That is, it allows us
* to code without the array syntax.
Expand Down Expand Up @@ -473,24 +449,6 @@ module.exports = function (grunt) {
globals: {}
},

/**
* `coffeelint` does the same as `jshint`, but for CoffeeScript.
* CoffeeScript is not the default in ngBoilerplate, so we're just using
* the defaults here.
*/
coffeelint: {
src: {
files: {
src: [ '<%= app_files.coffee %>' ]
}
},
test: {
files: {
src: [ '<%= app_files.coffeeunit %>' ]
}
}
},

/**
* HTML2JS is a Grunt plugin that takes all of your template files and
* places them into JavaScript files as strings that are added to
Expand Down Expand Up @@ -672,17 +630,6 @@ module.exports = function (grunt) {
tasks: [ 'jshint:src', 'karma:unit:run', 'copy:build_appjs' ]
},

/**
* When our CoffeeScript source files change, we want to run lint them and
* run our unit tests.
*/
//coffeesrc: {
// files: [
// '<%= app_files.coffee %>'
// ],
// tasks: [ 'coffeelint:src', 'coffee:source', 'karma:unit:run', 'copy:build_appjs' ]
//},

/**
* When assets are changed, copy them. Note that this will *not* copy new
* files, so this is probably not very useful.
Expand Down Expand Up @@ -737,20 +684,6 @@ module.exports = function (grunt) {
options: {
livereload: false
}
},

/**
* When a CoffeeScript unit test file changes, we only want to lint it and
* run the unit tests. We don't want to do any live reloading.
*/
coffeeunit: {
files: [
'<%= app_files.coffeeunit %>'
],
tasks: [ 'coffeelint:test', 'karma:unit:run' ],
options: {
livereload: false
}
}
}

Expand Down Expand Up @@ -779,7 +712,7 @@ module.exports = function (grunt) {
* The `build` task gets your app ready to run for development and testing.
*/
grunt.registerTask('build', [
'clean', 'html2js', 'jshint', 'coffeelint', 'coffee', /*'recess:build',*/ 'sass:build',
'clean', 'html2js', 'jshint', 'sass:build',
'concat:build_css', 'copy:build_app_assets', 'copy:build_vendor_assets',
'copy:build_appjs', 'copy:build_vendorjs', 'index:build', 'karmaconfig',
'karma:continuous'
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/QutBioacoustics/baw-client.git"
},
"//": "THE karma-chrome-launcher IS NEEDED TO LAUCH CHROME PROPERLY ON WINDOWS. REMOVE WHEN PULL REQUEST COMPLETED https://github.com/karma-runner/karma-chrome-launcher",
"//": "THE karma-chrome-launcher IS NEEDED TO LAUNCH CHROME PROPERLY ON WINDOWS. REMOVE WHEN PULL REQUEST COMPLETED https://github.com/karma-runner/karma-chrome-launcher",
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-clean": "~0.4.1",
Expand All @@ -25,8 +25,6 @@
"karma-chrome-launcher": "https://github.com/EE/karma-chrome-launcher/tarball/windows",
"grunt-ngmin": "0.0.2",
"grunt-html2js": "~0.1.3",
"grunt-contrib-coffee": "~0.7.0",
"grunt-coffeelint": "0.0.6",
"grunt-conventional-changelog": "~0.1.1",
"grunt-bump": "0.0.6",
"grunt-contrib-connect": "~0.5.0",
Expand Down

0 comments on commit fd1e641

Please sign in to comment.