From eba52d34ebf603fa60d3e0079f7124030728f529 Mon Sep 17 00:00:00 2001 From: "Mr. Hyde" Date: Thu, 30 Apr 2015 01:16:55 +0200 Subject: [PATCH] - [grunt] replaced `grunt-shell` for Duo with `grunt-duojs` --- .gitignore | 3 +-- gruntfile.coffee | 4 ++-- package.json | 5 ++--- tasks/grunt-contrib-watch.coffee | 2 +- tasks/grunt-duojs.coffee | 13 +++++++++++++ tasks/grunt-shell.coffee | 12 ------------ 6 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 tasks/grunt-duojs.coffee delete mode 100644 tasks/grunt-shell.coffee diff --git a/.gitignore b/.gitignore index 078b0d98..d0dc0514 100644 --- a/.gitignore +++ b/.gitignore @@ -37,5 +37,4 @@ npm-debug.log build ## Temporary folder -temp -components \ No newline at end of file +temp \ No newline at end of file diff --git a/gruntfile.coffee b/gruntfile.coffee index 6aa70c43..0e6038ec 100644 --- a/gruntfile.coffee +++ b/gruntfile.coffee @@ -101,12 +101,12 @@ module.exports = (grunt) -> grunt.registerTask 'default', [ 'clean' 'copy:build' + 'duojs' 'nunjucks' 'sprite' 'webfont' 'sass' 'autoprefixer' - 'shell:duo' 'responsive_images:thumbnails' 'browserSync' 'watch' @@ -118,6 +118,7 @@ module.exports = (grunt) -> grunt.registerTask 'build', [ 'clean:build' 'copy:build' + 'duojs:build' 'nunjucks:build' 'sprite:build' 'webfont:build' @@ -125,7 +126,6 @@ module.exports = (grunt) -> 'autoprefixer:build' 'uncss:build' 'csso:build' - 'shell:duo' 'uglify:build' 'clean:styles' 'clean:temp' diff --git a/package.json b/package.json index 21906bb4..50da2554 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,10 @@ { "name": "Kotsu", - "version": "0.7.2", + "version": "0.7.3", "title": "Clean, opinionated foundation for new projects — to boldly go where no man has gone before", "author": "LotusTM", "private": true, "devDependencies": { - "duo": "^0.11.2", "gmsmith": "^0.5.0", "grunt": "^0.4.5", "grunt-autoprefixer": "^3.0.0", @@ -18,12 +17,12 @@ "grunt-contrib-uglify": "^0.9.1", "grunt-contrib-watch": "^0.6.1", "grunt-csso": "^0.7.1", + "grunt-duojs": "^0.1.2", "grunt-newer": "^1.1.0", "grunt-nunjucks-2-html": "^0.2.8", "grunt-processhtml": "^0.3.7", "grunt-responsive-images": "^0.1.6", "grunt-scss-lint": "^0.3.6", - "grunt-shell": "^1.1.2", "grunt-size-report": "^0.1.1", "grunt-spritesmith": "^4.5.3", "grunt-tinypng": "^0.5.3", diff --git a/tasks/grunt-contrib-watch.coffee b/tasks/grunt-contrib-watch.coffee index 9c2a8a3b..c4f59564 100644 --- a/tasks/grunt-contrib-watch.coffee +++ b/tasks/grunt-contrib-watch.coffee @@ -32,7 +32,7 @@ module.exports = -> tasks: ['nunjucks'] scripts: files: ['<%= path.source.scripts %>/{,**}*.js'] - tasks: ['shell:duo'] + tasks: ['duojs'] scss: files: [ '<%= path.source.styles %>/{,**/}*.scss' diff --git a/tasks/grunt-duojs.coffee b/tasks/grunt-duojs.coffee new file mode 100644 index 00000000..ab215e34 --- /dev/null +++ b/tasks/grunt-duojs.coffee @@ -0,0 +1,13 @@ +### +Duo +https://github.com/imyelo/grunt-duojs +Comlipe duo.js components +### +module.exports = (grunt) -> + @config 'duojs', + build: + options: + root: '<%= path.source.scripts %>' + entry: 'main.js' + installTo: '../../<%= path.temp.root %>' + buildTo: '../../<%= path.build.scripts %>' \ No newline at end of file diff --git a/tasks/grunt-shell.coffee b/tasks/grunt-shell.coffee deleted file mode 100644 index 2286654b..00000000 --- a/tasks/grunt-shell.coffee +++ /dev/null @@ -1,12 +0,0 @@ -### -Shell -https://github.com/sindresorhus/grunt-shell -Run shell commands -### -module.exports = -> - @config 'shell', - duo: - command: 'duo - -r <%= path.source.scripts %> - -o ./../../<%= path.build.scripts %> - main.js' \ No newline at end of file