@microsoft/generator-sharepoint 1.14.0 → 1.15.0-rc.0

package/lib/generators/adaptiveCardExtension/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/adaptiveCardExtension/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAE7F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAGrE,aAAK,gBAAgB,GAAG,OAAO,GAAG,aAAa,GAAG,OAAO,CAAC;AAC1D,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;IACtE,eAAe,EAAE,gBAAgB,CAAC;CACnC;AAED,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE3E,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAEN;AAED,qBAAa,8BAA+B,SAAQ,aAAa,CAAC,sBAAsB,CACtF,WAAW,EACX,WAAW,CACZ;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA6B;IACpE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA2B;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC/D,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IAE1D,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC1B,WAAW,IAAI,IAAI;IAenB,OAAO,IAAI,IAAI;IAkBf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW;IAKnE,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,wBAAwB;CAOjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/adaptiveCardExtension/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAE7F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAGrE,aAAK,gBAAgB,GAAG,OAAO,GAAG,aAAa,GAAG,OAAO,CAAC;AAC1D,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;IACtE,eAAe,EAAE,gBAAgB,CAAC;CACnC;AAED,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE3E,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAEN;AAED,qBAAa,8BAA+B,SAAQ,aAAa,CAAC,sBAAsB,CACtF,WAAW,EACX,WAAW,CACZ;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA6B;IACpE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA2B;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC/D,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IAE1D,YAAY,IAAI,IAAI;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8ChC,WAAW,IAAI,IAAI;IAenB,OAAO,IAAI,IAAI;IAkBf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW;IAKnE,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,wBAAwB;CAOjC"}

package/lib/generators/adaptiveCardExtension/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -48,10 +52,10 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
     initializing() {
         /* no-op */
     }
