Use generator-statisk's gulp generator

sondr3 · Jun 5, 2016 · df8f278 · df8f278
1 parent dd4a89e
commit df8f278
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 739 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -80,6 +80,11 @@ module.exports = generators.Base.extend({
       message: 'How do you want to upload your site?',
       choices: ['Amazon S3', 'Rsync', 'Github Pages', 'None'],
       store: true
+    }, {
+      name: 'babel',
+      type: 'confirm',
+      message: 'Compile your JS with Babel',
+      when: this.options.babel === undefined
     }, {
       name: 'jekyllPermalinks',
       type: 'list',
@@ -153,10 +158,11 @@ on Github](https://github.com/sondr3/generator-jekyllized).
 
     this.composeWith('jekyllized:gulp', {
       options: {
-        uploading: this.props.uploading
+        uploading: this.props.uploading,
+        babel: this.props.babel
       }
     }, {
-      local: require.resolve('../gulp')
+      local: require.resolve('generator-statisk/generators/gulp')
     });
 
     this.composeWith('jekyllized:jekyll', {
@@ -177,6 +183,7 @@ on Github](https://github.com/sondr3/generator-jekyllized).
 
   installing: function () {
     this.installDependencies({
+      bower: false,
       skipInstall: this.options['skip-install']
     });
     if (this.options['skip-install']) {

diff --git a/generators/gulp/USAGE b/generators/gulp/USAGE
diff --git a/generators/gulp/index.js b/generators/gulp/index.js
diff --git a/generators/gulp/templates/aws-credentials.json b/generators/gulp/templates/aws-credentials.json