Refactored generators to properly extend the base generator class

Author: stylesuxx

generators/action/index.js

@@ -3,7 +3,7 @@ const Generator = require('yeoman-generator');
 const walk = require('esprima-walk');
 const utils = require('../app/utils');
 
-module.exports = class extends Generator {
+class ActionGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
     this.argument('name', { type: String, required: true });
@@ -127,3 +127,5 @@ module.exports = class extends Generator {
     this.attachToApp(appPath, baseName);
   }
 };
+
+module.exports = ActionGenerator;

generators/app/index.js

@@ -1,23 +1,21 @@
 'use strict';
-let generator = require('yeoman-generator');
+const Generator = require('yeoman-generator');
 
-module.exports = generator.Base.extend({
-
-  constructor: function() {
-    generator.Base.apply(this, arguments);
+class AppGenerator extends Generator {
 
+  constructor(args, opts) {
+    super(args, opts);
     this.option('skip-install');
-  },
-
-  install: function() {
+  }
 
+  install() {
     if(!this.options['skip-install']) {
       this.installDependencies({ bower: false });
     }
 
     // Run the base react-webpack generator, then run the dispatcher
     this.composeWith(
-      'react-webpack',
+      'generator-react-webpack',
       {
         options: {
           'skip-install': this.options['skip-install']
@@ -38,4 +36,6 @@ module.exports = generator.Base.extend({
       this.npmInstall(['redux', 'react-redux'], { 'save': true });
     });
   }
-});
+};
+
+module.exports = AppGenerator;

generators/component/index.js

@@ -1,15 +1,14 @@
 'use strict';
-let generator = require('yeoman-generator');
+const Generator = require('yeoman-generator');
 
-module.exports = generator.Base.extend({
+module.exports = class ComponentGenerator extends Generator {
 
-  constructor: function() {
+  constructor() {
     generator.Base.apply(this, arguments);
     this.argument('name', { type: String, required: true });
-  },
-
-  writing: function() {
+  }
 
+  writing() {
     // Build options
     let opts = {};
 
@@ -19,9 +18,9 @@ module.exports = generator.Base.extend({
 
     this.composeWith('react-webpack', {
       options: opts,
-      args: [ this.name ]
+      args: [ this.options.name ]
     }, {
       local: require.resolve('generator-react-webpack/generators/component')
     });
   }
-});
+};

generators/container/index.js

@@ -2,7 +2,7 @@
 const Generator = require('yeoman-generator');
 const utils = require('../app/utils');
 
-module.exports = class extends Generator {
+class ContainerGenerator extends Generator {
 
   constructor(args, opts) {
     super(args, opts);
@@ -26,3 +26,5 @@ module.exports = class extends Generator {
     );
   }
 };
+
+module.exports = ContainerGenerator;

generators/reducer/index.js

@@ -4,7 +4,7 @@ const path = require('path');
 const walk = require('esprima-walk');
 const utils = require('../app/utils');
 
-module.exports = class extends Generator {
+class ReducerGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
     this.argument('name', { type: String, required: true });
@@ -147,3 +147,5 @@ module.exports = class extends Generator {
     this.attachToApp(appPath, baseName);
   }
 };
+
+module.exports = ReducerGenerator;

generators/root/index.js

@@ -2,12 +2,13 @@
 const Generator = require('yeoman-generator');
 const fs = require('fs');
 
-module.exports = class extends Generator {
+class RootGenerator extends Generator {
 
+  /*
   constructor(args, opts) {
-    super(args, opts); // eslint-disable-line prefer-rest-params
-    this.argument('name', { type: String, required: true });
+    super(args, opts);
   }
+  */
 
   writing() {
     /* Some base functionality needs to be overwritten, so we force yeoman to do
@@ -59,3 +60,5 @@ module.exports = class extends Generator {
     );
   }
 };
+
+module.exports = RootGenerator;

test/generators/container/indexTest.js

@@ -17,7 +17,7 @@ describe('react-webpack-redux:container', () => {
       .on('end', callback);
   }
 
-  describe('When creating a new action', () => {
+  describe('When creating a new container', () => {
 
     it('should create the container file', (done) => {
       createGeneratedContainer('TestContainer', () => {