From 3cfed17c2f1ab5b5c51cfaffff49cb8b07adc40f Mon Sep 17 00:00:00 2001 From: wiherek5 Date: Mon, 3 Mar 2014 20:25:35 +0100 Subject: [PATCH] 2-spaces indentation, added vendor folder with README.md, updated Gruntfile with copy:vendor , added placeholders for vendor files in index.html --- .editorconfig | 2 +- .jshintrc | 2 +- templates/common/Gruntfile.js | 8 ++++++++ templates/common/root/.editorconfig | 2 +- templates/common/root/.jshintrc | 2 +- templates/common/root/app/vendor/README.md | 15 +++++++++++++++ templates/views/index.html | 8 ++++++++ 7 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 templates/common/root/app/vendor/README.md diff --git a/.editorconfig b/.editorconfig index c308ed0..e717f5e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,7 +3,7 @@ root = true [*] indent_style = space -indent_size = 4 +indent_size = 2 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true diff --git a/.jshintrc b/.jshintrc index fa51fc3..da64b6e 100644 --- a/.jshintrc +++ b/.jshintrc @@ -6,7 +6,7 @@ "curly": true, "eqeqeq": true, "immed": true, - "indent": 4, + "indent": 2, "latedef": true, "newcap": true, "noarg": true, diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js index 5d8a3ec..a53fcf4 100644 --- a/templates/common/Gruntfile.js +++ b/templates/common/Gruntfile.js @@ -231,6 +231,12 @@ module.exports = function (grunt) { cwd: '<%%= yeoman.app %>/styles', dest: '.tmp/styles/', src: '{,*/}*.css' + }, + vendor: { + expand: true, + cwd: '<%%= yeoman.app %>/vendor', + dest: '.tmp/styles/', + src: '{,*/}*.css' } }, @@ -300,6 +306,7 @@ module.exports = function (grunt) { 'clean:server', 'bower-install', 'concurrent:server', + 'copy:vendor', 'autoprefixer', 'connect:livereload', 'watch' @@ -311,6 +318,7 @@ module.exports = function (grunt) { 'bower-install', 'useminPrepare', 'concurrent:dist', + 'copy:vendor', 'autoprefixer', 'concat', 'copy:dist', diff --git a/templates/common/root/.editorconfig b/templates/common/root/.editorconfig index c308ed0..e717f5e 100644 --- a/templates/common/root/.editorconfig +++ b/templates/common/root/.editorconfig @@ -3,7 +3,7 @@ root = true [*] indent_style = space -indent_size = 4 +indent_size = 2 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true diff --git a/templates/common/root/.jshintrc b/templates/common/root/.jshintrc index fa51fc3..da64b6e 100644 --- a/templates/common/root/.jshintrc +++ b/templates/common/root/.jshintrc @@ -6,7 +6,7 @@ "curly": true, "eqeqeq": true, "immed": true, - "indent": 4, + "indent": 2, "latedef": true, "newcap": true, "noarg": true, diff --git a/templates/common/root/app/vendor/README.md b/templates/common/root/app/vendor/README.md new file mode 100644 index 0000000..bb2831d --- /dev/null +++ b/templates/common/root/app/vendor/README.md @@ -0,0 +1,15 @@ +# Why a vendor folder? + +In the past week, I had two independent occasions, where I needed to manually add JS / CSS files. The first time, with [MomentJS](http://momentjs.com/) the repo was even available through bower, but it included distinct versions of the library: a regular, a minified version, a version with languages, languages minified, and bower does not seem to have the option to choose one. + +The second time it was with a ionic specific repo, [ionic-contrib-frosted-glass](https://github.com/driftyco/ionic-contrib-frosted-glass) That one basically did not have a bower version. + +To make it easy, I added a vendor folder with Grunt support. + +## How does it work + +Really simple :) Both JS and CSS files can be added here. The CSS files will be copied to .tmp folder by the copy:vendor Grunt task. There, they will be processed by the autoprefixer task. The JS files are not processed at the moment. The files need to be inserted manually into index.html, I created wrappers. + +## How to disable + +When there is no file in the vendor folder, nothing happens. The Grunt task copy:vendor can also be removed from grunt serve and grunt build tasks. \ No newline at end of file diff --git a/templates/views/index.html b/templates/views/index.html index 1ad885e..ad9a1eb 100644 --- a/templates/views/index.html +++ b/templates/views/index.html @@ -8,6 +8,10 @@ + + + + @@ -48,6 +52,10 @@ + + + +