@microsoft/generator-sharepoint 1.13.1 → 1.14.0-beta.4

package/lib/generators/component/BaseComponentGenerator.js

@@ -40,7 +40,8 @@ function defineOptions(generator, type) {
         type: String
     });
     generator.option('framework', {
-        description: 'Framework to use. Available: "none", "react"',
+        // NOTE: 'framemowrk' name is kept for backward compatibility
+        description: 'Template to use. Available: "none", "react", "minimal"',
         type: String
     });
     generator.option('plusbeta', {
@@ -52,11 +53,14 @@ exports.defineOptions = defineOptions;
 class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
     prompting() {
         return this.checkSolution().then(() => {
-            const availableFrameworks = [
+            const availableTemplates = [
                 { name: 'No JavaScript framework', value: 'none' }
             ];
-            if (this.allowedFrameworks.indexOf('react') !== -1) {
-                availableFrameworks.push({ name: 'React', value: 'react' });
+            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([
                 {
@@ -92,13 +96,16 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
                 },
                 {
                     type: 'list',
-                    name: 'framework',
-                    when: () => !this.config.get('framework') && availableFrameworks.length !== 1,
-                    message: 'Which framework would you like to use?',
-                    choices: availableFrameworks
+                    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) => {
-                this.context.framework = this.config.get('framework') || answers.framework || 'none';
+                this.context.template =
+                    this.config.get('framework') || this.config.get('template') || answers.template || 'none';
                 this.context.componentDescription =
                     this.config.get('componentDescription') || answers.componentDescription || '';
                 this.context.componentId = Utils.generateGuid();
@@ -123,7 +130,7 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
         });
     }
     configuring(bundleEntry) {
-        this.ensureDependencyGroup(this.context.framework);
+        this.ensureDependencyGroup(this.context.template);
         if (!this.configJson.data) {
             throw new Error(`Missing required file: "config/config.json"`);
         }
@@ -154,7 +161,7 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
         super.writing(false);
         if (shouldWrite) {
             const dest = this._getOutputFolder(this.context.componentNameCamelCase);
-            this.copyTemplate(path.join(this.sourceRoot(), this.context.framework), dest);
+            this.copyTemplate(path.join(this.sourceRoot(), this.context.template), dest);
             this.copyTemplate(path.join(this.sourceRoot(), 'base'), dest);
         }
     }

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;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"}
+{"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;IAkE1B,WAAW,IAAI,IAAI;IAGnB,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;IAGf,GAAG,IAAI,IAAI;IAIlB,OAAO,CAAC,aAAa;CAGtB"}

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

@@ -13,6 +13,7 @@ export declare abstract class BaseExtensionGenerator<IOptions extends IBaseExten
     writing(shouldCopy?: boolean): void;
     install(): void;
     protected abstract includeClientSideInstances(): boolean;
-    private hasElementsXml;
+    protected hasElementsXml(): boolean;
+    private _getFeatureFrameworkDocsUrl;
 }
 //# sourceMappingURL=BaseExtensionGenerator.d.ts.map

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,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"}
+{"version":3,"file":"BaseExtensionGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/extension/BaseExtensionGenerator.ts"],"names":[],"mappings":"AAKA,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;IAoBzC,OAAO,IAAI,IAAI;IAItB,SAAS,CAAC,QAAQ,CAAC,0BAA0B,IAAI,OAAO;IAExD,SAAS,CAAC,cAAc,IAAI,OAAO;IAKnC,OAAO,CAAC,2BAA2B;CAgBpC"}

package/lib/generators/extension/BaseExtensionGenerator.js

@@ -18,9 +18,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseExtensionGenerator = exports.defineOptions = void 0;
 const path = __importStar(require("path"));
+const safe_1 = __importDefault(require("colors/safe"));
 const node_core_library_1 = require("@rushstack/node-core-library");
 const Utils = __importStar(require("../../common/utilities"));
 const BaseComponent = __importStar(require("../component/BaseComponentGenerator"));
@@ -50,6 +54,12 @@ class BaseExtensionGenerator extends BaseComponent.BaseComponentGenerator {
                 const dest = path.join(this.destinationRoot(), 'sharepoint');
                 this.copyTemplate(path.join(this.sourceRoot(), 'sharepoint'), dest);
             }
+            else {
+                const docsUrl = this._getFeatureFrameworkDocsUrl();
+                if (docsUrl) {
+                    this.log(safe_1.default.yellow(`Elements.xml already exists. Please, reference ${docsUrl} to add additional elements to it.`));
+                }
+            }
         }
     }
     install() {
@@ -59,6 +69,21 @@ class BaseExtensionGenerator extends BaseComponent.BaseComponentGenerator {
         const elementsXmlPath = path.join(this.destinationRoot(), 'sharepoint', 'assets', 'elements.xml');
         return node_core_library_1.FileSystem.exists(elementsXmlPath);
     }
+    _getFeatureFrameworkDocsUrl() {
+        const extensionType = this.config.get('extensionType');
+        switch (extensionType) {
+            case 'FieldCustomizer':
+                return 'https://aka.ms/spfx/extensions/field';
+            case 'ListViewCommandSet':
+                return 'https://aka.ms/spfx/extensions/cmdset';
+            case 'ApplicationCustomizer':
+                return 'https://aka.ms/spfx/extensions/tutorial/helloworld3';
+            case 'SearchQueryModifier':
+                return 'https://aka.ms/spfx/extensions/search';
+            default:
+                return '';
+        }
+    }
 }
 exports.BaseExtensionGenerator = BaseExtensionGenerator;
 //# sourceMappingURL=BaseExtensionGenerator.js.map

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

@@ -1,4 +1,4 @@
-import { IBaseOptions, BaseGenerator, AvailableFrameworks } from '../../common/BaseGenerator';
+import { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
 import * as BaseExtension from '../extension/BaseExtensionGenerator';
 export interface IFieldCustomizerOptions extends BaseExtension.IBaseExtensionOptions {
 }
@@ -10,7 +10,7 @@ export declare function defineOptions<TOptions extends IBaseOptions, TContext>(g
 export declare class FieldCustomizerGenerator extends BaseExtension.BaseExtensionGenerator<IFieldCustomizerOptions, IFieldCustomizerContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
-    protected readonly allowedFrameworks: AvailableFrameworks[];
+    protected readonly allowedTemplates: AvailableTemplates[];
     initializing(): void;
     prompting(): Promise<void>;
     configuring(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/fieldCustomizer/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,uBAAwB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AACvF,MAAM,WAAW,uBAAwB,SAAQ,aAAa,CAAC,qBAAqB;IAClF,OAAO,EAAE,MAAM,CAAC;CACjB;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,CAEN;AAED,qBAAa,wBAAyB,SAAQ,aAAa,CAAC,sBAAsB,CAChF,uBAAuB,EACvB,uBAAuB,CACxB;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAsB;IAC7D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAqB;IACxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,CAAa;IAEjE,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,uBAAuB;IAK/E,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/fieldCustomizer/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,uBAAwB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AACvF,MAAM,WAAW,uBAAwB,SAAQ,aAAa,CAAC,qBAAqB;IAClF,OAAO,EAAE,MAAM,CAAC;CACjB;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,CAEN;AAED,qBAAa,wBAAyB,SAAQ,aAAa,CAAC,sBAAsB,CAChF,uBAAuB,EACvB,uBAAuB,CACxB;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAsB;IAC7D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAqB;IACxD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAwB;IAE1E,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B,WAAW,IAAI,IAAI;IAoBnB,OAAO,IAAI,IAAI;IAuBf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,uBAAuB;IAK/E,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}

package/lib/generators/fieldCustomizer/index.js

@@ -36,7 +36,7 @@ class FieldCustomizerGenerator extends BaseExtension.BaseExtensionGenerator {
         super(args, options);
         this.friendlyName = 'Field Customizer';
         this.codeName = 'FieldCustomizer';
-        this.allowedFrameworks = ['react'];
+        this.allowedTemplates = ['react', 'minimal'];
         defineOptions(this);
     }
     initializing() {
@@ -69,7 +69,17 @@ class FieldCustomizerGenerator extends BaseExtension.BaseExtensionGenerator {
     }
     writing() {
         if (this.shouldExecute()) {
-            super.writing();
+            super.writing(false);
+            const dest = this._getOutputFolder(this.context.componentNameCamelCase);
+            const template = this.context.template;
+            this.copyTemplate(path.join(this.sourceRoot(), template), dest);
+            if (template !== 'minimal') {
+                this.copyTemplate(path.join(this.sourceRoot(), 'loc'), path.join(dest, 'loc'));
+            }
+            if (!this.hasElementsXml()) {
+                this.copyTemplate(path.join(this.sourceRoot(), 'sharepoint'), path.join(this.destinationRoot(), 'sharepoint'));
+            }
+            this.copyTemplate(path.join(this.sourceRoot(), 'base'), dest);
         }
     }
     install() {

package/lib/generators/fieldCustomizer/templates/minimal/loc/en-us.js

@@ -0,0 +1,4 @@
+define([], function() {
+  return {
+  }
+});

package/lib/generators/fieldCustomizer/templates/minimal/loc/myStrings.d.ts

@@ -0,0 +1,7 @@
+declare interface I<%= componentStrings %> {
+}
+
+declare module '<%= componentStrings %>' {
+  const strings: I<%= componentStrings %>;
+  export = strings;
+}

package/lib/generators/fieldCustomizer/templates/minimal/{componentClassName}.module.scss

@@ -0,0 +1,3 @@
+.<%= componentName %> {
+  color: inherit;
+}

package/lib/generators/fieldCustomizer/templates/minimal/{componentClassName}.ts

@@ -0,0 +1,29 @@
+import {
+  BaseFieldCustomizer,
+  IFieldCustomizerCellEventParameters
+} from '@microsoft/sp-listview-extensibility';
+
+import styles from './<%= componentClassName %>.module.scss';
+
+/**
+ * If your field customizer uses the ClientSideComponentProperties JSON input,
+ * it will be deserialized into the BaseExtension.properties object.
+ * You can define an interface to describe it.
+ */
+export interface I<%= componentClassName %>Properties {}
+
+export default class <%= componentClassName %>
+  extends BaseFieldCustomizer<I<%= componentClassName %>Properties> {
+
+  public onInit(): Promise<void> {
+    return Promise.resolve();
+  }
+
+  public onRenderCell(event: IFieldCustomizerCellEventParameters): void {
+    event.domElement.classList.add(styles.<%= componentName %>);
+  }
+
+  public onDisposeCell(event: IFieldCustomizerCellEventParameters): void {
+    super.onDisposeCell(event);
+  }
+}

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

@@ -1,5 +1,4 @@
 import { Log } from '@microsoft/sp-core-library';
-import { override } from '@microsoft/decorators';
 import {
   BaseFieldCustomizer,
   IFieldCustomizerCellEventParameters
@@ -23,7 +22,6 @@ const LOG_SOURCE: string = '<%= componentClassName %>';
 export default class <%= componentClassName %>
   extends BaseFieldCustomizer<I<%= componentClassName %>Properties> {
 
-  @override
   public onInit(): Promise<void> {
     // Add your custom initialization to this method.  The framework will wait
     // for the returned promise to resolve before firing any BaseFieldCustomizer events.
@@ -33,7 +31,6 @@ export default class <%= componentClassName %>
     return Promise.resolve();
   }
 
-  @override
   public onRenderCell(event: IFieldCustomizerCellEventParameters): void {
     // Use this method to perform your custom cell rendering.
     const text: string = `${this.properties.sampleText}: ${event.fieldValue}`;
@@ -43,7 +40,6 @@ export default class <%= componentClassName %>
     event.domElement.classList.add(styles.<%= componentName %>);
   }
 
-  @override
   public onDisposeCell(event: IFieldCustomizerCellEventParameters): void {
     // This method should be used to free any resources that were allocated during rendering.
     // For example, if your onRenderCell() called ReactDOM.render(), then you should

package/lib/generators/fieldCustomizer/templates/react/components/{componentName}.tsx

@@ -1,5 +1,4 @@
 import { Log } from '@microsoft/sp-core-library';
-import { override } from '@microsoft/decorators';
 import * as React from 'react';
 
 import styles from './<%= componentName %>.module.scss';
@@ -11,17 +10,14 @@ export interface I<%= componentName %>Props {
 const LOG_SOURCE: string = '<%= componentName %>';
 
 export default class <%= componentName %> extends React.Component<I<%= componentName %>Props, {}> {
-  @override
   public componentDidMount(): void {
     Log.info(LOG_SOURCE, 'React Element: <%= componentName %> mounted');
   }
 
-  @override
   public componentWillUnmount(): void {
     Log.info(LOG_SOURCE, 'React Element: <%= componentName %> unmounted');
   }
 
-  @override
   public render(): React.ReactElement<{}> {
     return (
       <div className={styles.<%= componentName %>}>

package/lib/generators/fieldCustomizer/templates/react/{componentClassName}.ts

@@ -2,7 +2,6 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
 import { Log } from '@microsoft/sp-core-library';
-import { override } from '@microsoft/decorators';
 import {
   BaseFieldCustomizer,
   IFieldCustomizerCellEventParameters
@@ -26,7 +25,6 @@ const LOG_SOURCE: string = '<%= componentClassName %>';
 export default class <%= componentClassName %>
   extends BaseFieldCustomizer<I<%= componentClassName %>Properties> {
 
-  @override
   public onInit(): Promise<void> {
     // Add your custom initialization to this method.  The framework will wait
     // for the returned promise to resolve before firing any BaseFieldCustomizer events.
@@ -36,7 +34,6 @@ export default class <%= componentClassName %>
     return Promise.resolve();
   }
 
-  @override
   public onRenderCell(event: IFieldCustomizerCellEventParameters): void {
     // Use this method to perform your custom cell rendering.
     const text: string = `${this.properties.sampleText}: ${event.fieldValue}`;
@@ -47,7 +44,6 @@ export default class <%= componentClassName %>
     ReactDOM.render(<%= componentNameCamelCase %>, event.domElement);
   }
 
-  @override
   public onDisposeCell(event: IFieldCustomizerCellEventParameters): void {
     // This method should be used to free any resources that were allocated during rendering.
     // For example, if your onRenderCell() called ReactDOM.render(), then you should

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

@@ -1,4 +1,4 @@
-import { IBaseOptions, BaseGenerator, AvailableFrameworks } from '../../common/BaseGenerator';
+import { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
 import * as BaseComponent from '../component/BaseComponentGenerator';
 export interface ILibraryOptions extends BaseComponent.IBaseComponentOptions {
 }
@@ -9,7 +9,7 @@ export declare function defineOptions<TOptions extends IBaseOptions, TContext>(g
 export declare class LibraryGenerator extends BaseComponent.BaseComponentGenerator<ILibraryOptions, ILibraryContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
-    protected readonly allowedFrameworks: AvailableFrameworks[];
+    protected readonly allowedTemplates: AvailableTemplates[];
     protected readonly folderName: string;
     initializing(): void;
     prompting(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/library/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAE9F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,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,gBAAiB,SAAQ,aAAa,CAAC,sBAAsB,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1G,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAa;IACpD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAa;IAChD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IACjE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAe;IAE7C,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B,WAAW,IAAI,IAAI;IAiBnB,OAAO,IAAI,IAAI;IAOf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe;IAKvE,OAAO,CAAC,aAAa;CAGtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/library/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAE7F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,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,gBAAiB,SAAQ,aAAa,CAAC,sBAAsB,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1G,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAa;IACpD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAa;IAChD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC/D,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAe;IAE7C,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B,WAAW,IAAI,IAAI;IAiBnB,OAAO,IAAI,IAAI;IAOf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe;IAKvE,OAAO,CAAC,aAAa;CAGtB"}

package/lib/generators/library/index.js

@@ -36,7 +36,7 @@ class LibraryGenerator extends BaseComponent.BaseComponentGenerator {
         super(args, options);
         this.friendlyName = 'Library';
         this.codeName = 'Library';
-        this.allowedFrameworks = [];
+        this.allowedTemplates = [];
         this.folderName = 'libraries';
         defineOptions(this);
     }

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

@@ -1,4 +1,4 @@
-import { IBaseOptions, BaseGenerator, AvailableFrameworks } from '../../common/BaseGenerator';
+import { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
 import * as BaseExtension from '../extension/BaseExtensionGenerator';
 export interface ISearchQueryModifierOptions extends BaseExtension.IBaseExtensionOptions {
 }
@@ -9,7 +9,7 @@ export declare function defineOptions<TOptions extends IBaseOptions, TContext>(g
 export declare class SearchQueryModifierGenerator extends BaseExtension.BaseExtensionGenerator<ISearchQueryModifierOptions, ISearchQueryModifierContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
-    protected readonly allowedFrameworks: AvailableFrameworks[];
+    protected readonly allowedTemplates: AvailableTemplates[];
     initializing(): void;
     prompting(): Promise<void>;
     configuring(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/searchQueryModifier/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,2BAA4B,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAC3F,MAAM,WAAW,2BAA4B,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE3F,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,4BAA6B,SAAQ,aAAa,CAAC,sBAAsB,CACpF,2BAA2B,EAC3B,2BAA2B,CAC5B;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA2B;IAClE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAyB;IAC5D,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,2BAA2B;IAKnF,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/searchQueryModifier/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,2BAA4B,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAC3F,MAAM,WAAW,2BAA4B,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE3F,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,4BAA6B,SAAQ,aAAa,CAAC,sBAAsB,CACpF,2BAA2B,EAC3B,2BAA2B,CAC5B;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA2B;IAClE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAyB;IAC5D,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,2BAA2B;IAKnF,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}

package/lib/generators/searchQueryModifier/index.js

@@ -36,7 +36,7 @@ class SearchQueryModifierGenerator extends BaseExtension.BaseExtensionGenerator
         super(args, options);
         this.friendlyName = 'Search Query Modifier';
         this.codeName = 'SearchQueryModifier';
-        this.allowedFrameworks = [];
+        this.allowedTemplates = [];
         defineOptions(this);
     }
     initializing() {

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

@@ -1,4 +1,3 @@
-import { override } from '@microsoft/decorators';
 import { Log } from '@microsoft/sp-core-library';
 import { BaseSearchQueryModifier, IQuery, SearchQueryScenario } from '@microsoft/sp-search-extensibility';
 
@@ -18,13 +17,11 @@ const LOG_SOURCE: string = '<%= componentClassName %>';
 
 export default class <%= componentClassName %> extends BaseSearchQueryModifier<I<%= componentClassName %>Properties> {
 
-  @override
   public onInit(): Promise<void> {
     Log.info(LOG_SOURCE, 'Initialized <%= componentClassName %>');
     return Promise.resolve();
   }
 
-  @override
   public modifySearchQuery(query: IQuery, scenario: SearchQueryScenario): Promise<IQuery> {
     Log.info(LOG_SOURCE, `Modifying query ${query.queryText} with ${strings.Title}`);
     return Promise.resolve(query);

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

@@ -1,6 +1,7 @@
 import { BaseGenerator, IBaseOptions } from '../../common/BaseGenerator';
 export interface ISolutionOptions extends IBaseOptions {
     solutionName: string;
+    solutionShortDescription: string;
     skipFeatureDeployment: boolean;
     environment: 'spo';
     packageManager: 'npm' | 'pnpm' | 'yarn';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/solution/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAIzE,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,WAAW,EAAE,KAAK,CAAC;IACnB,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,WAAW,EAAE,MAAM,CAAiD;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB;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,SAAS,EAAE,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,IAAI,CA8BhG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/solution/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAIzE,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,CAAC;IACjC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,WAAW,EAAE,KAAK,CAAC;IACnB,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,WAAW,EAAE,MAAM,CAAiD;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB;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,SAAS,EAAE,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,IAAI,CA8BhG"}

package/lib/generators/solution/index.js

@@ -18,10 +18,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineOptions = exports.composeWith = void 0;
 const lodash = __importStar(require("lodash"));
 const path = __importStar(require("path"));
+const colors_1 = __importDefault(require("colors"));
 const Utils = __importStar(require("../../common/utilities"));
 const BaseGenerator_1 = require("../../common/BaseGenerator");
 const YeomanConfiguration_1 = require("../../common/YeomanConfiguration");
@@ -82,6 +86,13 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
                 when: () => !this.config.get('solutionName'),
                 message: 'What is your solution name?'
             },
+            {
+                type: 'input',
+                name: 'solutionShortDescription',
+                when: () => !this.config.get('solutionShortDescription'),
+                message: 'Enter a short description for your solution?',
+                default: (answers) => `${this.config.get('solutionName') || answers.solutionName} description`
+            },
             {
                 type: 'list',
                 name: 'environment',
@@ -97,6 +108,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
             }
             const environment = this.config.get('environment');
             const solutionName = this.config.get('solutionName');
+            const solutionShortDescription = this.config.get('solutionShortDescription') || answers.solutionShortDescription;
             // allows to set --skip-feature-deployment false
             let skipFeatureDeployment = undefined;
             const skipFeatureDeploymentConfig = this.config.get('skipFeatureDeployment');
@@ -110,7 +122,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
             }
             const componentType = this.config.get('componentType');
             const extensionType = this.config.get('extensionType');
-            const framework = this.config.get('framework');
+            const template = this.config.get('framework') || this.config.get('template');
             const componentName = this.config.get('componentName');
             const componentDescription = this.config.get('componentDescription');
             const isCreatingSolution = this.config.get('isCreatingSolution');
@@ -129,6 +141,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
             this.context.solutionName = this.config.get('solutionName') || answers.solutionName;
             this.context.libraryName = lodash.kebabCase(this.context.solutionName);
             this.context.libraryId = Utils.generateGuid();
+            this.context.solutionShortDescription = solutionShortDescription;
             // store some variables
             YeomanConfiguration_1.YeomanConfiguration.version = BaseGenerator_1.BaseGenerator.generatorPackageJson.version;
             YeomanConfiguration_1.YeomanConfiguration.libraryName = this.context.libraryName;
@@ -137,10 +150,11 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
             YeomanConfiguration_1.YeomanConfiguration.packageManager =
                 this.config.get('packageManager') || YeomanConfiguration_1.YeomanConfiguration.packageManager || 'npm';
             this.config.set('solutionName', solutionName);
+            this.config.set('solutionShortDescription', solutionShortDescription);
             this.config.set('skipFeatureDeployment', skipFeatureDeployment);
             this.config.set('componentType', componentType);
             this.config.set('extensionType', extensionType);
-            this.config.set('framework', framework);
+            this.config.set('template', template);
             this.config.set('componentName', componentName);
             this.config.set('componentDescription', componentDescription);
             this.config.set('isCreatingSolution', isCreatingSolution);
@@ -148,23 +162,15 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
             this.config.set('plusBeta', isPlusBeta);
         })
             .then(() => {
-            return this.prompt([
-                {
-                    type: 'confirm',
-                    name: 'skipFeatureDeployment',
-                    default: false,
-                    when: () => this.config.get('skipFeatureDeployment') === undefined,
-                    message: 'Do you want to allow the tenant admin the choice of being able ' +
-                        'to deploy the solution to all sites immediately without running ' +
-                        'any feature deployment or adding apps in sites?'
-                }
-            ]);
-        })
-            .then((answers) => {
-            this.context.skipFeatureDeployment =
-                this.config.get('skipFeatureDeployment') !== undefined
-                    ? this.config.get('skipFeatureDeployment')
-                    : answers.skipFeatureDeployment;
+            if (this.config.get('skipFeatureDeployment') === undefined) {
+                this.log(colors_1.default.green('The ability for the tenant admin to immediately deploy the solution to all sites' +
+                    ' without running any feature deployment (tenant-wide deployment) is enabled by default.' +
+                    ' You can change this by setting the skipFeatureDeployment property to false in ./config/package-solution.json.'));
+                this.context.skipFeatureDeployment = true;
+            }
+            else {
+                this.context.skipFeatureDeployment = this.config.get('skipFeatureDeployment');
+            }
         })
             .then(() => {
             return this.prompt([

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

@@ -1,4 +1,4 @@
-import { IBaseOptions, BaseGenerator, AvailableFrameworks } from '../../common/BaseGenerator';
+import { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
 import * as BaseComponent from '../component/BaseComponentGenerator';
 export interface IWebpartOptions extends BaseComponent.IBaseComponentOptions {
 }
@@ -9,7 +9,7 @@ export declare function defineOptions<TOptions extends IBaseOptions, TContext>(g
 export declare class WebpartGenerator extends BaseComponent.BaseComponentGenerator<IWebpartOptions, IWebpartContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
-    protected readonly allowedFrameworks: AvailableFrameworks[];
+    protected readonly allowedTemplates: AvailableTemplates[];
     protected readonly folderName: string;
     initializing(): void;
     prompting(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/webpart/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,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,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,gBAAiB,SAAQ,aAAa,CAAC,sBAAsB,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1G,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAc;IACrD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAa;IAChD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,CAAa;IACxE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAc;IAE5C,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B,WAAW,IAAI,IAAI;IAQnB,OAAO,IAAI,IAAI;IAqBf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe;IAKvE,OAAO,CAAC,aAAa;CAGtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/webpart/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAI7F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,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,gBAAiB,SAAQ,aAAa,CAAC,sBAAsB,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1G,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAc;IACrD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAa;IAChD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAwB;IACjF,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAc;IAE5C,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B,WAAW,IAAI,IAAI;IAenB,OAAO,IAAI,IAAI;IA0Bf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe;IAKvE,OAAO,CAAC,aAAa;CAGtB"}

package/lib/generators/webpart/index.js

@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebpartGenerator = exports.defineOptions = exports.composeWith = void 0;
 const path = __importStar(require("path"));
 const Utils = __importStar(require("../../common/utilities"));
+const YeomanConfiguration_1 = require("../../common/YeomanConfiguration");
 const BaseComponent = __importStar(require("../component/BaseComponentGenerator"));
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
@@ -36,7 +37,7 @@ class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
         super(args, options);
         this.friendlyName = 'Web part';
         this.codeName = 'WebPart';
-        this.allowedFrameworks = ['react'];
+        this.allowedTemplates = ['react', 'minimal'];
         this.folderName = 'webparts';
         defineOptions(this);
     }
@@ -55,16 +56,23 @@ class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
             super.configuring();
             this.ensureDependencyGroup('webpart');
             this.serveJson.setUpForWebParts();
+            const solutionName = YeomanConfiguration_1.YeomanConfiguration.libraryName;
+            this.packageSolutionJson.addFeature(Utils.generateGuid(), `${solutionName} Feature`, `The feature that activates elements of the ${solutionName} solution.`, false);
         }
     }
     writing() {
         if (this.shouldExecute()) {
-            super.writing(true);
+            super.writing(false);
+            const dest = this._getOutputFolder(this.context.componentNameCamelCase);
+            const template = this.context.template;
+            this.copyTemplate(path.join(this.sourceRoot(), template), dest);
+            if (template !== 'minimal') {
+                this.copyTemplate(path.join(this.sourceRoot(), 'loc'), path.join(dest, 'loc'));
+                this.copyTemplate(path.join(this.sourceRoot(), 'assets'), path.join(dest, 'assets'));
+            }
+            this.copyTemplate(path.join(this.sourceRoot(), 'base'), dest);
             this.fs.copy(this.templatePath('./images/outline.png'), this.destinationPath(`teams/${this.context.componentId}_outline.png`));
             this.fs.copy(this.templatePath('./images/color.png'), this.destinationPath(`teams/${this.context.componentId}_color.png`));
-            if (this.options.plusbeta) {
-                this.fs.copyTpl(this.templatePath('./officeAddin/initial.outlookManifest.xml'), this.destinationPath(`officeAddin/${this.context.componentId}_outlookManifest.xml`), { componentId: this.context.componentId });
-            }
         }
     }
     install() {

package/lib/generators/webpart/templates/loc/en-us.js

@@ -0,0 +1,11 @@
+define([], function() {
+  return {
+    "PropertyPaneDescription": "Description",
+    "BasicGroupName": "Group Name",
+    "DescriptionFieldLabel": "Description Field",
+    "AppLocalEnvironmentSharePoint": "The app is running on your local environment as SharePoint web part",
+    "AppLocalEnvironmentTeams": "The app is running on your local environment as Microsoft Teams app",
+    "AppSharePointEnvironment": "The app is running on SharePoint page",
+    "AppTeamsTabEnvironment": "The app is running in Microsoft Teams"
+  }
+});