merge

Author: aleks-coderiver

.gitignore

@@ -31,4 +31,5 @@ node_modules
 
 # Other
 npm-debug.log
-.idea
+.idea
+generators/app/templates/gulp_old/

generators/app/index.js

@@ -41,7 +41,10 @@ module.exports = class extends Generator {
 
   install () {
     if (this.props.install) {
-      this.installDependencies();
+      this.installDependencies({
+        bower: false,
+        npm: true
+      });
     } else {
       this.log('Run ' + chalk.blue('npm install') + ' to install dependencies later');
     }

generators/app/prompts.js

@@ -16,18 +16,22 @@ module.exports = [
         name: 'Nunjucks',
         value: 'nunjucks'
       },
+      // {
+      //   name: 'Swig',
+      //   value: 'swig'
+      // },
+      // {
+      //   name: 'Jade',
+      //   value: 'jade'
+      // },
       {
-        name: 'Swig',
-        value: 'swig'
+        name: 'Pug',
+        value: 'pug'
       },
-      {
-        name: 'Jade',
-        value: 'jade'
-      },
-      {
-        name: 'No templates, just pure html',
-        value: 'html'
-      }
+      // {
+      //   name: 'No templates, just pure html',
+      //   value: 'html'
+      // }
     ],
     default: 0
   },
@@ -40,28 +44,28 @@ module.exports = [
         name: 'Sass + PostCSS',
         value: 'sass'
       },
-      {
-        name: 'PostCSS (with SugarSS and Stylelint)',
-        value: 'postcss'
-      }
+      // {
+      //   name: 'PostCSS (with SugarSS and Stylelint)',
+      //   value: 'postcss'
+      // }
     ],
     default: 0
   },
-  {
-    type: 'list',
-    name: 'bundler',
-    message: 'Choose js modules bundler',
-    choices: [
-      {
-        name: 'Webpack',
-        value: 'webpack'
-      },
-      {
-        name: 'I will merge files manually.',
-        value: 'manually'
-      }
-    ]
-  },
+  // {
+  //   type: 'list',
+  //   name: 'bundler',
+  //   message: 'Choose js modules bundler',
+  //   choices: [
+  //     {
+  //       name: 'Webpack',
+  //       value: 'webpack'
+  //     },
+  //     {
+  //       name: 'I will merge files manually.',
+  //       value: 'manually'
+  //     }
+  //   ]
+  // },
   {
     type: 'checkbox',
     name: 'sprites',
@@ -72,16 +76,16 @@ module.exports = [
         value: 'svg',
         checked: true
       },
-      {
-        name: 'Iconfonts',
-        value: 'iconfont',
-        checked: false
-      },
-      {
-        name: 'PNG sprites',
-        value: 'png',
-        checked: false
-      }
+      // {
+      //   name: 'Iconfonts',
+      //   value: 'iconfont',
+      //   checked: false
+      // },
+      // {
+      //   name: 'PNG sprites',
+      //   value: 'png',
+      //   checked: false
+      // }
     ]
   },
   {
@@ -90,6 +94,12 @@ module.exports = [
     message: 'Use SVGO for svg optimization?',
     default: true
   },
+  {
+    type: 'confirm',
+    name: 'preview',
+    message: 'Make preview page with all htmls',
+    default: true
+  },
   {
     type: 'confirm',
     name: 'install',

generators/app/templates/eslintrc

@@ -2,31 +2,15 @@
   "parser": "babel-eslint",
   "env": {
     "browser": true,
-    "node": true
+    "node": true,
+    "jquery": true
   },
+  "plugins": [
+    "dollar-sign"
+  ],
+  "extends": ["airbnb-base", "prettier"],
   "rules": {
-    "no-undef": 1,
-    "no-unused-vars": 1,
-    "eqeqeq": [2, "smart"],
-    "no-floating-decimal": 2,
-    "no-multi-spaces": [2, {
-      "exceptions": {
-        "ImportDeclaration": true,
-        "VariableDeclarator": true
-      }
-    }],
-    "no-multi-str": 2,
-    "camelcase": 1,
-    "eol-last": 1,
-    "indent": [2, 2, {
-      "SwitchCase": 1,
-      "VariableDeclarator": 1
-    }],
-    "quotes": [2, "single", "avoid-escape"],
-    "semi": [2, "always"],
-    "space-before-blocks": 2,
-    "space-before-function-paren": [2, "never"],
-    "constructor-super": 2,
-    "arrow-spacing": 2
+    "dollar-sign/dollar-sign": [2, "ignoreProperties"],
+    "no-plusplus": ["error", { "allowForLoopAfterthoughts": true }]
   }
 }

generators/app/templates/gitignore

@@ -8,6 +8,7 @@
 *.swp
 *.zip
 *.vi
+*.map
 *~
 
 # OS or Editor folders

generators/app/templates/gulp/config.js

@@ -1,9 +1,9 @@
-var util = require('gulp-util');
+import util from 'gulp-util';
 
-var production = util.env.production || util.env.prod || false;
-var destPath = 'build';
+const production = util.env.production || util.env.prod || false;
+const destPath = 'build';
 
-var config = {
+const config = {
     env       : 'development',
     production: production,
 
@@ -41,16 +41,16 @@ var config = {
     },
 
     setEnv: function(env) {
-        if (typeof env !== 'string') return;
-        this.env = env;
-        this.production = env === 'production';
-        process.env.NODE_ENV = env;
+      if (typeof env !== 'string') return;
+      this.env = env;
+      this.production = env === 'production';
+      process.env.NODE_ENV = env;
     },
 
     logEnv: function() {
         util.log(
-            'Environment:',
-            util.colors.white.bgRed(' ' + process.env.NODE_ENV + ' ')
+          'Environment:',
+          util.colors.white.bgRed(' ' + process.env.NODE_ENV + ' ')
         );
     },
 

generators/app/templates/gulp/tasks/browserify.js

@@ -1,12 +1,14 @@
-var gulp   = require('gulp');
-var del    = require('del');
-var util   = require('gulp-util');
-var config = require('../config');
+import del from 'del';
+import util from 'gulp-util';
+import config from '../config';
 
-gulp.task('clean', function(cb) {
+const build = () => {
+  return function () {
     return del([
-        config.dest.root
-    ]).then(function(paths) {
-        util.log('Deleted:', util.colors.magenta(paths.join('\n')));
-    });
-});
+      config.dest.root
+    ])
+    .then(paths => util.log('Deleted:', util.colors.magenta(paths.join('\n'))))
+  };
+};
+
+module.exports.build = build;