Merge pull request #187 from shiftylogic/master

Yeoman prior to v0.23 expected prompt function to pass callback, 0.23 changed to promise.
OfficeDev · Oct 12, 2016 · ea5f6d0 · ea5f6d0
2 parents 69459dd + f68ca2f
commit ea5f6d0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -126,7 +126,7 @@ module.exports = generators.Base.extend({
         }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, this.options);
         this.genConfig = extend(this.genConfig, responses);
         done();
@@ -150,7 +150,7 @@ module.exports = generators.Base.extend({
       }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));
@@ -207,7 +207,7 @@ module.exports = generators.Base.extend({
       }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));

diff --git a/generators/commands/index.js b/generators/commands/index.js
@@ -124,7 +124,7 @@ module.exports = generators.Base.extend({
       ];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, this.options);
         this.genConfig = extend(this.genConfig, responses);
         done();
@@ -238,7 +238,7 @@ module.exports = generators.Base.extend({
         ];
 
         var done = this.async();
-        this.prompt(prompts, function(responses){
+        this.prompt(prompts).then(function(responses){
           this.genConfig = extend(this.genConfig, responses);
           done();
         }.bind(this));
@@ -311,7 +311,7 @@ module.exports = generators.Base.extend({
       ];
 
       var done = this.async();
-      this.prompt(prompts, function(response) {
+      this.prompt(prompts).then(function(response) {
         this.genConfig = extend(this.genConfig, response);
         done();
       }.bind(this));
@@ -358,7 +358,7 @@ module.exports = generators.Base.extend({
       }
 
       var done = this.async();
-      this.prompt(prompts, function(response) {
+      this.prompt(prompts).then(function(response) {
         this.genConfig = extend(this.genConfig, response);
         done();
       }.bind(this));

diff --git a/generators/content/index.js b/generators/content/index.js
@@ -154,7 +154,7 @@ module.exports = generators.Base.extend({
         }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, this.options);
         this.genConfig = extend(this.genConfig, responses);
         done();
@@ -179,7 +179,7 @@ module.exports = generators.Base.extend({
       }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));
@@ -212,7 +212,7 @@ module.exports = generators.Base.extend({
         }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));

diff --git a/generators/mail/index.js b/generators/mail/index.js
@@ -151,7 +151,7 @@ module.exports = generators.Base.extend({
         }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, this.options);
         this.genConfig = extend(this.genConfig, responses);
         done();
@@ -176,7 +176,7 @@ module.exports = generators.Base.extend({
       }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));
@@ -209,7 +209,7 @@ module.exports = generators.Base.extend({
         }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));

diff --git a/generators/taskpane/index.js b/generators/taskpane/index.js
@@ -45,7 +45,7 @@ module.exports = generators.Base.extend({
       desc: 'Office client product that can host the add-in',
       required: false
     });
-    
+
     this.option('appId', {
       type: String,
       desc: 'Application ID as registered in Azure AD',
@@ -152,14 +152,14 @@ module.exports = generators.Base.extend({
         }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, this.options);
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));
 
     }, // askFor()
-    
+
     askForAdalConfig: function(){
       // if it's not an ADAL app, don't ask the questions
       if (this.genConfig.tech !== 'ng-adal') {
@@ -177,7 +177,7 @@ module.exports = generators.Base.extend({
       }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));
@@ -210,7 +210,7 @@ module.exports = generators.Base.extend({
         }];
 
       // trigger prompts
-      this.prompt(prompts, function(responses){
+      this.prompt(prompts).then(function(responses){
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));

diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "deep-extend": "^0.4.1",
     "lodash": "^4.16.4",
     "uuid": "^2.0.3",
-    "yeoman-generator": "^0.22.1",
+    "yeoman-generator": "^0.24.1",
     "yosay": "^1.2.1",
     "xml2js": "^0.4.17"
   },