@microsoft/generator-sharepoint 1.13.0-beta.19 → 1.13.0-rc.1

package/lib/common/dependency/webpart/firstParty.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0-beta.19",
-    "@microsoft/sp-property-pane": "1.13.0-beta.19",
-    "@microsoft/sp-webpart-base": "1.13.0-beta.19",
-    "@microsoft/sp-lodash-subset": "1.13.0-beta.19",
-    "@microsoft/sp-office-ui-fabric-core": "1.13.0-beta.19"
+    "@microsoft/sp-core-library": "1.13.0-rc.1",
+    "@microsoft/sp-property-pane": "1.13.0-rc.1",
+    "@microsoft/sp-webpart-base": "1.13.0-rc.1",
+    "@microsoft/sp-lodash-subset": "1.13.0-rc.1",
+    "@microsoft/sp-office-ui-fabric-core": "1.13.0-rc.1"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.19",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.19",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.19",
-    "@microsoft/rush-stack-compiler-3.7": "0.2.3"
+    "@microsoft/sp-build-web": "1.13.0-rc.1",
+    "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
+    "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
+    "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/common/dependency/webpart/firstPartyPlusBeta.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0-beta.19",
-    "@microsoft/sp-property-pane": "1.13.0-beta.19",
-    "@microsoft/sp-webpart-base": "1.13.0-beta.19",
-    "@microsoft/sp-lodash-subset": "1.13.0-beta.19",
-    "@microsoft/sp-office-ui-fabric-core": "1.13.0-beta.19"
+    "@microsoft/sp-core-library": "1.13.0-rc.1",
+    "@microsoft/sp-property-pane": "1.13.0-rc.1",
+    "@microsoft/sp-webpart-base": "1.13.0-rc.1",
+    "@microsoft/sp-lodash-subset": "1.13.0-rc.1",
+    "@microsoft/sp-office-ui-fabric-core": "1.13.0-rc.1"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.19",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.19",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.19",
-    "@microsoft/rush-stack-compiler-3.7": "0.2.3"
+    "@microsoft/sp-build-web": "1.13.0-rc.1",
+    "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
+    "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
+    "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

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

@@ -1,11 +1,13 @@
 import { IBaseOptions, BaseGenerator, AvailableFrameworks } from '../../common/BaseGenerator';
 import * as BaseComponent from '../component/BaseComponentGenerator';
+declare type IACETemplateType = 'Image' | 'PrimaryText' | 'Basic';
 export interface IACEOptions extends BaseComponent.IBaseComponentOptions {
+    aceTemplateType: IACETemplateType;
 }
 export interface IACEContext extends BaseComponent.IBaseComponentContext {
 }
-export declare function composeWith(base: BaseGenerator<any, any>, options: IBaseOptions): void;
-export declare function defineOptions(generator: BaseGenerator<any, any>): void;
+export declare function composeWith<TOptions extends IBaseOptions, TContext>(base: BaseGenerator<TOptions, TContext>, options: IBaseOptions): void;
+export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>): void;
 export declare class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerator<IACEOptions, IACEContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
@@ -17,8 +19,10 @@ export declare class AdaptiveCardExtensionGenerator extends BaseComponent.BaseCo
     writing(): void;
     install(): void;
     end(): void;
-    protected constructor(args: string | string[], options: any);
+    protected constructor(args: string | string[], options: IACEOptions);
     private shouldExecute;
     private _getTemplatePath;
+    private _getManifestTemplatePath;
 }
+export {};
 //# sourceMappingURL=index.d.ts.map

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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAE9F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE3E,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAG3E,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAEtF;AAGD,wBAAgB,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAEtE;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,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IACjE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IAE1D,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC1B,WAAW,IAAI,IAAI;IAOnB,OAAO,IAAI,IAAI;IAWf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAKlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG;IAK3D,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,gBAAgB;CAWzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/adaptiveCardExtension/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAE9F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,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,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IACjE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IAE1D,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC1B,WAAW,IAAI,IAAI;IAQnB,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

