Merge pull request #2570 from angular-fullstack/chore/yo-gen-1

chore(gen): update yeoman-generator to 1.x

Author: Awk34

package.json

@@ -50,7 +50,7 @@
     "lodash": "^4.17.0",
     "semver": "^5.1.0",
     "underscore.string": "^3.1.1",
-    "yeoman-generator": "~0.24.1",
+    "yeoman-generator": "^1.1.1",
     "yeoman-welcome": "^1.0.1"
   },
   "devDependencies": {

src/generators/app/index.js

@@ -124,7 +124,7 @@ export class Generator extends Base {
             this.filters = {};
             this.forceConfig = true;
             this.config.set('filters', this.filters);
-            this.config.forceSave();
+            this.config.save();
           }
         });
       },
@@ -382,7 +382,7 @@ export class Generator extends Base {
         this.config.set('modelsNeedle', '// Insert models below');
 
         this.config.set('filters', this.filters);
-        this.config.forceSave();
+        this.config.save();
       },
       // TODO: switch to ng2 component generator
       // ngComponent: function() {
@@ -575,12 +575,10 @@ export class Generator extends Base {
         } else if(this.filters.sequelizeModels) {
           models = 'sequelize';
         }
-        this.composeWith('angular-fullstack:endpoint', {
-          options: {
-            route: '/api/things',
-            models: models
-          },
-          args: ['thing']
+        this.composeWith(require.resolve('../endpoint'), {
+          route: '/api/things',
+          models: models,
+          arguments: ['thing'],
         });
       }
     };

src/generators/endpoint/index.js

@@ -54,7 +54,7 @@ export class Generator extends NamedBase {
       }
     }
 
-    var name = this.name;
+    var name = this.options.name;
 
     var base = this.config.get('routesBase') || '/api/';
     if(base.charAt(base.length - 1) !== '/') {
@@ -86,7 +86,7 @@ export class Generator extends NamedBase {
   configuring() {
     this.routeDest = path.join(this.options.endpointDirectory
       || this.config.get('endpointDirectory')
-      || 'server/api/', this.name);
+      || 'server/api/', this.options.name);
   }
 
   writing() {

src/generators/generator-base.js

@@ -3,14 +3,14 @@
 import path from 'path';
 import _ from 'lodash';
 import s from 'underscore.string';
-import { Base as YoBase } from 'yeoman-generator';
+import Generator from 'yeoman-generator';
 import yoWelcome from 'yeoman-welcome';
 import * as genUtils from './util';
 
 // extend lodash with underscore.string
 _.mixin(s.exports());
 
-export class Base extends YoBase {
+export class Base extends Generator {
   constructor(...args) {
     super(...args);
 
@@ -37,7 +37,7 @@ export class Base extends YoBase {
   }
 
   determineAppname() {
-    if(this.name) return this.name;
+    if(this.options.name) return this.options.name;
     else return super.determineAppname();
   }
 
@@ -63,15 +63,15 @@ export class NamedBase extends Base {
 
     this.argument('name', { type: String, required: true });
 
-    var name = this.name.replace(/\//g, '-');
+    var name = this.options.name.replace(/\//g, '-');
 
     this.cameledName = _.camelize(name);
     this.classedName = _.classify(name);
 
-    this.basename = path.basename(this.name);
-    this.dirname = this.name.includes('/')
-      ? path.dirname(this.name)
-      : this.name;
+    this.basename = path.basename(this.options.name);
+    this.dirname = this.options.name.includes('/')
+      ? path.dirname(this.options.name)
+      : this.options.name;
   }
 }