generator-folklore 3.0.3 → 3.0.4

package/lib/generators/{html → html-project}/index.js

@@ -1,16 +1,16 @@
 "use strict";
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _chalk = _interopRequireDefault(require("chalk"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-module.exports = class HTMLGenerator extends _generator.default {
+module.exports = class HTMLProjectGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {
     super(...args);
@@ -18,21 +18,11 @@ module.exports = class HTMLGenerator extends _generator.default {
       type: String,
       required: false
     });
-    this.option('path', {
-      type: String,
-      desc: 'Path for the html project',
-      defaults: './'
-    });
     this.option('src-path', {
       type: String,
       desc: 'Path for source',
       defaults: './src'
     });
-    this.option('tmp-path', {
-      type: String,
-      desc: 'Path for temp files',
-      defaults: './.tmp'
-    });
     this.option('dest-path', {
       type: String,
       desc: 'Path for build',
@@ -43,26 +33,11 @@ module.exports = class HTMLGenerator extends _generator.default {
       desc: 'Path for the javascript',
       defaults: ''
     });
-    this.option('css-path', {
-      type: String,
-      desc: 'Path for the css',
-      defaults: 'css'
-    });
-    this.option('scss-path', {
+    this.option('styles-path', {
       type: String,
       desc: 'Path for the scss',
       defaults: 'styles'
     });
-    this.option('images-path', {
-      type: String,
-      desc: 'Path for the images',
-      defaults: 'img'
-    });
-    this.option('build-path', {
-      type: String,
-      desc: 'Path for the build tools',
-      defaults: 'build'
-    });
     this.option('server', {
       type: Boolean,
       defaults: false,
@@ -70,7 +45,12 @@ module.exports = class HTMLGenerator extends _generator.default {
     });
     this.option('server-path', {
       type: String,
-      desc: 'Path for the node.js server'
+      desc: 'Path for the node.js server',
+      defaults: ''
+    });
+    this.option('server-filename', {
+      type: String,
+      desc: 'Filename for the node.js server'
     });
 
     this.srcPath = filePath => this.destinationPath(_path.default.join(this.options['src-path'], filePath));
@@ -84,7 +64,7 @@ module.exports = class HTMLGenerator extends _generator.default {
         }
 
         console.log(_chalk.default.yellow('\n----------------------'));
-        console.log('HTML Generator');
+        console.log('HTML Project Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       },
 
@@ -110,64 +90,75 @@ module.exports = class HTMLGenerator extends _generator.default {
   }
 
   configuring() {
-    const projectName = _lodash.default.get(this.options, 'project-name');
-
-    const projectPath = this.destinationPath();
-
-    const srcPath = _lodash.default.get(this.options, 'src-path');
-
-    const destPath = _lodash.default.get(this.options, 'dest-path');
-
-    const buildPath = _lodash.default.get(this.options, 'build-path') || `${projectPath}/build`;
-
-    const jsPath = _lodash.default.get(this.options, 'js-path');
-
-    const jsSrcPath = _path.default.join(projectPath, srcPath, jsPath);
+    const {
+      'project-name': projectName,
+      'src-path': srcPath,
+      'dest-path': destPath,
+      'js-path': jsPath,
+      'styles-path': stylesPath,
+      'server-path': serverPath,
+      'server-filename': serverFilename
+    } = this.options;
 
-    const scssPath = _lodash.default.get(this.options, 'scss-path');
+    const jsSrcPath = _path.default.join(srcPath, jsPath);
 
-    const scssSrcPath = _path.default.join(projectPath, srcPath, scssPath);
+    const stylesSrcPath = _path.default.join(srcPath, stylesPath);
 
-    const skipInstall = _lodash.default.get(this.options, 'skip-install', false);
+    const serverSrcPath = _path.default.join(srcPath, serverPath);
 
-    this.composeWith('folklore:js', {
-      'project-name': projectName,
-      'hot-reload': true,
-      path: jsSrcPath,
-      'root-props-import': './data/root',
-      'skip-install': skipInstall,
+    this.composeWith('folklore:prettier', {
+      'skip-install': true,
+      quiet: true
+    });
+    this.composeWith('folklore:eslint', {
+      'skip-install': true,
+      quiet: true
+    });
+    this.composeWith('folklore:stylelint', {
+      'skip-install': true,
+      quiet: true
+    });
+    this.composeWith('folklore:browserslist', {
+      'skip-install': true,
       quiet: true
     });
     this.composeWith('folklore:editorconfig', {
       quiet: true
     });
+    this.composeWith('folklore:react-app', {
+      'project-name': projectName,
+      path: jsSrcPath,
+      stylesPath: stylesSrcPath,
+      'skip-install': true,
+      quiet: true
+    });
     this.composeWith('folklore:scss', {
       'project-name': projectName,
-      path: scssSrcPath,
+      path: stylesSrcPath,
       react: true,
-      'skip-install': skipInstall,
+      'skip-install': true,
       quiet: true
     });
 
     if (this.options.server) {
       this.composeWith('folklore:server', {
-        'project-name': projectName,
-        path: _lodash.default.get(this.options, 'server-path') || `${projectPath}/server`,
-        'skip-install': skipInstall,
+        path: serverSrcPath,
+        filename: serverFilename,
+        'skip-install': true,
         quiet: true
       });
     }
 
+    console.log(srcPath, jsSrcPath, _path.default.join(jsSrcPath, 'index.js'), _path.default.join(srcPath, 'index.html.ejs'));
     this.composeWith('folklore:build', {
-      path: buildPath,
       'src-path': srcPath,
-      'entry-path': _path.default.join(srcPath, 'index'),
+      'entry-path': _path.default.join(jsSrcPath, 'index.js'),
       'html-path': _path.default.join(srcPath, 'index.html.ejs'),
       'build-path': destPath,
       'empty-path': destPath,
       copy: true,
       'copy-path': _path.default.join(srcPath, '*.{html,ico,txt,png}'),
-      'skip-install': skipInstall,
+      'skip-install': true,
       quiet: true
     });
   }
@@ -196,18 +187,6 @@ module.exports = class HTMLGenerator extends _generator.default {
         this.fs.copy(srcPath, destPath);
       },
 
-      data() {
-        const srcPath = this.templatePath('root.js');
-        const destPath = this.srcPath('data/root.js');
-        this.fs.copy(srcPath, destPath);
-      },
-
-      utils() {
-        const srcPath = this.templatePath('utils.js');
-        const destPath = this.srcPath('lib/utils.js');
-        this.fs.copy(srcPath, destPath);
-      },
-
       gitignore() {
         const srcPath = this.templatePath('gitignore');
         const destPath = this.destinationPath('.gitignore');
@@ -217,4 +196,12 @@ module.exports = class HTMLGenerator extends _generator.default {
     };
   }
 
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
+
+    await this.spawnCommand('npm', ['install']);
+  }
+
 };

package/lib/generators/{html → html-project}/templates/index.html.ejs

@@ -18,6 +18,9 @@
     <meta property="og:url" content="">
 </head>
 <body>
-    <div id="root"></div>
+    <script type="text/javascript">
+        var props = {};
+    </script>
+    <div id="app"></div>
 </body>
 </html>

package/lib/generators/laravel/index.js

@@ -250,7 +250,7 @@ module.exports = class LaravelGenerator extends _generator.default {
       project_name: this.options['project-name']
     }).replace(/^(http)?(s)?(:\/\/)?/, 'http$2://');
 
-    this.composeWith('folklore:js', {
+    this.composeWith('folklore:react-app', {
       'project-name': this.options['project-name'],
       path: jsSrcPath,
       'styles-path': stylesSrcPath,
@@ -341,11 +341,11 @@ module.exports = class LaravelGenerator extends _generator.default {
       },
 
       packageJSON() {
-        const jsonPath = this.destinationPath('package.json');
         const packageJSON = this.fs.exists(jsonPath) ? this.fs.readJSON(jsonPath) : {};
-        packageJSON.scripts = {};
-        packageJSON.devDependencies = {};
-        this.fs.writeJSON(jsonPath, packageJSON);
+        this.packageJson.merge(_objectSpread(_objectSpread({}, packageJSON), {}, {
+          scripts: {},
+          devDependencies: {}
+        }));
       },
 
       composerJSON() {

package/lib/generators/lerna-package/index.js

@@ -160,7 +160,6 @@ module.exports = class LernaPackageGenerator extends _generator.default {
           type
         } = this.options;
         const srcPath = this.templatePath('_package.json');
-        const destPath = this.packagePath('package.json');
         const packageJSON = this.fs.readJSON(srcPath);
         packageJSON.name = this.options['package-name'];
 
@@ -177,8 +176,7 @@ module.exports = class LernaPackageGenerator extends _generator.default {
           };
         }
 
-        const currentPackageJSON = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
-        this.fs.writeJSON(destPath, _lodash.default.merge(packageJSON, currentPackageJSON));
+        this.packageJson.merge(packageJSON);
       },
 
       webpackConfig() {

package/lib/generators/lerna-repository/index.js

@@ -164,11 +164,9 @@ module.exports = class LernaRepositoryGenerator extends _generator.default {
 
       packageJSON() {
         const srcPath = this.templatePath('_package.json');
-        const destPath = this.destinationPath('package.json');
         const packageJSON = this.fs.readJSON(srcPath);
         packageJSON.name = this.options['project-name'];
-        const currentPackageJSON = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
-        this.fs.writeJSON(destPath, _lodash.default.merge(packageJSON, currentPackageJSON));
+        this.packageJson.merge(packageJSON);
       },
 
       jest() {

package/lib/generators/node-project/index.js

@@ -0,0 +1,164 @@
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _generator = _interopRequireDefault(require("../../lib/generator"));
+
+var _utils = require("../../lib/utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = class NodeProjectGenerator extends _generator.default {
+  // The name `constructor` is important here
+  constructor(...args) {
+    super(...args);
+    this.argument('project-name', {
+      type: String,
+      required: false
+    });
+    this.option('src-path', {
+      type: String,
+      desc: 'Path for source',
+      defaults: './src'
+    });
+    this.option('dest-path', {
+      type: String,
+      desc: 'Path for build',
+      defaults: './dist'
+    });
+    this.option('html-path', {
+      type: String,
+      desc: 'Path for the HTML',
+      defaults: './web'
+    });
+    this.option('server-path', {
+      type: String,
+      desc: 'Path for the server',
+      defaults: ''
+    });
+    this.option('cli-path', {
+      type: String,
+      desc: 'Path for the cli',
+      defaults: ''
+    });
+
+    this.srcPath = filePath => this.destinationPath(_path.default.join(this.options['src-path'], filePath));
+  }
+
+  get prompting() {
+    return {
+      welcome() {
+        if (this.options.quiet) {
+          return;
+        }
+
+        console.log(_chalk.default.yellow('\n----------------------'));
+        console.log('Node Project Generator');
+        console.log(_chalk.default.yellow('----------------------\n'));
+      },
+
+      prompts() {
+        const prompts = [];
+
+        if (!this.options['project-name']) {
+          prompts.push(_generator.default.prompts.project_name);
+        }
+
+        if (!prompts.length) {
+          return null;
+        }
+
+        return this.prompt(prompts).then(answers => {
+          if (answers['project-name']) {
+            this.options['project-name'] = answers['project-name'];
+          }
+        });
+      }
+
+    };
+  }
+
+  configuring() {
+    const {
+      'project-name': projectName,
+      'src-path': srcPath,
+      'dest-path': destPath,
+      'html-path': htmlPath,
+      'server-path': serverPath,
+      'cli-path': cliPath
+    } = this.options;
+
+    const htmlSrcPath = _path.default.join(srcPath, htmlPath);
+
+    const serverSrcPath = _path.default.join(srcPath, serverPath);
+
+    const cliSrcPath = _path.default.join(srcPath, cliPath);
+
+    this.composeWith('folklore:html-project', {
+      'skip-install': true,
+      quiet: true,
+      'project-name': projectName,
+      'src-path': htmlSrcPath,
+      'dest-path': destPath
+    });
+    this.composeWith('folklore:server', {
+      'skip-install': true,
+      quiet: true,
+      path: serverSrcPath
+    });
+    this.composeWith('folklore:cli', {
+      'skip-install': true,
+      quiet: true,
+      path: cliSrcPath
+    });
+    this.composeWith('folklore:rollup', {
+      'skip-install': true,
+      quiet: true
+    });
+  }
+
+  get writing() {
+    return {
+      index() {
+        this.fs.copyTpl(this.templatePath('index.js'), this.srcPath('index.js'));
+      },
+
+      packageJson() {
+        const {
+          'src-path': srcPath,
+          'html-path': htmlPath,
+          'server-path': serverPath
+        } = this.options;
+
+        const webEntryPath = _path.default.join(srcPath, htmlPath, 'index.js');
+
+        const serverEntryPath = _path.default.join(srcPath, serverPath, 'server.js');
+
+        const scripts = {
+          'build:web': `flklr build --load-env ${(0, _utils.ensureLeadingDotSlash)(webEntryPath)}`,
+          'build:rollup': `rollup --config rollup.config.js`,
+          'build': 'npm run build:web && npm run build:rollup',
+          'server': `babel-node ${(0, _utils.ensureLeadingDotSlash)(serverEntryPath)}`,
+          'start': `flklr serve --load-env ${(0, _utils.ensureLeadingDotSlash)(webEntryPath)}`
+        };
+        this.packageJson.merge({
+          scripts
+        });
+      }
+
+    };
+  }
+
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
+
+    await this.spawnCommand('npm', ['install']);
+  }
+
+};

package/lib/generators/npm-package/index.js

@@ -1,11 +1,11 @@
 "use strict";
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _chalk = _interopRequireDefault(require("chalk"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -225,11 +225,9 @@ module.exports = class NpmPackageGenerator extends _generator.default {
 
       packageJSON() {
         const srcPath = this.templatePath('_package.json');
-        const destPath = this.destinationPath('package.json');
         const packageJSON = this.fs.readJSON(srcPath);
         packageJSON.name = this.options['package-name'];
-        const currentPackageJSON = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
-        this.fs.writeJSON(destPath, _lodash.default.merge(packageJSON, currentPackageJSON));
+        this.packageJson.merge(packageJSON);
       }
 
     };

package/lib/generators/prettier/index.js

@@ -22,14 +22,27 @@ module.exports = class PrettierGenerator extends _generator.default {
     };
   }
 
-  writing() {
-    const srcPath = this.templatePath('prettierrc.json');
-    const destPath = this.destinationPath('.prettierrc.json');
-    this.fs.copy(srcPath, destPath);
+  get writing() {
+    return {
+      prettierrc() {
+        const srcPath = this.templatePath('prettierrc.json');
+        const destPath = this.destinationPath('.prettierrc.json');
+        this.fs.copy(srcPath, destPath);
+      },
+
+      dependencies() {
+        this.addDevDependencies(['prettier', '@prettier/plugin-php', '@trivago/prettier-plugin-sort-imports']);
+      }
+
+    };
   }
 
-  install() {
-    this.addDevDependencies(['prettier', '@prettier/plugin-php']);
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
+
+    await this.spawnCommand('npm', ['install']);
   }
 
 };

package/lib/generators/prettier/templates/prettierrc.json

@@ -2,5 +2,7 @@
     "printWidth": 100,
     "singleQuote": true,
     "trailingComma": "all",
-    "tabWidth": 4
+    "tabWidth": 4,
+    "importOrder": ["<THIRD_PARTY_MODULES>", "^[./](.*)?\/(utils|hooks|lib)", "^[./].*(?<!(\\.[a-z]+))$", "\\.scss$", "\\.[a-z]+$"],
+    "importOrderSeparation": true
 }