@@ -27,18 +27,15 @@ const path = __importStar(require("path"));
 const colors_1 = __importDefault(require("colors"));
 const Utils = __importStar(require("../../common/utilities"));
 const BaseComponent = __importStar(require("../component/BaseComponentGenerator"));
-// tslint:disable-next-line:no-any
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
 }
 exports.composeWith = composeWith;
-// tslint:disable-next-line:no-any
 function defineOptions(generator) {
     BaseComponent.defineOptions(generator, 'Adaptive Card Extension');
 }
 exports.defineOptions = defineOptions;
 class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerator {
-    // tslint:disable-next-line:no-any
     constructor(args, options) {
         super(args, options);
         this.friendlyName = 'Adaptive Card Extension';
@@ -72,19 +69,19 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
         return this.prompt([
             {
                 type: 'list',
-                name: 'templateType',
+                name: 'aceTemplateType',
                 default: 'PrimaryText',
-                when: () => !this.config.get('templateType'),
+                when: () => !this.config.get('aceTemplateType'),
                 message: 'Which template do you want to use?',
                 choices
             }
         ]).then((answers) => {
-            const templateType = answers.templateType || this.config.get('templateType');
+            const templateType = answers.aceTemplateType || this.config.get('aceTemplateType');
             if (!(templateType === 'Basic' || templateType === 'Image' || templateType === 'PrimaryText')) {
-                this.log(colors_1.default.red(`Invalid templateType: '${templateType}'`));
+                this.log(colors_1.default.red(`Invalid template type: '${templateType}'`));
             }
             else {
-                this.config.set('templateType', templateType);
+                this.config.set('aceTemplateType', templateType);
             }
             return super.prompting();
         });
@@ -93,12 +90,16 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
         if (this.shouldExecute()) {
             super.configuring();
             this.ensureDependencyGroup('adaptiveCardExtension');
+            this.serveJson.setUpForWebParts();
         }
     }
     writing() {
         if (this.shouldExecute()) {
             super.writing(true);
-            this.copyTemplate(this._getTemplatePath(this.config.get('templateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}/cardView`));
+            // copy view template
+            this.copyTemplate(this._getTemplatePath(this.config.get('aceTemplateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}/cardView`));
+            // copy manifest.json path
+            this.copyTemplate(this._getManifestTemplatePath(this.config.get('aceTemplateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}`));
         }
     }
     install() {
@@ -112,11 +113,9 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
     shouldExecute() {
         return (this.config.get('environment') === 'spo' &&
             this.config.get('componentType') === 'adaptiveCardExtension' &&
-            this.config.get('isDomainIsolated') === false &&
-            this.config.get('plusBeta') === true);
+            this.config.get('isDomainIsolated') === false);
     }
     _getTemplatePath(templateType) {
-        // templateType will not be invalid at this point. Check is done inside prompting()
         switch (templateType) {
             case 'Image':
                 return this.templatePath('./imageCardView/');
@@ -126,6 +125,14 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
                 return this.templatePath('./basicCardView/');
         }
     }
+    _getManifestTemplatePath(templateType) {
+        if (templateType === 'Image') {
+            return this.templatePath('./manifestTemplate/imageTemplate');
+        }
+        else {
+            return this.templatePath('./manifestTemplate/baseTemplate');
+        }
+    }
 }
 exports.AdaptiveCardExtensionGenerator = AdaptiveCardExtensionGenerator;
 // Yeoman expects exports of this type, which overrides the TS exports above

package/lib/generators/adaptiveCardExtension/templates/imageCardView/CardView.ts

@@ -2,12 +2,31 @@ import {
   BaseImageCardView,
   IImageCardParameters,
   IExternalLinkCardAction,
-  IQuickViewCardAction
+  IQuickViewCardAction,
+  ICardButton
 } from '@microsoft/sp-adaptive-card-extension-base';
 import * as strings from '<%= componentStrings %>';
-import { I<%= componentClassName %>Props, I<%= componentClassName %>State } from '../<%= componentClassName %>';
+import { I<%= componentClassName %>Props, I<%= componentClassName %>State, QUICK_VIEW_REGISTRY_ID } from '../<%= componentClassName %>';
 
 export class CardView extends BaseImageCardView<I<%= componentClassName %>Props, I<%= componentClassName %>State> {
+  /**
+   * Buttons will not be visible if card size is 'Medium' with Image Card View.
+   * It will support up to two buttons for 'Large' card size.
+   */
+  public get cardButtons(): [ICardButton] | [ICardButton, ICardButton] | undefined {
+    return [
+      {
+        title: strings.QuickViewButton,
+        action: {
+          type: 'QuickView',
+          parameters: {
+            view: QUICK_VIEW_REGISTRY_ID
+          }
+        }
+      }
+    ];
+  }
+
   public get data(): IImageCardParameters {
     return {
       primaryText: strings.PrimaryText,

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

@@ -12,7 +12,7 @@
   // Components that allow authors to embed arbitrary script code should set this to true.
   // https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
   "requiresCustomScript": false,
-  "supportedHosts": ["Dashboard", "SharePointWebPart"],
+  "supportedHosts": ["Dashboard"],
   "supportsThemeVariants": true,
   "preconfiguredEntries": [{
     "groupId": "bd067b1e-3ad5-4d5d-a5fe-505f07d7f59c", // Dashboard

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

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/spfx/client-side-web-part-manifest.schema.json",
+  "id": "<%= componentId %>",
+  "alias": "<%= componentAlias %>",
+  "componentType": "AdaptiveCardExtension",
+
+  // The "*" signifies that the version should be taken from the package.json
+  "version": "*",
+  "manifestVersion": 2,
+
+  // If true, the component can only be installed on sites where Custom Script is allowed.
+  // Components that allow authors to embed arbitrary script code should set this to true.
+  // 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" },
+    "title": { "default": "<%= componentNameUnescaped %>" },
+    "description": { "default": "<%= componentDescription %>" },
+    "officeFabricIconFontName": "SharePointLogo",
+    "cardSize": "Large",
+    "properties": {
+      "title": "<%= componentNameUnescaped %>",
+      "description": "<%= componentDescription %>",
+      "iconProperty": "" // Default to sharepointlogo
+    }
+  }]
+}

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

@@ -6,5 +6,5 @@ export interface IAppContext {
 }
 export interface IAppOptions extends IBaseOptions, Solution.ISolutionOptions, Component.IComponentSelectorOptions {
 }
-export declare function composeWith(base: BaseGenerator<any, any>, options: IAppOptions): void;
+export declare function composeWith<TOptions extends IBaseOptions, TContext>(base: BaseGenerator<TOptions, TContext>, options: IAppOptions): void;
 //# sourceMappingURL=index.d.ts.map

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;AAG1C,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAErF"}
+{"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"}

package/lib/generators/app/index.js

@@ -41,7 +41,6 @@ const CommandSet = __importStar(require("../commandSet"));
 const SearchQueryModifier = __importStar(require("../searchQueryModifier"));
 const ApplicationCustomizer = __importStar(require("../applicationCustomizer"));
 const VERSION = require('../../../package.json').version;
-// tslint:disable-next-line:no-any
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
 }
@@ -50,7 +49,6 @@ exports.composeWith = composeWith;
  * This class is the entry point when running `yo @microsoft/sharepoint`
  */
 class AppGenerator extends BaseGenerator_1.BaseGenerator {
-    /* tslint:disable-next-line:no-any */
     constructor(args, options) {
         super(args, options);
         this.friendlyName = 'SharePoint Client-side Solution Generator';
@@ -90,6 +88,12 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
         else {
             this.config.set('extensionType', undefined);
         }
+        if (this.options.aceTemplateType !== undefined) {
+            this.config.set('aceTemplateType', this.options.aceTemplateType);
+        }
+        else {
+            this.config.set('aceTemplateType', undefined);
+        }
         if (this.options.framework !== undefined) {
             this.config.set('framework', this.options.framework);
         }
@@ -111,6 +115,7 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
             'skip-install': this.options['skip-install'],
             plusbeta: this.options.plusbeta
         };
+        this.env.options.nodePackageManager = this.options.packageManager || 'npm';
         // Config destination root before composition.
         Solution.composeWith(this, baseOption);
         Component.composeWith(this, baseOption);

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

@@ -5,8 +5,8 @@ export interface IApplicationCustomizerOptions extends BaseExtension.IBaseExtens
 }
 export interface IApplicationCustomizerContext extends BaseExtension.IBaseExtensionContext {
 }
-export declare function composeWith(base: BaseGenerator<any, any>, options: IBaseOptions): void;
-export declare function defineOptions(generator: BaseGenerator<any, any>): void;
+export declare function composeWith<TOptions extends IBaseOptions, TContext>(base: BaseGenerator<TOptions, TContext>, options: IBaseOptions): void;
+export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>): void;
 export declare class ApplicationCustomizerGenerator extends BaseExtension.BaseExtensionGenerator<IApplicationCustomizerOptions, IApplicationCustomizerContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
@@ -17,7 +17,7 @@ export declare class ApplicationCustomizerGenerator extends BaseExtension.BaseEx
     writing(): void;
     install(): void;
     end(): void;
-    protected constructor(args: string | string[], options: any);
+    protected constructor(args: string | string[], options: IApplicationCustomizerOptions);
     protected includeClientSideInstances(): boolean;
     private shouldExecute;
 }

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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGhF,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;AAG7F,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAEtF;AAGD,wBAAgB,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAEtE;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,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IAE1D,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;IAKlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG;IAK3D,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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGhF,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,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IAE1D,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"}

package/lib/generators/applicationCustomizer/index.js

@@ -23,18 +23,15 @@ exports.ApplicationCustomizerGenerator = exports.defineOptions = exports.compose
 const path = __importStar(require("path"));
 const Utils = __importStar(require("../../common/utilities"));
 const BaseExtension = __importStar(require("../extension/BaseExtensionGenerator"));
-// tslint:disable-next-line:no-any
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
 }
 exports.composeWith = composeWith;
-// tslint:disable-next-line:no-any
 function defineOptions(generator) {
     BaseExtension.defineOptions(generator, 'Application Customizer');
 }
 exports.defineOptions = defineOptions;
 class ApplicationCustomizerGenerator extends BaseExtension.BaseExtensionGenerator {
-    // tslint:disable-next-line:no-any
     constructor(args, options) {
         super(args, options);
         this.friendlyName = 'Application Customizer';

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

@@ -4,8 +4,8 @@ export interface ICommandSetOptions extends BaseExtension.IBaseExtensionOptions
 }
 export interface ICommandSetContext extends BaseExtension.IBaseExtensionContext {
 }
-export declare function composeWith(base: BaseGenerator<any, any>, options: IBaseOptions): void;
-export declare function defineOptions(generator: BaseGenerator<any, any>): void;
+export declare function composeWith<TOptions extends IBaseOptions, TContext>(base: BaseGenerator<TOptions, TContext>, options: IBaseOptions): void;
+export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>): void;
 export declare class CommandSetGenerator extends BaseExtension.BaseExtensionGenerator<ICommandSetOptions, ICommandSetContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
@@ -16,7 +16,7 @@ export declare class CommandSetGenerator extends BaseExtension.BaseExtensionGene
     writing(): void;
     install(): void;
     end(): void;
-    protected constructor(args: string | string[], options: any);
+    protected constructor(args: string | string[], options: ICommandSetOptions);
     protected includeClientSideInstances(): boolean;
     private shouldExecute;
 }

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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAG9F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,MAAM,WAAW,kBAAmB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAClF,MAAM,WAAW,kBAAmB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAGlF,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAEtF;AAGD,wBAAgB,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAEtE;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,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IAE1D,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;IAKlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG;IAK3D,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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAG9F,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,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IAE1D,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"}

package/lib/generators/commandSet/index.js

@@ -23,18 +23,15 @@ exports.CommandSetGenerator = exports.defineOptions = exports.composeWith = void
 const path = __importStar(require("path"));
 const Utils = __importStar(require("../../common/utilities"));
 const BaseExtension = __importStar(require("../extension/BaseExtensionGenerator"));
-// tslint:disable-next-line:no-any
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
 }
 exports.composeWith = composeWith;
-// tslint:disable-next-line:no-any
 function defineOptions(generator) {
     BaseExtension.defineOptions(generator, 'Command Set');
 }
 exports.defineOptions = defineOptions;
 class CommandSetGenerator extends BaseExtension.BaseExtensionGenerator {
-    // tslint:disable-next-line:no-any
     constructor(args, options) {
         super(args, options);
         this.friendlyName = 'Command Set';

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

@@ -18,7 +18,7 @@ export interface IBaseComponentContext extends IBaseComponentShared {
     componentStrings: string;
     componentNameUnescaped: string;
 }
-export declare function defineOptions(generator: BaseGenerator<any, any>, type: string): void;
+export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>, type: string): void;
 export declare abstract class BaseComponentGenerator<IOptions extends IBaseComponentOptions, IContext extends IBaseComponentContext> extends BaseGenerator<IOptions, IContext> {
     /** The friendly name of this component, which appears in the UI */
     protected abstract readonly friendlyName: string;

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,mBAAmB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI9F,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,mBAAmB,CAAC;IAC/B,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;AAGD,wBAAgB,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAiBpF;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,iBAAiB,EAAE,mBAAmB,EAAE,CAAC;IAE9D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8F1B,WAAW,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI;IAkC9C,OAAO,CAAC,WAAW,GAAE,OAAc,GAAG,IAAI;IAU1C,OAAO,IAAI,IAAI;IAOtB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,aAAa;CAUtB;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,mBAAmB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI9F,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,mBAAmB,CAAC;IAC/B,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,CAiBN;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,iBAAiB,EAAE,mBAAmB,EAAE,CAAC;IAE9D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAkG1B,WAAW,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI;IAkC9C,OAAO,CAAC,WAAW,GAAE,OAAc,GAAG,IAAI;IAU1C,OAAO,IAAI,IAAI;IAOtB,OAAO,CAAC,gBAAgB;IAIxB,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"}

package/lib/generators/component/BaseComponentGenerator.js

@@ -30,7 +30,6 @@ const path = __importStar(require("path"));
 const BaseGenerator_1 = require("../../common/BaseGenerator");
 const Utils = __importStar(require("../../common/utilities"));
 const YeomanConfiguration_1 = require("../../common/YeomanConfiguration");
-// tslint:disable-next-line:no-any
 function defineOptions(generator, type) {
     generator.option('component-description', {
         description: `${type} description`,
@@ -172,7 +171,6 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
         if (this.config.get('creatingSolution')) {
             return Promise.resolve(undefined);
         }
-        // tslint:disable-next-line:no-any
         return Utils.checkSolutionFolder(this, YeomanConfiguration_1.YeomanConfiguration.libraryName).then((solutionName) => {
             this.log(`Add new ${this.friendlyName} to solution ${colors_1.default.cyan(solutionName)}.`);
         });

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

@@ -1,11 +1,12 @@
 import { IBaseOptions, BaseGenerator } from '../../common/BaseGenerator';
 import * as Webpart from '../webpart';
 import * as Extension from '../extension';
-export interface IComponentSelectorOptions extends Webpart.IWebpartOptions, Extension.IExtensionOptions {
+import * as AdaptiveCardExtension from '../adaptiveCardExtension';
+export interface IComponentSelectorOptions extends Webpart.IWebpartOptions, Extension.IExtensionOptions, AdaptiveCardExtension.IACEOptions {
     componentType: 'webpart' | 'extension' | 'library' | 'adaptiveCardExtension';
 }
-export declare function composeWith(base: BaseGenerator<any, any>, options: IBaseOptions): void;
-export declare function defineOptions(generator: BaseGenerator<any, any>): void;
+export declare function composeWith<TOptions extends IBaseOptions, TContext>(base: BaseGenerator<TOptions, TContext>, options: IBaseOptions): void;
+export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>): void;
 /**
  * This class selects between multiple different types of components for instantiation.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/component/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGzE,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAK1C,MAAM,WAAW,yBAA0B,SAAQ,OAAO,CAAC,eAAe,EAAE,SAAS,CAAC,iBAAiB;IACrG,aAAa,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,uBAAuB,CAAC;CAC9E;AAGD,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAEtF;AAGD,wBAAgB,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAUtE;AAED;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,aAAa,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAC1F,SAAgB,YAAY,EAAE,MAAM,CAAyB;IAEtD,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmE1B,WAAW,IAAI,IAAI;IAGnB,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;IAGf,GAAG,IAAI,IAAI;IAIlB,OAAO,CAAC,aAAa;CAGtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/component/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGzE,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,qBAAqB,MAAM,0BAA0B,CAAC;AAGlE,MAAM,WAAW,yBACf,SAAQ,OAAO,CAAC,eAAe,EAC7B,SAAS,CAAC,iBAAiB,EAC3B,qBAAqB,CAAC,WAAW;IACnC,aAAa,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,uBAAuB,CAAC;CAC9E;AAED,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,CAUN;AAED;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,aAAa,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAC1F,SAAgB,YAAY,EAAE,MAAM,CAAyB;IAEtD,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgE1B,WAAW,IAAI,IAAI;IAGnB,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;IAGf,GAAG,IAAI,IAAI;IAIlB,OAAO,CAAC,aAAa;CAGtB"}

package/lib/generators/component/index.js

@@ -31,12 +31,10 @@ const Webpart = __importStar(require("../webpart"));
 const Extension = __importStar(require("../extension"));
 const Library = __importStar(require("../library"));
 const AdaptiveCardExtension = __importStar(require("../adaptiveCardExtension"));
-// tslint:disable-next-line:no-any
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
 }
 exports.composeWith = composeWith;
-// tslint:disable-next-line:no-any
 function defineOptions(generator) {
     generator.option('component-type', {
         description: `The type of component. Currently "webpart", "extension", "library", or "adaptiveCardExtension" (beta)`,
@@ -86,14 +84,12 @@ class ComponentSelectorGenerator extends BaseGenerator_1.BaseGenerator {
                 {
                     name: 'Library',
                     value: 'library'
-                }
-            ];
-            if (this.config.get('plusBeta') === true) {
-                choices.push({
+                },
+                {
                     name: 'Adaptive Card Extension',
                     value: 'adaptiveCardExtension'
-                });
-            }
+                }
+            ];
         }
         return this.prompt([
             {

package/lib/generators/extension/BaseExtensionGenerator.d.ts

@@ -1,11 +1,11 @@
-import { BaseGenerator } from '../../common/BaseGenerator';
+import { BaseGenerator, IBaseOptions } from '../../common/BaseGenerator';
 import * as BaseComponent from '../component/BaseComponentGenerator';
-export declare type AvailableExtensions = 'ApplicationCustomizer' | 'FieldCustomizer' | 'CommandSet' | 'SearchQueryModifier';
+export declare type AvailableExtensions = 'ApplicationCustomizer' | 'CommandSet' | 'FieldCustomizer' | 'SearchQueryModifier';
 export interface IBaseExtensionOptions extends BaseComponent.IBaseComponentOptions {
 }
 export interface IBaseExtensionContext extends BaseComponent.IBaseComponentContext {
 }
-export declare function defineOptions(generator: BaseGenerator<any, any>, type?: string): void;
+export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>, type?: string): void;
 export declare abstract class BaseExtensionGenerator<IOptions extends IBaseExtensionOptions, IContext extends IBaseExtensionContext> extends BaseComponent.BaseComponentGenerator<IOptions, IContext> {
     protected readonly folderName: string;
     prompting(): Promise<void>;

package/lib/generators/extension/BaseExtensionGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseExtensionGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/extension/BaseExtensionGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,oBAAY,mBAAmB,GAE7B,uBAAuB,GAAG,iBAAiB,GAAG,YAAY,GAAG,qBAAqB,CAAC;AAErF,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AACrF,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAGrF,wBAAgB,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,GAAE,MAAoB,GAAG,IAAI,CAElG;AAED,8BAAsB,sBAAsB,CAC1C,QAAQ,SAAS,qBAAqB,EACtC,QAAQ,SAAS,qBAAqB,CACtC,SAAQ,aAAa,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAgB;IAE9C,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1B,WAAW,IAAI,IAAI;IAQnB,OAAO,CAAC,UAAU,GAAE,OAAc,GAAG,IAAI;IAUzC,OAAO,IAAI,IAAI;IAItB,SAAS,CAAC,QAAQ,CAAC,0BAA0B,IAAI,OAAO;IAExD,OAAO,CAAC,cAAc;CAIvB"}
+{"version":3,"file":"BaseExtensionGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/extension/BaseExtensionGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,oBAAY,mBAAmB,GAC3B,uBAAuB,GACvB,YAAY,GACZ,iBAAiB,GACjB,qBAAqB,CAAC;AAE1B,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AACrF,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAErF,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC5C,IAAI,GAAE,MAAoB,GACzB,IAAI,CAEN;AAED,8BAAsB,sBAAsB,CAC1C,QAAQ,SAAS,qBAAqB,EACtC,QAAQ,SAAS,qBAAqB,CACtC,SAAQ,aAAa,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAgB;IAE9C,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1B,WAAW,IAAI,IAAI;IAQnB,OAAO,CAAC,UAAU,GAAE,OAAc,GAAG,IAAI;IAUzC,OAAO,IAAI,IAAI;IAItB,SAAS,CAAC,QAAQ,CAAC,0BAA0B,IAAI,OAAO;IAExD,OAAO,CAAC,cAAc;CAIvB"}

package/lib/generators/extension/BaseExtensionGenerator.js

@@ -24,7 +24,6 @@ const path = __importStar(require("path"));
 const node_core_library_1 = require("@rushstack/node-core-library");
 const Utils = __importStar(require("../../common/utilities"));
 const BaseComponent = __importStar(require("../component/BaseComponentGenerator"));
-// tslint:disable-next-line:no-any
 function defineOptions(generator, type = 'Extension') {
     BaseComponent.defineOptions(generator, type);
 }

package/lib/generators/extension/index.d.ts

@@ -6,8 +6,8 @@ import * as BaseExtension from './BaseExtensionGenerator';
 export interface IExtensionOptions extends FieldCustomizer.IFieldCustomizerOptions, CommandSet.ICommandSetOptions, ApplicationCustomizer.IApplicationCustomizerOptions {
     extensionType: BaseExtension.AvailableExtensions;
 }
-export declare function defineOptions(generator: BaseGenerator<any, any>): void;
-export declare function composeWith(base: BaseGenerator<any, any>, options: IBaseOptions): void;
+export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>): void;
+export declare function composeWith<TOptions extends IBaseOptions, TContext>(base: BaseGenerator<TOptions, TContext>, options: IBaseOptions): void;
 /**
  * This class selects between multiple different types of extensions for instantiation.
  */
@@ -19,7 +19,7 @@ export declare class ExtensionSelectorGenerator extends BaseGenerator<IExtension
     writing(): void;
     install(): void;
     end(): void;
-    protected constructor(args: string | string[], options: any);
+    protected constructor(args: string | string[], options: IExtensionOptions);
     private shouldExecute;
 }
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/extension/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,KAAK,qBAAqB,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,eAAe,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAC;AAE1D,MAAM,WAAW,iBACf,SAAQ,eAAe,CAAC,uBAAuB,EAC7C,UAAU,CAAC,kBAAkB,EAC7B,qBAAqB,CAAC,6BAA6B;IACrD,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;CAClD;AAGD,wBAAgB,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAOtE;AAGD,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAEtF;AAED;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,aAAa,CAAC,iBAAiB,EAAE,EAAE,CAAC;IAClF,SAAgB,YAAY,EAAE,MAAM,CAAyB;IAEtD,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsD1B,WAAW,IAAI,IAAI;IAGnB,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;IAGf,GAAG,IAAI,IAAI;IAKlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG;IAI3D,OAAO,CAAC,aAAa;CAGtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/extension/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,KAAK,qBAAqB,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,UAAU,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,eAAe,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAC;AAE1D,MAAM,WAAW,iBACf,SAAQ,eAAe,CAAC,uBAAuB,EAC7C,UAAU,CAAC,kBAAkB,EAC7B,qBAAqB,CAAC,6BAA6B;IACrD,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;CAClD;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAON;AAED,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;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,aAAa,CAAC,iBAAiB,EAAE,EAAE,CAAC;IAClF,SAAgB,YAAY,EAAE,MAAM,CAAyB;IAEtD,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA4D1B,WAAW,IAAI,IAAI;IAGnB,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;IAGf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,iBAAiB;IAIzE,OAAO,CAAC,aAAa;CAGtB"}

package/lib/generators/extension/index.js

@@ -29,7 +29,6 @@ const BaseGenerator_1 = require("../../common/BaseGenerator");
 const Utils = __importStar(require("../../common/utilities"));
 const CommandSet = __importStar(require("../commandSet"));
 const FieldCustomizer = __importStar(require("../fieldCustomizer"));
-// tslint:disable-next-line:no-any
 function defineOptions(generator) {
     FieldCustomizer.defineOptions(generator);
     CommandSet.defineOptions(generator);
@@ -39,7 +38,6 @@ function defineOptions(generator) {
     });
 }
 exports.defineOptions = defineOptions;
-// tslint:disable-next-line:no-any
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
 }
@@ -48,7 +46,6 @@ exports.composeWith = composeWith;
  * This class selects between multiple different types of extensions for instantiation.
  */
 class ExtensionSelectorGenerator extends BaseGenerator_1.BaseGenerator {
-    // tslint:disable-next-line:no-any
     constructor(args, options) {
         super(args, options);
         this.friendlyName = 'Extension Selection';

package/lib/generators/fieldCustomizer/index.d.ts

@@ -5,8 +5,8 @@ export interface IFieldCustomizerOptions extends BaseExtension.IBaseExtensionOpt
 export interface IFieldCustomizerContext extends BaseExtension.IBaseExtensionContext {
     fieldId: string;
 }
-export declare function composeWith(base: BaseGenerator<any, any>, options: IBaseOptions): void;
-export declare function defineOptions(generator: BaseGenerator<any, any>): void;
+export declare function composeWith<TOptions extends IBaseOptions, TContext>(base: BaseGenerator<TOptions, TContext>, options: IBaseOptions): void;
+export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>): void;
 export declare class FieldCustomizerGenerator extends BaseExtension.BaseExtensionGenerator<IFieldCustomizerOptions, IFieldCustomizerContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
@@ -17,7 +17,7 @@ export declare class FieldCustomizerGenerator extends BaseExtension.BaseExtensio
     writing(): void;
     install(): void;
     end(): void;
-    protected constructor(args: string | string[], options: any);
+    protected constructor(args: string | string[], options: IFieldCustomizerOptions);
     protected includeClientSideInstances(): boolean;
     private shouldExecute;
 }