generator-folklore 3.0.3 → 3.0.4

package/lib/generators/app/index.js

@@ -52,58 +52,10 @@ module.exports = class AppGenerator extends _generator.default {
             message: 'What type of project?',
             choices: [{
               name: 'HTML',
-              value: 'html'
+              value: 'html-project'
             }, {
-              name: 'Laravel',
-              value: 'laravel'
-            }, {
-              name: 'Javascript',
-              value: 'js'
-            }, {
-              name: 'SCSS',
-              value: 'scss'
-            }, {
-              name: 'NPM Package',
-              value: 'npm-package'
-            }, {
-              name: 'React Package',
-              value: 'react-package'
-            }, {
-              name: 'Laravel Package',
-              value: 'laravel-package'
-            }, {
-              name: 'Lerna repository',
-              value: 'lerna-repository'
-            }, {
-              name: 'Lerna package',
-              value: 'lerna-package'
-            }, {
-              name: 'Build tools',
-              value: 'build'
-            }, {
-              name: 'Babel',
-              value: 'babel'
-            }, {
-              name: 'Eslint',
-              value: 'eslint'
-            }, {
-              name: 'Stylelint',
-              value: 'stylelint'
-            }, {
-              name: 'SASS Lint',
-              value: 'sass-lint'
-            }, {
-              name: 'Test',
-              value: 'test'
-            }, {
-              name: 'Storybook',
-              value: 'storybook'
-            }, {
-              name: 'Editorconfig',
-              value: 'editorconfig'
-            }, {
-              name: 'Documentation',
-              value: 'docs'
+              name: 'Node',
+              value: 'node-project'
             }]
           });
         }

