Skip to content

Commit f6f1fb6

Browse files
committed
fix(gen:app): fix insight askPermission
fixes #1889
1 parent be5ace9 commit f6f1fb6

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

Diff for: src/generators/app/index.js

+15-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import fs from 'fs';
44
import path from 'path';
5+
import Promise from 'bluebird';
56
import { runCmd } from '../util';
67
import chalk from 'chalk';
78
import {Base} from 'yeoman-generator';
@@ -40,25 +41,32 @@ export class Generator extends Base {
4041

4142
// init shared generator properies and methods
4243
const genBasePromise = genBase(this);
44+
let promises = [genBasePromise];
45+
46+
if(process.env.CI) {
47+
insight.optOut = true;
48+
} else if(insight.optOut === undefined) {
49+
promises.push(new Promise((resolve, reject) => {
50+
insight.askPermission(null, (err, optIn) => {
51+
if(err) return reject(err);
52+
else return resolve(optIn);
53+
});
54+
}));
55+
}
4356

4457
insight.track('generator', this.rootGeneratorVersion());
4558
this.nodeVersion = semver.clean(process.version);
4659
this.semver = semver;
4760
insight.track('node', this.nodeVersion);
4861
insight.track('platform', process.platform);
4962

50-
if(process.env.CI) {
51-
insight.optOut = true;
52-
} else if(insight.optOut === undefined) {
53-
insight.askPermission(null, cb);
54-
}
55-
5663
const npmVersionPromise = runCmd('npm --version').then(stdout => {
5764
this.npmVersion = stdout.toString().trim();
5865
return insight.track('npm', this.npmVersion);
5966
});
67+
promises.push(npmVersionPromise);
6068

61-
return Promise.all([genBasePromise, npmVersionPromise]);
69+
return Promise.all(promises);
6270
},
6371
info: function () {
6472
this.log(this.yoWelcome);

0 commit comments

Comments
 (0)