From 366feacde50fd656e53dd686729c11c5241c5d46 Mon Sep 17 00:00:00 2001 From: Anshuman Verma Date: Mon, 22 Apr 2019 12:10:06 +0530 Subject: [PATCH 1/4] chore(generators): addon-generator to async/await addon-generator to async/await --- package-lock.json | 41 +++++++------------------- packages/generators/addon-generator.ts | 14 +++++---- 2 files changed, 19 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5af3e7a31cd..f2764863823 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7543,8 +7543,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -7565,14 +7564,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7587,20 +7584,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7717,8 +7711,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7730,7 +7723,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7745,7 +7737,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7753,14 +7744,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7779,7 +7768,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7860,8 +7848,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7873,7 +7860,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7959,8 +7945,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -7996,7 +7981,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8016,7 +8000,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -8060,14 +8043,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/packages/generators/addon-generator.ts b/packages/generators/addon-generator.ts index d81c2d0b378..49b704211b6 100644 --- a/packages/generators/addon-generator.ts +++ b/packages/generators/addon-generator.ts @@ -39,12 +39,14 @@ export default function addonGenerator( public copy: (value: string, index: number, array: string[]) => void; public copyTpl: (value: string, index: number, array: string[]) => void; - public prompting(): Promise<{}> { - return this.prompt(prompts).then( - (props: InquirerScaffoldObject): void => { - this.props = props; - } - ); + public async prompting(): void { + const scaffoldObject: InquirerScaffoldObject = await this.prompt(prompts); + this.props = scaffoldObject; + // return this.prompt(prompts).then( + // (props: InquirerScaffoldObject): void => { + // this.props = props; + // } + // ); } public default(): void { From 497534afeb1b2615a6cddc8be00c136655587e52 Mon Sep 17 00:00:00 2001 From: Anshuman Verma Date: Mon, 22 Apr 2019 12:11:30 +0530 Subject: [PATCH 2/4] chore(generator): rm comments rm comments --- packages/generators/addon-generator.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/generators/addon-generator.ts b/packages/generators/addon-generator.ts index 49b704211b6..bd0e3363eb8 100644 --- a/packages/generators/addon-generator.ts +++ b/packages/generators/addon-generator.ts @@ -42,11 +42,6 @@ export default function addonGenerator( public async prompting(): void { const scaffoldObject: InquirerScaffoldObject = await this.prompt(prompts); this.props = scaffoldObject; - // return this.prompt(prompts).then( - // (props: InquirerScaffoldObject): void => { - // this.props = props; - // } - // ); } public default(): void { From 7adf943e818b443614af60af39fec028e6766eb1 Mon Sep 17 00:00:00 2001 From: Anshuman Verma Date: Mon, 22 Apr 2019 13:14:58 +0530 Subject: [PATCH 3/4] chore(generator): addon gen rm type addon gen rm type --- packages/generators/addon-generator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/generators/addon-generator.ts b/packages/generators/addon-generator.ts index bd0e3363eb8..57951ce29d1 100644 --- a/packages/generators/addon-generator.ts +++ b/packages/generators/addon-generator.ts @@ -39,7 +39,7 @@ export default function addonGenerator( public copy: (value: string, index: number, array: string[]) => void; public copyTpl: (value: string, index: number, array: string[]) => void; - public async prompting(): void { + public async prompting() { const scaffoldObject: InquirerScaffoldObject = await this.prompt(prompts); this.props = scaffoldObject; } From 6593c94a2381b8fafac2a54189412518f960790b Mon Sep 17 00:00:00 2001 From: Anshuman Verma Date: Mon, 22 Apr 2019 18:42:21 +0530 Subject: [PATCH 4/4] chore(generator): add return type add return type --- packages/generators/addon-generator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/generators/addon-generator.ts b/packages/generators/addon-generator.ts index 57951ce29d1..8099016d584 100644 --- a/packages/generators/addon-generator.ts +++ b/packages/generators/addon-generator.ts @@ -39,7 +39,7 @@ export default function addonGenerator( public copy: (value: string, index: number, array: string[]) => void; public copyTpl: (value: string, index: number, array: string[]) => void; - public async prompting() { + public async prompting(): Promise { const scaffoldObject: InquirerScaffoldObject = await this.prompt(prompts); this.props = scaffoldObject; }