package/lib/generators/babel/index.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _path = _interopRequireDefault(require("path"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
 
+var _path = _interopRequireDefault(require("path"));
+
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -11,12 +11,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 module.exports = class BabelGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
-    this.option('build-path', {
-      type: String,
-      required: false,
-      defaults: './build'
-    });
-    this.option('react-app', {
+    this.option('react', {
       type: Boolean,
       required: false,
       defaults: false
@@ -26,121 +21,53 @@ module.exports = class BabelGenerator extends _generator.default {
       required: false,
       defaults: false
     });
-    this.option('compile', {
-      type: Boolean,
-      required: false,
-      defaults: false
-    });
     this.option('react-intl', {
       type: Boolean,
       required: false,
       defaults: false
     });
-
-    this.buildPath = filePath => this.destinationPath(_path.default.join(this.options['build-path'], filePath));
   }
 
-  get prompting() {
-    return {
-      welcome() {
-        if (this.options.quiet) {
-          return;
-        }
-
-        console.log(_chalk.default.yellow('\n----------------------'));
-        console.log('Babel Generator');
-        console.log(_chalk.default.yellow('----------------------\n'));
-      }
+  prompting() {
+    if (this.options.quiet) {
+      return;
+    }
 
-    };
+    console.log(_chalk.default.yellow('\n----------------------'));
+    console.log('Babel Generator');
+    console.log(_chalk.default.yellow('----------------------\n'));
   }
 
   get writing() {
     return {
-      babelrc() {
-        const presetPath = this.destinationPath(_path.default.join(this.options['build-path'], 'babel-preset.js'));
-        const projectPath = this.destinationPath();
-        const srcPath = this.templatePath('babelrc');
-        const destPath = this.destinationPath('.babelrc');
+      config() {
+        const {
+          react,
+          'transform-runtime': transformRuntime,
+          'react-intl': reactIntl
+        } = this.options;
+        const srcPath = this.templatePath('config');
+        const destPath = this.destinationPath('babel.config.js');
         this.fs.copyTpl(srcPath, destPath, {
-          presetPath: `./${_path.default.relative(projectPath, presetPath)}`
+          react,
+          transformRuntime,
+          reactIntl
         });
       },
 
-      preset() {
-        const srcPath = this.templatePath(this.options['react-app'] ? 'babel-preset-react.js' : 'babel-preset.js');
-        const destPath = this.buildPath('babel-preset.js');
-        this.fs.copyTpl(srcPath, destPath, {
-          hasTransformRuntime: this.options['transform-runtime'],
-          hasReactIntl: this.options['react-intl'],
-          hasCompile: this.options.compile
-        });
-      },
-
-      utils() {
-        if (!this.options.compile) {
-          return;
-        }
-
-        const srcPath = this.templatePath('utils');
-        const destPath = this.buildPath('utils');
-        this.fs.copyTpl(srcPath, destPath, {});
-      },
-
-      getLocalIdent() {
-        if (!this.options.compile) {
-          return;
-        }
-
-        const destPath = this.buildPath('utils/getLocalIdent.js');
-
-        if (this.fs.exists(destPath)) {
-          return;
-        }
-
-        const srcPath = _path.default.join(this.templatePath(), '../../build/templates/utils/getLocalIdent.js');
-
-        this.fs.copy(srcPath, destPath);
+      dependencies() {
+        this.addDevDependencies(['@babel/cli', '@babel/core', '@babel/node', '@babel/plugin-transform-runtime', '@babel/preset-env', '@babel/preset-react']);
       }
 
     };
   }
 
-  get install() {
-    return {
-      npm() {
-        if (this.options['skip-install']) {
-          return;
-        }
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
 
-        const dependencies = [];
-        const devDependencies = this.options['react-app'] ? ['@babel/cli@latest', '@babel/core@latest', '@babel/polyfill@latest', '@babel/register@latest', 'babel-preset-react-app@latest'] : ['@babel/cli@latest', '@babel/core@latest', '@babel/polyfill@latest', '@babel/register@latest', 'babel-plugin-dynamic-import-node@latest', '@babel/plugin-syntax-dynamic-import@latest', '@babel/plugin-proposal-object-rest-spread@latest', 'babel-plugin-css-modules-transform@latest', '@babel/preset-env@latest', '@babel/preset-react@latest'];
-
-        if (this.options['transform-runtime']) {
-          dependencies.push('@babel/runtime@latest');
-          devDependencies.push('@babel/plugin-transform-runtime@latest');
-        }
-
-        if (this.options['react-intl']) {
-          devDependencies.push('babel-plugin-react-intl@latest');
-        }
-
-        if (this.options.compile) {
-          devDependencies.push('node-sass@latest');
-        }
-
-        if (dependencies.length > 0) {
-          this.addDependencies(dependencies, {
-            save: true
-          });
-        }
-
-        if (devDependencies.length > 0) {
-          this.addDevDependencies(devDependencies);
-        }
-      }
-
-    };
+    await this.spawnCommand('npm', ['install']);
   }
 
 };

package/lib/generators/babel/templates/config.js

@@ -0,0 +1,16 @@
+module.exports = {
+    presets: [
+        [
+            require.resolve('@babel/preset-env'),
+            {
+                useBuiltIns: false
+            },
+        ],
+    ],
+
+    plugins: [
+        <% if (transformRuntime) { %>
+        [require.resolve('@babel/plugin-transform-runtime'), {}],
+        <% } %>
+    ],
+};

package/lib/generators/browserslist/index.js

@@ -22,15 +22,10 @@ module.exports = class BrowsersListGenerator extends _generator.default {
     };
   }
 
-  get writing() {
-    return {
-      editorconfig() {
-        const srcPath = this.templatePath('browserslistrc');
-        const destPath = this.destinationPath('.browserslistrc');
-        this.fs.copy(srcPath, destPath);
-      }
-
-    };
+  writing() {
+    const srcPath = this.templatePath('browserslistrc');
+    const destPath = this.destinationPath('.browserslistrc');
+    this.fs.copy(srcPath, destPath);
   }
 
 };

package/lib/generators/build/index.js

@@ -1,13 +1,15 @@
 "use strict";
 
-var _path = _interopRequireDefault(require("path"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
 
 var _isArray = _interopRequireDefault(require("lodash/isArray"));
 
+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 AppGenerator extends _generator.default {
@@ -44,7 +46,7 @@ module.exports = class AppGenerator extends _generator.default {
       defaults: true
     });
 
-    this.scriptsPath = filePath => this.destinationPath(_path.default.join(this.options.scriptsPath, filePath));
+    this.ensureLeadingDotSlash = filePath => !_path.default.isAbsolute(filePath) && filePath.match(/^\./) === null ? `./${filePath}` : filePath;
   }
 
   prompting() {
@@ -57,34 +59,43 @@ module.exports = class AppGenerator extends _generator.default {
     console.log(_chalk.default.yellow('----------------------\n'));
   }
 
-  writing() {
-    const {
-      'entry-path': entryPath,
-      'src-path': srcPath,
-      'build-path': buildPath,
-      'public-path': publicPath,
-      'html-path': htmlPath,
-      server
-    } = this.options;
-    const scripts = {
-      build: `flklr build --load-env ${entryPath}`
-    };
+  get writing() {
+    return {
+      packageJSON() {
+        const {
+          'entry-path': entryPath,
+          'src-path': srcPath,
+          'build-path': buildPath,
+          'public-path': publicPath,
+          'html-path': htmlPath,
+          server
+        } = this.options;
+        const scripts = {
+          build: `flklr build --load-env ${(0, _utils.ensureLeadingDotSlash)(entryPath)}`
+        };
 
-    if (server) {
-      scripts.server = `flklr serve --load-env ${entryPath}`;
-      scripts.start = 'npm run server';
-    }
+        if (server) {
+          scripts.server = `flklr serve --load-env ${(0, _utils.ensureLeadingDotSlash)(entryPath)}`;
+          scripts.start = 'npm run server';
+        }
+
+        this.packageJson.merge({
+          scripts,
+          build: {
+            outputPath: (0, _utils.ensureLeadingDotSlash)(buildPath),
+            srcPath: (0, _utils.ensureLeadingDotSlash)(srcPath),
+            htmlPath: (0, _utils.ensureLeadingDotSlash)(htmlPath),
+            publicPath: (0, _utils.ensureLeadingDotSlash)(publicPath),
+            disableImageOptimization: true
+          }
+        });
+      },
 
-    this.packageJson.merge({
-      scripts,
-      build: {
-        outputPath: buildPath,
-        srcPath,
-        htmlPath,
-        publicPath,
-        disableImageOptimization: true
+      dependencies() {
+        this.addDevDependencies(['@folklore/cli']);
       }
-    });
+
+    };
   }
 
   async install() {
@@ -92,7 +103,7 @@ module.exports = class AppGenerator extends _generator.default {
       return;
     }
 
-    await this.addDevDependencies(['@folklore/cli']);
+    await this.spawnCommand('npm', ['install']);
   }
 
 };

package/lib/generators/cli/index.js

@@ -0,0 +1,92 @@
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _generator = _interopRequireDefault(require("../../lib/generator"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = class CliGenerator extends _generator.default {
+  // The name `constructor` is important here
+  constructor(...args) {
+    super(...args);
+    this.option('path', {
+      type: String,
+      defaults: 'src'
+    });
+    this.option('filename', {
+      type: String,
+      defaults: 'cli.js'
+    });
+    this.option('commands', {
+      type: Boolean,
+      defaults: false
+    });
+    this.option('commands-path', {
+      type: String,
+      defaults: './commands'
+    });
+  }
+
+  get prompting() {
+    return {
+      welcome() {
+        if (this.options.quiet) {
+          return;
+        }
+
+        console.log(_chalk.default.yellow('\n----------------------'));
+        console.log('CLI Generator');
+        console.log(_chalk.default.yellow('----------------------\n'));
+      }
+
+    };
+  }
+
+  get writing() {
+    return {
+      index() {
+        const {
+          filename,
+          path: cliPath,
+          commands
+        } = this.options;
+        this.fs.copyTpl(this.templatePath('cli.js'), this.destinationPath(_path.default.join(cliPath, filename)), {
+          commands
+        });
+      },
+
+      commands() {
+        if (!this.options.commands) {
+          return;
+        }
+
+        const templateData = {};
+
+        const commandsPath = this.options['commands-path'] || _path.default.join(this.options.path, 'commands');
+
+        const srcPath = this.templatePath('commands');
+        const destPath = this.destinationPath(commandsPath);
+        this.fs.copyTpl(srcPath, destPath, templateData);
+      },
+
+      dependencies() {
+        this.addDependencies(['commander', 'debug']);
+      }
+
+    };
+  }
+
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
+
+    await this.spawnCommand('npm', ['install']);
+  }
+
+};

package/lib/generators/cli/templates/cli.js

@@ -0,0 +1,22 @@
+import { program } from 'commander';<% if (commands) { %>
+
+import defaultCommand from './commands/default';
+
+program
+    .description('Description')
+    .addCommand(defaultCommand, {
+        isDefault: true,
+    });<% } else { %>
+
+program
+    .description('Description')
+    .option('-t, --test', 'Test option', 'test')
+
+<% } %>
+
+program.parse();<% if(!commands) { %>
+
+const { test } = program.opts();
+
+console.log(test);
+<% } %>

package/lib/generators/cli/templates/commands/default.js

@@ -0,0 +1,16 @@
+import { Command } from 'commander';
+
+const command = new Command('default');
+
+command
+    .description('Description of default command')
+    .argument('<arg>', 'Argument 1')
+    .option('-t, --test', 'Test option', 'test')
+    .action(async (arg) => {
+        const { test } = program.opts();
+        console.log('This is default command');
+        console.log(`Argument: ${arg}`);
+        console.log(`Option: ${test}`);
+    });
+
+export default command;

package/lib/generators/docs/index.js

@@ -126,10 +126,9 @@ module.exports = class DocsGenerator extends _generator.default {
           'docs:serve': 'npm run docs:prepare && npm run docs:api && gitbook serve',
           'build:docs': 'npm run docs:prepare && npm run docs:api'
         };
-        const destPath = this.destinationPath('package.json');
         const packageJSON = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
         packageJSON.scripts = _objectSpread(_objectSpread({}, packageJSON.scripts), scripts);
-        this.fs.writeJSON(destPath, packageJSON);
+        this.packageJson.merge(packageJSON);
       }
 
     };

package/lib/generators/editorconfig/index.js

@@ -7,30 +7,20 @@ var _generator = _interopRequireDefault(require("../../lib/generator"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 module.exports = class EditorConfigGenerator extends _generator.default {
-  get prompting() {
-    return {
-      welcome() {
-        if (this.options.quiet) {
-          return;
-        }
-
-        console.log(_chalk.default.yellow('\n----------------------'));
-        console.log('Editor Config Generator');
-        console.log(_chalk.default.yellow('----------------------\n'));
-      }
-
-    };
+  prompting() {
+    if (this.options.quiet) {
+      return;
+    }
+
+    console.log(_chalk.default.yellow('\n----------------------'));
+    console.log('Editor Config Generator');
+    console.log(_chalk.default.yellow('----------------------\n'));
   }
 
-  get writing() {
-    return {
-      editorconfig() {
-        const srcPath = this.templatePath('editorconfig');
-        const destPath = this.destinationPath('.editorconfig');
-        this.fs.copy(srcPath, destPath);
-      }
-
-    };
+  writing() {
+    const srcPath = this.templatePath('editorconfig');
+    const destPath = this.destinationPath('.editorconfig');
+    this.fs.copy(srcPath, destPath);
   }
 
 };

package/lib/generators/eslint/index.js

@@ -7,19 +7,14 @@ var _generator = _interopRequireDefault(require("../../lib/generator"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 module.exports = class EslintGenerator extends _generator.default {
-  get prompting() {
-    return {
-      welcome() {
-        if (this.options.quiet) {
-          return;
-        }
-
-        console.log(_chalk.default.yellow('\n----------------------'));
-        console.log('Eslint Generator');
-        console.log(_chalk.default.yellow('----------------------\n'));
-      }
+  prompting() {
+    if (this.options.quiet) {
+      return;
+    }
 
-    };
+    console.log(_chalk.default.yellow('\n----------------------'));
+    console.log('Eslint Generator');
+    console.log(_chalk.default.yellow('----------------------\n'));
   }
 
   get writing() {
@@ -34,6 +29,10 @@ module.exports = class EslintGenerator extends _generator.default {
         const srcPath = this.templatePath('eslintignore');
         const destPath = this.destinationPath('.eslintignore');
         this.fs.copy(srcPath, destPath);
+      },
+
+      dependencies() {
+        this.addDevDependencies(['babel-preset-airbnb', '@babel/eslint-parser', 'eslint', 'eslint-config-airbnb', 'eslint-config-prettier', 'eslint-plugin-prettier', 'eslint-plugin-import', 'eslint-plugin-jsx-a11y', 'eslint-plugin-react', 'eslint-plugin-formatjs']);
       }
 
     };
@@ -44,7 +43,7 @@ module.exports = class EslintGenerator extends _generator.default {
       return;
     }
 
-    await this.addDevDependencies(['babel-preset-airbnb', '@babel/eslint-parser', 'eslint', 'eslint-config-airbnb', 'eslint-config-prettier', 'eslint-plugin-prettier', 'eslint-plugin-import', 'eslint-plugin-jsx-a11y', 'eslint-plugin-react', 'eslint-plugin-formatjs']);
+    await this.spawnCommand('npm', ['install']);
   }
 
 };