-    prompting() {
+    async prompting() {
         this.ensureCorrectFolder();
         if (!this.shouldExecute()) {
-            return Promise.resolve();
+            return;
         }
         const choices = [
             {
@@ -67,7 +71,7 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
                 value: 'PrimaryText'
             }
         ];
-        return this.prompt([
+        const answers = await this.prompt([
             {
                 type: 'list',
                 name: 'aceTemplateType',
@@ -76,16 +80,15 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
                 message: 'Which template do you want to use?',
                 choices
             }
-        ]).then((answers) => {
-            const templateType = answers.aceTemplateType || this.config.get('aceTemplateType');
-            if (!(templateType === 'Basic' || templateType === 'Image' || templateType === 'PrimaryText')) {
-                this.log(colors_1.default.red(`Invalid template type: '${templateType}'`));
-            }
-            else {
-                this.config.set('aceTemplateType', templateType);
-            }
-            return super.prompting();
-        });
+        ]);
+        const templateType = answers.aceTemplateType || this.config.get('aceTemplateType');
+        if (!(templateType === 'Basic' || templateType === 'Image' || templateType === 'PrimaryText')) {
+            this.log(colors_1.default.red(`Invalid template type: '${templateType}'`));
+        }
+        else {
+            this.config.set('aceTemplateType', templateType);
+        }
+        return super.prompting();
     }
     configuring() {
         if (this.shouldExecute()) {
@@ -111,7 +114,7 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
         }
     }
     end() {
-        /* no-op */
+        super.end();
     }
     shouldExecute() {
         return (this.config.get('environment') === 'spo' &&

package/lib/generators/adaptiveCardExtension/templates/manifestTemplate/baseTemplate/{componentClassName}.manifest.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/spfx/client-side-web-part-manifest.schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/spfx/adaptive-card-extension-manifest.schema.json",
   "id": "<%= componentId %>",
   "alias": "<%= componentAlias %>",
   "componentType": "AdaptiveCardExtension",
@@ -13,7 +13,6 @@
   // https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
   "requiresCustomScript": false,
   "supportedHosts": ["Dashboard"],
-  "supportsThemeVariants": true,
   "preconfiguredEntries": [{
     "groupId": "bd067b1e-3ad5-4d5d-a5fe-505f07d7f59c", // Dashboard
     "group": { "default": "Dashboard" },
@@ -22,6 +21,7 @@
     "officeFabricIconFontName": "SharePointLogo",
     "properties": {
       "title": "<%= componentNameUnescaped %>"
-    }
+    },
+    "cardSize": "Medium"
   }]
 }

package/lib/generators/adaptiveCardExtension/templates/manifestTemplate/imageTemplate/{componentClassName}.manifest.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/spfx/client-side-web-part-manifest.schema.json",
+  "$schema": "https://developer.microsoft.com/json-schemas/spfx/adaptive-card-extension-manifest.schema.json",
   "id": "<%= componentId %>",
   "alias": "<%= componentAlias %>",
   "componentType": "AdaptiveCardExtension",
@@ -13,7 +13,6 @@
   // https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
   "requiresCustomScript": false,
   "supportedHosts": ["Dashboard"],
-  "supportsThemeVariants": true,
   "preconfiguredEntries": [{
     "groupId": "bd067b1e-3ad5-4d5d-a5fe-505f07d7f59c", // Dashboard
     "group": { "default": "Dashboard" },

package/lib/generators/adaptiveCardExtension/templates/none/quickView/QuickView.ts

@@ -15,7 +15,7 @@ export class QuickView extends BaseAdaptiveCardView<
   public get data(): IQuickViewData {
     return {
       subTitle: strings.SubTitle,
-      title: strings.Title,
+      title: strings.Title
     };
   }
 

package/lib/generators/app/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/app/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAIzE,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAY1C,MAAM,WAAW,WAAW;IAC1B,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,WACf,SAAQ,YAAY,EAClB,QAAQ,CAAC,gBAAgB,EACzB,SAAS,CAAC,yBAAyB;CAAG;AAE1C,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,WAAW,GACnB,IAAI,CAEN"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/app/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAIzE,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAa1C,MAAM,WAAW,WAAW;IAC1B,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,WACf,SAAQ,YAAY,EAClB,QAAQ,CAAC,gBAAgB,EACzB,SAAS,CAAC,yBAAyB;CAAG;AAE1C,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,WAAW,GACnB,IAAI,CAEN"}

package/lib/generators/app/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -40,6 +44,7 @@ const FieldCustomizer = __importStar(require("../fieldCustomizer"));
 const CommandSet = __importStar(require("../commandSet"));
 const SearchQueryModifier = __importStar(require("../searchQueryModifier"));
 const ApplicationCustomizer = __importStar(require("../applicationCustomizer"));
+const FormCustomizer = __importStar(require("../formCustomizer"));
 const VERSION = require('../../../package.json').version;
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
@@ -88,6 +93,9 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
         if (this.options.isDomainIsolated !== undefined) {
             this.config.set('isDomainIsolated', this.options.isDomainIsolated);
         }
+        if (this.options.useHeft !== undefined) {
+            this.config.set('useHeft', this.options.useHeft);
+        }
         if (this.options.componentType !== undefined) {
             this.config.set('componentType', this.options.componentType);
         }
@@ -142,6 +150,7 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
         CommandSet.composeWith(this, baseOption);
         SearchQueryModifier.composeWith(this, baseOption);
         ApplicationCustomizer.composeWith(this, baseOption);
+        FormCustomizer.composeWith(this, baseOption);
     }
     prompting() {
         // Configure the solution root folder before other composition.
@@ -161,7 +170,8 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
     }
     end() {
         const libraryName = YeomanConfiguration_1.YeomanConfiguration.libraryName;
-        this.log(spsay_1.default(libraryName));
+        const useHeft = YeomanConfiguration_1.YeomanConfiguration.useHeft;
+        this.log((0, spsay_1.default)(libraryName, useHeft));
     }
     _provideRetirementNote() {
         this.log(colors_1.default.bold(`See ${colors_1.default.underline(colors_1.default.blue('https://aka.ms/spfx-yeoman-info'))} for more information on how to use this generator.`));

package/lib/generators/applicationCustomizer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/applicationCustomizer/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,WAAW,6BAA8B,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAC7F,MAAM,WAAW,6BAA8B,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE7F,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAEN;AAED,qBAAa,8BAA+B,SAAQ,aAAa,CAAC,sBAAsB,CACtF,6BAA6B,EAC7B,6BAA6B,CAC9B;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA4B;IACnE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA2B;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAExD,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B,WAAW,IAAI,IAAI;IAmBnB,OAAO,IAAI,IAAI;IAMf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,6BAA6B;IAKrF,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/applicationCustomizer/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,WAAW,6BAA8B,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAC7F,MAAM,WAAW,6BAA8B,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE7F,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAEN;AAED,qBAAa,8BAA+B,SAAQ,aAAa,CAAC,sBAAsB,CACtF,6BAA6B,EAC7B,6BAA6B,CAC9B;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA4B;IACnE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA2B;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAExD,YAAY,IAAI,IAAI;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,WAAW,IAAI,IAAI;IAmBnB,OAAO,IAAI,IAAI;IAMf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,6BAA6B;IAKrF,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}

package/lib/generators/applicationCustomizer/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -42,12 +46,11 @@ class ApplicationCustomizerGenerator extends BaseExtension.BaseExtensionGenerato
     initializing() {
         /* no-op */
     }
-    prompting() {
+    async prompting() {
         this.ensureCorrectFolder();
-        if (!this.shouldExecute()) {
-            return Promise.resolve();
+        if (this.shouldExecute()) {
+            await super.prompting();
         }
-        return super.prompting();
     }
     configuring() {
         if (this.shouldExecute()) {
@@ -77,7 +80,7 @@ class ApplicationCustomizerGenerator extends BaseExtension.BaseExtensionGenerato
         }
     }
     end() {
-        /* no-op */
+        super.end();
     }
     includeClientSideInstances() {
         return true;

package/lib/generators/applicationCustomizer/templates/none/{componentClassName}.ts

@@ -30,7 +30,9 @@ export default class <%= componentClassName %>
       message = '(No properties were provided.)';
     }
 
-    Dialog.alert(`Hello from ${strings.Title}:\n\n${message}`);
+    Dialog.alert(`Hello from ${strings.Title}:\n\n${message}`).catch(() => {
+      /* handle error */
+    });
 
     return Promise.resolve();
   }

package/lib/generators/commandSet/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/commandSet/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAG7F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,MAAM,WAAW,kBAAmB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAClF,MAAM,WAAW,kBAAmB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAElF,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAEN;AAED,qBAAa,mBAAoB,SAAQ,aAAa,CAAC,sBAAsB,CAC3E,kBAAkB,EAClB,kBAAkB,CACnB;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAiB;IACxD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAgB;IACnD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAExD,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B,WAAW,IAAI,IAAI;IAoBnB,OAAO,IAAI,IAAI;IAMf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB;IAK1E,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/commandSet/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAG7F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,MAAM,WAAW,kBAAmB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAClF,MAAM,WAAW,kBAAmB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAElF,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAEN;AAED,qBAAa,mBAAoB,SAAQ,aAAa,CAAC,sBAAsB,CAC3E,kBAAkB,EAClB,kBAAkB,CACnB;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAiB;IACxD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAgB;IACnD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAExD,YAAY,IAAI,IAAI;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,WAAW,IAAI,IAAI;IAoBnB,OAAO,IAAI,IAAI;IAMf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB;IAK1E,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}

package/lib/generators/commandSet/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -42,12 +46,11 @@ class CommandSetGenerator extends BaseExtension.BaseExtensionGenerator {
     initializing() {
         /* no-op */
     }
-    prompting() {
+    async prompting() {
         this.ensureCorrectFolder();
-        if (!this.shouldExecute()) {
-            return Promise.resolve();
+        if (this.shouldExecute()) {
+            await super.prompting();
         }
-        return super.prompting();
     }
     configuring() {
         if (this.shouldExecute()) {
@@ -78,7 +81,7 @@ class CommandSetGenerator extends BaseExtension.BaseExtensionGenerator {
         }
     }
     end() {
-        /* no-op */
+        super.end();
     }
     includeClientSideInstances() {
         return true;

package/lib/generators/commandSet/templates/none/{componentClassName}.ts

@@ -2,13 +2,11 @@ import { Log } from '@microsoft/sp-core-library';
 import {
   BaseListViewCommandSet,
   Command,
-  IListViewCommandSetListViewUpdatedParameters,
-  IListViewCommandSetExecuteEventParameters
+  IListViewCommandSetExecuteEventParameters,
+  ListViewStateChangedEventArgs
 } from '@microsoft/sp-listview-extensibility';
 import { Dialog } from '@microsoft/sp-dialog';
 
-import * as strings from '<%= componentStrings %>';
-
 /**
  * If your command set uses the ClientSideComponentProperties JSON input,
  * it will be deserialized into the BaseExtension.properties object.
@@ -26,27 +24,43 @@ export default class <%= componentClassName %> extends BaseListViewCommandSet<I<
 
   public onInit(): Promise<void> {
     Log.info(LOG_SOURCE, 'Initialized <%= componentClassName %>');
-    return Promise.resolve();
-  }
 
-  public onListViewUpdated(event: IListViewCommandSetListViewUpdatedParameters): void {
+    // initial state of the command's visibility
     const compareOneCommand: Command = this.tryGetCommand('COMMAND_1');
-    if (compareOneCommand) {
-      // This command should be hidden unless exactly one row is selected.
-      compareOneCommand.visible = event.selectedRows.length === 1;
-    }
+    compareOneCommand.visible = false;
+
+    this.context.listView.listViewStateChangedEvent.add(this, this._onListViewStateChanged);
+
+    return Promise.resolve();
   }
 
   public onExecute(event: IListViewCommandSetExecuteEventParameters): void {
     switch (event.itemId) {
       case 'COMMAND_1':
-        Dialog.alert(`${this.properties.sampleTextOne}`);
+        Dialog.alert(`${this.properties.sampleTextOne}`).catch(() => {
+          /* handle error */
+        });
         break;
       case 'COMMAND_2':
-        Dialog.alert(`${this.properties.sampleTextTwo}`);
+        Dialog.alert(`${this.properties.sampleTextTwo}`).catch(() => {
+          /* handle error */
+        });
         break;
       default:
         throw new Error('Unknown command');
     }
   }
+
+  private _onListViewStateChanged = (args: ListViewStateChangedEventArgs): void => {
+    Log.info(LOG_SOURCE, 'List view state changed');
+
+    const compareOneCommand: Command = this.tryGetCommand('COMMAND_1');
+    if (compareOneCommand) {
+      // This command should be hidden unless exactly one row is selected.
+      compareOneCommand.visible = this.context.listView.selectedRows!.length === 1;
+    }
+
+    // TODO: Add your logic here
+    // You can call this.raiseOnChage() to update the command bar
+  }
 }

package/lib/generators/component/BaseComponentGenerator.d.ts

@@ -31,11 +31,14 @@ export declare abstract class BaseComponentGenerator<IOptions extends IBaseCompo
     /** The name of the folder that this comonent should have its template copied to */
     protected abstract readonly folderName: string;
     protected abstract readonly allowedTemplates: AvailableTemplates[];
+    private _shouldLogESLintWarning;
     prompting(): Promise<void>;
     configuring(bundleEntry?: IConfigBundle): void;
     writing(shouldWrite?: boolean): void;
     install(): void;
+    end(): void;
     protected _getOutputFolder(componentNameCamelCase: string): string;
+    protected _writeESLintConfig(): void;
     private checkSolution;
 }
 export interface INormalizedComponentNames {

package/lib/generators/component/BaseComponentGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseComponentGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/component/BaseComponentGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAM7D,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI7F,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,SAAS,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB,EAAE,YAAY;IAC/E,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2BAA2B,EAAE,MAAM,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC5C,IAAI,EAAE,MAAM,GACX,IAAI,CAkBN;AAED,8BAAsB,sBAAsB,CAC1C,QAAQ,SAAS,qBAAqB,EACtC,QAAQ,SAAS,qBAAqB,CACtC,SAAQ,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACzC,mEAAmE;IACnE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IACjD,0GAA0G;IAC1G,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC7C,mFAAmF;IACnF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;IAE5D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgG1B,WAAW,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI;IAkC9C,OAAO,CAAC,WAAW,GAAE,OAAc,GAAG,IAAI;IAU1C,OAAO,IAAI,IAAI;IAOtB,SAAS,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM;IAIlE,OAAO,CAAC,aAAa;CAStB;AAED,MAAM,WAAW,yBAAyB;IACxC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,2BAA2B,EAAE,MAAM,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,uBAAuB,CACrC,sBAAsB,EAAE,MAAM,EAC9B,aAAa,EAAE,MAAM,GACpB,yBAAyB,CA0C3B"}
+{"version":3,"file":"BaseComponentGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/component/BaseComponentGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAM7D,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI7F,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,SAAS,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB,EAAE,YAAY;IAC/E,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2BAA2B,EAAE,MAAM,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC5C,IAAI,EAAE,MAAM,GACX,IAAI,CAkBN;AAED,8BAAsB,sBAAsB,CAC1C,QAAQ,SAAS,qBAAqB,EACtC,QAAQ,SAAS,qBAAqB,CACtC,SAAQ,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACzC,mEAAmE;IACnE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IACjD,0GAA0G;IAC1G,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC7C,mFAAmF;IACnF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;IAEnE,OAAO,CAAC,uBAAuB,CAAkB;IAEpC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuFhC,WAAW,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI;IAqC9C,OAAO,CAAC,WAAW,GAAE,OAAc,GAAG,IAAI;IAa1C,OAAO,IAAI,IAAI;IAOf,GAAG,IAAI,IAAI;IAUlB,SAAS,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM;IAIlE,SAAS,CAAC,kBAAkB,IAAI,IAAI;YAYtB,aAAa;CAQ5B;AAED,MAAM,WAAW,yBAAyB;IACxC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,2BAA2B,EAAE,MAAM,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,uBAAuB,CACrC,sBAAsB,EAAE,MAAM,EAC9B,aAAa,EAAE,MAAM,GACpB,yBAAyB,CA0C3B"}

package/lib/generators/component/BaseComponentGenerator.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -51,79 +55,77 @@ function defineOptions(generator, type) {
 }
 exports.defineOptions = defineOptions;
 class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
-    prompting() {
-        return this.checkSolution().then(() => {
-            const availableTemplates = [
-                { name: 'No framework', value: 'none' }
-            ];
-            if (this.allowedTemplates.indexOf('react') !== -1) {
-                availableTemplates.push({ name: 'React', value: 'react' });
-            }
-            if (this.allowedTemplates.indexOf('minimal') !== -1) {
-                availableTemplates.unshift({ name: 'Minimal', value: 'minimal' });
-            }
-            return this.prompt([
-                {
-                    type: 'input',
-                    name: 'componentName',
-                    default: 'HelloWorld',
-                    when: () => !this.config.get('componentName'),
-                    message: `What is your ${this.friendlyName} name?`,
-                    validate: (input) => {
-                        const normalizedNames = normalizeComponentNames(input, this.codeName);
-                        const outputFolderPath = this._getOutputFolder(normalizedNames.componentNameCamelCase);
-                        if (node_core_library_1.FileSystem.exists(outputFolderPath)) {
-                            console.log(colors_1.default.yellow(`\nThe folder "${outputFolderPath}" already exists.` +
-                                ` Please choose a different name for your component.`));
-                            return false;
-                        }
-                        // disallow quotes, since this will mess with the JSON we put this string into
-                        if (input.indexOf('"') !== -1) {
-                            console.log(colors_1.default.yellow(`\nDo not use double quotes in your title.`));
-                            return false;
-                        }
-                        return true;
+    constructor() {
+        super(...arguments);
+        this._shouldLogESLintWarning = false;
+    }
+    async prompting() {
+        await this.checkSolution();
+        const availableTemplates = [{ name: 'No framework', value: 'none' }];
+        if (this.allowedTemplates.indexOf('react') !== -1) {
+            availableTemplates.push({ name: 'React', value: 'react' });
+        }
+        if (this.allowedTemplates.indexOf('minimal') !== -1) {
+            availableTemplates.unshift({ name: 'Minimal', value: 'minimal' });
+        }
+        const answers = await this.prompt([
+            {
+                type: 'input',
+                name: 'componentName',
+                default: 'HelloWorld',
+                when: () => !this.config.get('componentName'),
+                message: `What is your ${this.friendlyName} name?`,
+                validate: (input) => {
+                    const normalizedNamesForValidation = normalizeComponentNames(input, this.codeName);
+                    const outputFolderPathForValidation = this._getOutputFolder(normalizedNamesForValidation.componentNameCamelCase);
+                    if (node_core_library_1.FileSystem.exists(outputFolderPathForValidation)) {
+                        console.log(colors_1.default.yellow(`\nThe folder "${outputFolderPathForValidation}" already exists.` +
+                            ` Please choose a different name for your component.`));
+                        return false;
                     }
-                    // required: true
-                },
-                {
-                    type: 'list',
-                    name: 'template',
-                    when: () => !this.config.get('framework') &&
-                        !this.config.get('template') &&
-                        availableTemplates.length !== 1,
-                    message: 'Which template would you like to use?',
-                    choices: availableTemplates
-                }
-            ]).then((answers) => {
-                const componentName = this.config.get('componentName') || answers.componentName;
-                this.context.template =
-                    this.config.get('framework') || this.config.get('template') || answers.template || 'none';
-                this.context.componentDescription =
-                    this.config.get('componentDescription') || `${componentName} description`;
-                this.context.componentId = Utils.generateGuid();
-                const normalizedNames = normalizeComponentNames(componentName, this.codeName);
-                this.context.componentNameUnescaped = normalizedNames.componentNameUnescaped;
-                this.context.componentName = normalizedNames.componentName;
-                this.context.componentNameCamelCase = normalizedNames.componentNameCamelCase;
-                this.context.componentClassName = normalizedNames.componentClassName;
-                this.context.componentStrings = normalizedNames.componentStrings;
-                this.context.componentClassNameKebabCase = normalizedNames.componentClassNameKebabCase;
-                this.context.componentAlias = normalizedNames.componentAlias;
-                // the folder where we will drop the information
-                const outputFolderPath = this._getOutputFolder(this.context.componentNameCamelCase);
-                if (node_core_library_1.FileSystem.exists(outputFolderPath)) {
-                    throw new Error(`The folder "${outputFolderPath}" already exists.` +
-                        ` Please choose a different name for your component.`);
+                    // disallow quotes, since this will mess with the JSON we put this string into
+                    if (input.indexOf('"') !== -1) {
+                        console.log(colors_1.default.yellow(`\nDo not use double quotes in your title.`));
+                        return false;
+                    }
+                    return true;
                 }
-            });
-        }, () => {
-            // Gracefully handle the error
-            return Promise.reject(undefined);
-        });
+                // required: true
+            },
+            {
+                type: 'list',
+                name: 'template',
+                when: () => !this.config.get('framework') && !this.config.get('template') && availableTemplates.length !== 1,
+                message: 'Which template would you like to use?',
+                choices: availableTemplates
+            }
+        ]);
+        const componentName = this.config.get('componentName') || answers.componentName;
+        this.context.template =
+            this.config.get('framework') || this.config.get('template') || answers.template || 'none';
+        this.context.componentDescription =
+            this.config.get('componentDescription') || `${componentName} description`;
+        this.context.componentId = Utils.generateGuid();
+        const normalizedNames = normalizeComponentNames(componentName, this.codeName);
+        this.context.componentNameUnescaped = normalizedNames.componentNameUnescaped;
+        this.context.componentName = normalizedNames.componentName;
+        this.context.componentNameCamelCase = normalizedNames.componentNameCamelCase;
+        this.context.componentClassName = normalizedNames.componentClassName;
+        this.context.componentStrings = normalizedNames.componentStrings;
+        this.context.componentClassNameKebabCase = normalizedNames.componentClassNameKebabCase;
+        this.context.componentAlias = normalizedNames.componentAlias;
+        // the folder where we will drop the information
+        const outputFolderPath = this._getOutputFolder(this.context.componentNameCamelCase);
+        if (node_core_library_1.FileSystem.exists(outputFolderPath)) {
+            throw new Error(`The folder "${outputFolderPath}" already exists.` +
+                ` Please choose a different name for your component.`);
+        }
     }
     configuring(bundleEntry) {
-        this.ensureDependencyGroup(this.context.template);
+        const templateName = this.context.template;
+        if (this.nameIsDependencyGroup(templateName)) {
+            this.ensureDependencyGroup(templateName);
+        }
         if (!this.configJson.data) {
             throw new Error(`Missing required file: "config/config.json"`);
         }
@@ -157,6 +159,8 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
             this.copyTemplate(path.join(this.sourceRoot(), this.context.template), dest);
             this.copyTemplate(path.join(this.sourceRoot(), 'base'), dest);
         }
+        // we need to write the eslint config anyway
+        this._writeESLintConfig();
     }
     install() {
         if (!this.tryInstall()) {
@@ -164,16 +168,30 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
             this.log(`Skipping installation of dependencies. You should run "npm install"`);
         }
     }
+    end() {
+        if (this._shouldLogESLintWarning) {
+            this.log(colors_1.default.yellow(`Found an existing ".eslintrc.js" file. Consider updating it if you are adding React component to non-React solution.`));
+        }
+    }
     _getOutputFolder(componentNameCamelCase) {
         return path.join(this.destinationRoot(), 'src', this.folderName, componentNameCamelCase);
     }
-    checkSolution() {
+    _writeESLintConfig() {
+        const isReactTemplate = this.context.template === 'react';
+        const esLintPath = path.join(this.destinationRoot(), '.eslintrc.js');
+        if (node_core_library_1.FileSystem.exists(esLintPath)) {
+            this._shouldLogESLintWarning = isReactTemplate;
+            return;
+        }
+        const esLintConfigFilename = isReactTemplate ? 'react.eslintrc.js' : 'default.eslintrc.js';
+        this.fs.copy(`${__dirname}/templates/eslint/${esLintConfigFilename}`, esLintPath);
+    }
+    async checkSolution() {
         if (this.config.get('creatingSolution')) {
-            return Promise.resolve(undefined);
+            return;
         }
-        return Utils.checkSolutionFolder(this, YeomanConfiguration_1.YeomanConfiguration.libraryName).then((solutionName) => {
-            this.log(`Add new ${this.friendlyName} to solution ${colors_1.default.cyan(solutionName)}.`);
-        });
+        const solutionName = await Utils.checkSolutionFolder(this, YeomanConfiguration_1.YeomanConfiguration.libraryName);
+        this.log(`Add new ${this.friendlyName} to solution ${colors_1.default.cyan(solutionName)}.`);
     }
 }
 exports.BaseComponentGenerator = BaseComponentGenerator;