diff --git a/README.md b/README.md index 4064382..ec09767 100644 --- a/README.md +++ b/README.md @@ -34,22 +34,6 @@ Go check the **[Dummy](https://github.com/Inouit/dummy)** to get a full list! - Add a task to check git HEAD before running any task. (grunt-git ?) -# Release notes - -- **1.1.3** : Upgraded to dummy 1.0.0 -- **1.1.2** : Upgraded to dummy 0.11.1 -- **1.1.0** : - - Transfered repository ownership to Inouit organisation - - Upgraded to dummy 0.11.0 -- **1.0.1** : - - Upgraded to dummy 0.10.1 - - Fixed a compatibility issue -- **1.0.0** : - - Dummy is now managed as a bower dependency - - bug fixes -- **0.2.0** : renamed *generator-dummy* to *generator-dummies* to publish to npm index -- **0.1.0** : *Dummy* is dead, long live *generator-dummy* - # Road map - split grunt tasks into files diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000..b16002a --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,29 @@ +# Release notes + +## 1.0 + +- **1.2.0** : + - Livereload is working again + - Open hostname is now using the connect parameter + - Server Hostname can now be overrided by the `--host` option + - Removed unused parameters in `bower.json` + - Switch task loading to load-grunt-task + - Moved release notes to the release.md file + +- **1.1.3** : Upgraded to dummy 1.0.0 +- **1.1.2** : Upgraded to dummy 0.11.1 +- **1.1.0** : + - Transfered repository ownership to Inouit organisation + - Upgraded to dummy 0.11.0 +- **1.0.1** : + - Upgraded to dummy 0.10.1 + - Fixed a compatibility issue + +- **1.0.0** : + - Dummy is now managed as a bower dependency + - bug fixes + +## Beta + +- **0.2.0** : renamed *generator-dummy* to *generator-dummies* to publish to npm index +- **0.1.0** : *Dummy* is dead, long live *generator-dummy* \ No newline at end of file diff --git a/app/index.js b/app/index.js index e2f4140..5f57368 100644 --- a/app/index.js +++ b/app/index.js @@ -52,6 +52,10 @@ DummiesGenerator.prototype.askFor = function askFor() { name: 'environment', message: 'Where are your putting it?', choices: [ + { + name: 'Scratch', + value: 'scratch' + }, { name: 'TYPO3', value: 'typo3' @@ -59,10 +63,6 @@ DummiesGenerator.prototype.askFor = function askFor() { { name: 'Symfony2', value: 'symfony2' - }, - { - name: 'Scratch', - value: 'scratch' } ] } diff --git a/app/templates/_gruntfile.coffee b/app/templates/_gruntfile.coffee index e4a4416..21b04c4 100644 --- a/app/templates/_gruntfile.coffee +++ b/app/templates/_gruntfile.coffee @@ -4,14 +4,13 @@ mountFolder = (connect, dir) -> connect.static require('path').resolve(dir) module.exports = (grunt) -> - require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks) + require('load-grunt-tasks')(grunt) grunt.initConfig # You can't run the docco task alone, coffeFiles & sassFiles don't chain. # You have to call them separatly. - docco: -<% if (CoffeeScript) { %> + docco:<% if (CoffeeScript) { %> coffeeFiles: files: src: ['js/src/*.coffee'] @@ -32,7 +31,6 @@ module.exports = (grunt) -> options: output: 'docs/sass/annotated-source' css: 'docs/assets/custom.css' - <% if (CoffeeScript) { %> coffee: build: @@ -45,7 +43,6 @@ module.exports = (grunt) -> dest: 'js' ext: '.js' <% } %> - sass: build: options: @@ -61,23 +58,22 @@ module.exports = (grunt) -> build: browsers: ["last 3 version", "ie 8", "ie 7"] src: 'css/main.css' - <% if (environment == "scratch") { %> connect: all: options: - hostname: "0.0.0.0" + hostname: grunt.option('host') || "0.0.0.0" port: grunt.option('port') || 0 livereload: grunt.option('liveport') || 35729 open: all: - path: 'http://localhost:<%%= connect.all.options.port%>/' + path: 'http://<%%= connect.all.options.hostname%>:<%%= connect.all.options.port%>/' <% } %> - watch: options: - livereload: grunt.option('liveport') || 35729 + livereload: + port: '<%%= connect.all.options.livereload%>' html: files:[ diff --git a/app/templates/_package.json b/app/templates/_package.json index 5f6016a..a856a81 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -13,6 +13,6 @@ <% } %> "grunt-notify": "~0.2.16", "grunt-contrib-watch": "*", - "matchdep": "*" + "load-grunt-tasks": "*" } } diff --git a/app/templates/bower_components/dummy/.bower.json b/app/templates/bower_components/dummy/.bower.json index f0f92aa..573427b 100644 --- a/app/templates/bower_components/dummy/.bower.json +++ b/app/templates/bower_components/dummy/.bower.json @@ -1,7 +1,7 @@ { "name": "dummy", "description": "A light Sass & coffee base front-end", - "version": "1.0.0", + "version": "1.0.1", "author": { "name": "Inouit", "url": "www.inouit.fr" @@ -27,11 +27,11 @@ "jscrollpane": "~2.0.0" }, "homepage": "https://github.com/in8/dummy", - "_release": "1.0.0", + "_release": "1.0.1", "_resolution": { "type": "version", - "tag": "1.0.0", - "commit": "dbe07506f4452a544502df4af5fd0556e27eddb5" + "tag": "1.0.1", + "commit": "dee68d62e218d5b6a1c4e1f444edb8685dcba60f" }, "_source": "git://github.com/in8/dummy.git", "_target": ">=1.0.0", diff --git a/app/templates/bower_components/dummy/README.md b/app/templates/bower_components/dummy/README.md index 7b47052..b442db3 100644 --- a/app/templates/bower_components/dummy/README.md +++ b/app/templates/bower_components/dummy/README.md @@ -20,42 +20,6 @@ Go check the Yeoman's [generator](https://github.com/Inouit/generator-dummy) ! - Some jQuery plugins helpers ready to use -# Release notes - -- **1.0.0** : - - Reworked column system, column mixin added - - Added support of inline-block for ie7 - - Added print.scss to handle print layout -- **0.11.1** : Added step classes to fixToTop jquery plugin -- **0.11.0** : Transfered repository ownership to Inouit organisation -- **0.10.1** : - - Added grunt configuration to enable stand alone use - - Removed compiled javascript files from gitignore to keep compatibility with generator-dummies -- **0.10.0** : - - A slice & content max width management improved ( ie8 fallback) - - A fallback added for inline-block on Internet Explorer < 8 -- **0.9.0** : *Dummy* is dead, long live *generator-dummy* -- **0.8.3** : Removed generated documentation from repository -- **0.8.2** : Added notifications to tasks -- **0.8.1** : fixed a regression from 0.8.0 -- **0.8.0** : - - Changed server task to serve (best practice) - - Switched default port to 0 to enable simple multiple server running simultaneously -- **0.7.0** : Documentation build is now automated -- **0.6.1** : Moved examples from index.html to demo/index.html -- **0.6.0** : - - Removed livereload script from html, you must use a browser extension listenning port 35729 - - Until generator is built, a gruntFile for typo3 has been added -- **0.5.1** : Improved documentation -- **0.5.0** : Sourcemapping for sass & coffescript files enabled -- **0.3.0** : Vendors prefixe are now automatically added to the main.css file -- **0.4.0** : The default grunt task now build coffeescript annotated sources -- **0.2.0** : Reworked grid system : You can now use *class="column column-value"* in any wrapper to get your columns right -- **0.1.0** : First Sass & Coffe version of the Dummy - -#Kown issues - - # Tree css diff --git a/app/templates/bower_components/dummy/RELEASE.md b/app/templates/bower_components/dummy/RELEASE.md new file mode 100644 index 0000000..2b06c72 --- /dev/null +++ b/app/templates/bower_components/dummy/RELEASE.md @@ -0,0 +1,39 @@ +# Release notes + +## 1.0 + +- **1.0.0** : + - Reworked column system, column mixin added + - Added support of inline-block for ie7 + - Added print.scss to handle print layout + + +## Beta + +- **0.11.1** : Added step classes to fixToTop jquery plugin +- **0.11.0** : Transfered repository ownership to Inouit organisation +- **0.10.1** : + - Added grunt configuration to enable stand alone use + - Removed compiled javascript files from gitignore to keep compatibility with generator-dummies +- **0.10.0** : + - A slice & content max width management improved ( ie8 fallback) + +## Alpha +- **0.9.0** : *Dummy* is dead, long live *generator-dummy* +- **0.8.3** : Removed generated documentation from repository +- **0.8.2** : Added notifications to tasks +- **0.8.1** : fixed a regression from 0.8.0 +- **0.8.0** : + - Changed server task to serve (best practice) + - Switched default port to 0 to enable simple multiple server running simultaneously +- **0.7.0** : Documentation build is now automated +- **0.6.1** : Moved examples from index.html to demo/index.html +- **0.6.0** : + - Removed livereload script from html, you must use a browser extension listenning port 35729 + - Until generator is built, a gruntFile for typo3 has been added +- **0.5.1** : Improved documentation +- **0.5.0** : Sourcemapping for sass & coffescript files enabled +- **0.3.0** : Vendors prefixe are now automatically added to the main.css file +- **0.4.0** : The default grunt task now build coffeescript annotated sources +- **0.2.0** : Reworked grid system : You can now use *class="column column-value"* in any wrapper to get your columns right +- **0.1.0** : First Sass & Coffe version of the Dummy \ No newline at end of file diff --git a/app/templates/bower_components/dummy/css/src/mixins.scss b/app/templates/bower_components/dummy/css/src/mixins.scss index 607a50f..b7350f4 100644 --- a/app/templates/bower_components/dummy/css/src/mixins.scss +++ b/app/templates/bower_components/dummy/css/src/mixins.scss @@ -28,7 +28,7 @@ @mixin inline-block { display: inline-block; } // Emulate background sizing for Internet Explorer 8 -@mixin backgound-size( $size... ) { +@mixin background-size( $size... ) { background-size: $size; -ms-behavior: url(/backgroundsize.min.htc); } diff --git a/app/templates/bower_components/modernizr/.bower.json b/app/templates/bower_components/modernizr/.bower.json index 9846527..0b4c3c2 100644 --- a/app/templates/bower_components/modernizr/.bower.json +++ b/app/templates/bower_components/modernizr/.bower.json @@ -1,12 +1,12 @@ { "name": "modernizr", "homepage": "https://github.com/Modernizr/Modernizr", - "version": "2.7.1", - "_release": "2.7.1", + "version": "2.7.2", + "_release": "2.7.2", "_resolution": { "type": "version", - "tag": "v2.7.1", - "commit": "54252c10fc7d3b8b17cf458c401ca904dc354d8c" + "tag": "v2.7.2", + "commit": "6d98eaa785207ed8e20dffe311df0bab49e464d8" }, "_source": "git://github.com/Modernizr/Modernizr.git", "_target": "*", diff --git a/app/templates/bower_components/modernizr/grunt.js b/app/templates/bower_components/modernizr/grunt.js index 68c345d..21179fa 100644 --- a/app/templates/bower_components/modernizr/grunt.js +++ b/app/templates/bower_components/modernizr/grunt.js @@ -4,7 +4,7 @@ module.exports = function( grunt ) { grunt.initConfig({ meta: { - version: '2.7.1', + version: '2.7.2', banner: '/*!\n' + ' * Modernizr v<%= meta.version %>\n' + ' * www.modernizr.com\n *\n' + diff --git a/app/templates/bower_components/modernizr/modernizr.js b/app/templates/bower_components/modernizr/modernizr.js index 07ea93f..6829dc3 100644 --- a/app/templates/bower_components/modernizr/modernizr.js +++ b/app/templates/bower_components/modernizr/modernizr.js @@ -1,5 +1,5 @@ /*! - * Modernizr v2.7.1 + * Modernizr v2.7.2 * www.modernizr.com * * Copyright (c) Faruk Ates, Paul Irish, Alex Sexton @@ -24,7 +24,7 @@ window.Modernizr = (function( window, document, undefined ) { - var version = '2.7.1', + var version = '2.7.2', Modernizr = {}, @@ -605,7 +605,7 @@ window.Modernizr = (function( window, document, undefined ) { // Note, Android < 4 will pass this test, but can only animate // a single property at a time - // daneden.me/2011/12/putting-up-with-androids-bullshit/ + // goo.gl/v3V4Gp tests['cssanimations'] = function() { return testPropsAll('animationName'); }; diff --git a/bower.json b/bower.json index df16228..098abb3 100644 --- a/bower.json +++ b/bower.json @@ -1,34 +1,5 @@ { "name": "generator-dummies", - "description": "a dummy generator - light Sass & coffee front-end base", - "version": "1.1.3", - "author": { - "name": "Inouit", - "url": "www.inouit.fr" - }, - "contributors": [ - "Plou (http://plou.github.io/)", - "Gregcop1 ", - "Toofff (http://yanoucrea.fr)", - "Shatimes (http://www.shatimes.fr)", - "JViste " - ], - "keywords": [ - "yeoman-generator", - "front-end", - "grid", - "coffeescript", - "sass", - "inouit" - ], - "main": "app/index.js", - "repository": { - "type": "git", - "url": "https://github.com/Inouit/generator-dummies.git" - }, - "bugs": { - "url": "https://github.com/Inouit/generator-dummies/issues" - }, "dependencies": { "dummy": ">=1.0.0" } diff --git a/package.json b/package.json index 91efe3f..92b2b11 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "generator-dummies", "description": "a dummy generator - light Sass & coffee front-end base", - "version": "1.1.3", + "version": "1.2.0", "author": { "name": "Inouit", "url": "www.inouit.fr"