@microsoft/generator-sharepoint 1.15.0-beta.1 → 1.15.0

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

@@ -7,8 +7,6 @@ import {
 } 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.
@@ -39,10 +37,14 @@ export default class <%= componentClassName %> extends BaseListViewCommandSet<I<
   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');
@@ -55,7 +57,7 @@ export default class <%= componentClassName %> extends BaseListViewCommandSet<I<
     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;
+      compareOneCommand.visible = this.context.listView.selectedRows!.length === 1;
     }
 
     // TODO: Add your logic here

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;IAEtD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuFhC,WAAW,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI;IAqC9C,OAAO,CAAC,WAAW,GAAE,OAAc,GAAG,IAAI;IAU1C,OAAO,IAAI,IAAI;IAOtB,SAAS,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM;YAIpD,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"}
+{"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];
@@ -51,6 +55,10 @@ function defineOptions(generator, type) {
 }
 exports.defineOptions = defineOptions;
 class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
+    constructor() {
+        super(...arguments);
+        this._shouldLogESLintWarning = false;
+    }
     async prompting() {
         await this.checkSolution();
         const availableTemplates = [{ name: 'No framework', value: 'none' }];
@@ -151,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()) {
@@ -158,9 +168,24 @@ 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);
     }
+    _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;

package/lib/generators/component/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];

package/lib/generators/component/templates/eslint/default.eslintrc.js

@@ -0,0 +1,5 @@
+require('@rushstack/eslint-config/patch/modern-module-resolution');
+module.exports = {
+  extends: ['@microsoft/eslint-config-spfx/lib/profiles/default'],
+  parserOptions: { tsconfigRootDir: __dirname }
+};

package/lib/generators/component/templates/eslint/react.eslintrc.js

@@ -0,0 +1,5 @@
+require('@rushstack/eslint-config/patch/modern-module-resolution');
+module.exports = {
+  extends: ['@microsoft/eslint-config-spfx/lib/profiles/react'],
+  parserOptions: { tsconfigRootDir: __dirname }
+};

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

@@ -1,6 +1,6 @@
 import { BaseGenerator, IBaseOptions } from '../../common/BaseGenerator';
 import * as BaseComponent from '../component/BaseComponentGenerator';
-export declare type AvailableExtensions = 'ApplicationCustomizer' | 'CommandSet' | 'FieldCustomizer' | 'SearchQueryModifier';
+export declare type AvailableExtensions = 'ApplicationCustomizer' | 'CommandSet' | 'FieldCustomizer' | 'SearchQueryModifier' | 'FormCustomizer';
 export interface IBaseExtensionOptions extends BaseComponent.IBaseComponentOptions {
 }
 export interface IBaseExtensionContext extends BaseComponent.IBaseComponentContext {
@@ -12,6 +12,7 @@ export declare abstract class BaseExtensionGenerator<IOptions extends IBaseExten
     writing(shouldCopy?: boolean): void;
     install(): void;
     protected abstract includeClientSideInstances(): boolean;
+    protected addFeature(): void;
     protected hasElementsXml(): boolean;
     private _getFeatureFrameworkDocsUrl;
 }

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":"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,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"}
+{"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,GACrB,gBAAgB,CAAC;AAErB,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,WAAW,IAAI,IAAI;IAMnB,OAAO,CAAC,UAAU,GAAE,OAAc,GAAG,IAAI;IAoBzC,OAAO,IAAI,IAAI;IAItB,SAAS,CAAC,QAAQ,CAAC,0BAA0B,IAAI,OAAO;IAExD,SAAS,CAAC,UAAU,IAAI,IAAI;IAM5B,SAAS,CAAC,cAAc,IAAI,OAAO;IAKnC,OAAO,CAAC,2BAA2B;CAkBpC"}

package/lib/generators/extension/BaseExtensionGenerator.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];
@@ -40,9 +44,7 @@ class BaseExtensionGenerator extends BaseComponent.BaseComponentGenerator {
     configuring() {
         super.configuring();
         this.ensureDependencyGroup('extension');
-        if (!this.hasElementsXml()) {
-            this.packageSolutionJson.addExtensionFeature(Utils.generateGuid(), this.includeClientSideInstances());
-        }
+        this.addFeature();
     }
     writing(shouldCopy = true) {
         super.writing(shouldCopy);
@@ -62,6 +64,11 @@ class BaseExtensionGenerator extends BaseComponent.BaseComponentGenerator {
     install() {
         super.install();
     }
+    addFeature() {
+        if (!this.hasElementsXml()) {
+            this.packageSolutionJson.addExtensionFeature(Utils.generateGuid(), this.includeClientSideInstances());
+        }
+    }
     hasElementsXml() {
         const elementsXmlPath = path.join(this.destinationRoot(), 'sharepoint', 'assets', 'elements.xml');
         return node_core_library_1.FileSystem.exists(elementsXmlPath);
@@ -77,6 +84,8 @@ class BaseExtensionGenerator extends BaseComponent.BaseComponentGenerator {
                 return 'https://aka.ms/spfx/extensions/tutorial/helloworld3';
             case 'SearchQueryModifier':
                 return 'https://aka.ms/spfx/extensions/search';
+            case 'FormCustomizer':
+                return ''; // TODO: add form customizer docs url
             default:
                 return '';
         }

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

@@ -3,7 +3,8 @@ import * as ApplicationCustomizer from '../applicationCustomizer';
 import * as CommandSet from '../commandSet';
 import * as FieldCustomizer from '../fieldCustomizer';
 import * as BaseExtension from './BaseExtensionGenerator';
-export interface IExtensionOptions extends FieldCustomizer.IFieldCustomizerOptions, CommandSet.ICommandSetOptions, ApplicationCustomizer.IApplicationCustomizerOptions {
+import * as FormCustomizer from '../formCustomizer';
+export interface IExtensionOptions extends FieldCustomizer.IFieldCustomizerOptions, CommandSet.ICommandSetOptions, ApplicationCustomizer.IApplicationCustomizerOptions, FormCustomizer.IFormCustomizerOptions {
     extensionType: BaseExtension.AvailableExtensions;
 }
 export declare function defineOptions<TOptions extends IBaseOptions, TContext>(generator: BaseGenerator<TOptions, TContext>): void;

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;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;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyDhC,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"}
+{"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;AAC1D,OAAO,KAAK,cAAc,MAAM,mBAAmB,CAAC;AAEpD,MAAM,WAAW,iBACf,SAAQ,eAAe,CAAC,uBAAuB,EAC7C,UAAU,CAAC,kBAAkB,EAC7B,qBAAqB,CAAC,6BAA6B,EACnD,cAAc,CAAC,sBAAsB;IACvC,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,CAQN;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;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8DhC,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

@@ -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];
@@ -29,11 +33,13 @@ const BaseGenerator_1 = require("../../common/BaseGenerator");
 const Utils = __importStar(require("../../common/utilities"));
 const CommandSet = __importStar(require("../commandSet"));
 const FieldCustomizer = __importStar(require("../fieldCustomizer"));
+const FormCustomizer = __importStar(require("../formCustomizer"));
 function defineOptions(generator) {
     FieldCustomizer.defineOptions(generator);
     CommandSet.defineOptions(generator);
+    FormCustomizer.defineOptions(generator);
     generator.option('extension-type', {
-        description: `The type of extension. Currently "ApplicationCustomizer", "FieldCustomizer", "ListViewCommandSet", or "SearchQueryModifier" (beta)`,
+        description: `The type of extension. Currently "ApplicationCustomizer", "FieldCustomizer", "ListViewCommandSet", "FormCustomizer", or "SearchQueryModifier" (beta)`,
         type: String
     });
 }
@@ -70,6 +76,10 @@ class ExtensionSelectorGenerator extends BaseGenerator_1.BaseGenerator {
             {
                 name: 'ListView Command Set',
                 value: 'ListViewCommandSet'
+            },
+            {
+                name: 'Form Customizer',
+                value: 'FormCustomizer'
             }
         ];
         if (this.config.get('plusBeta') === true) {

package/lib/generators/fieldCustomizer/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];
@@ -87,7 +91,7 @@ class FieldCustomizerGenerator extends BaseExtension.BaseExtensionGenerator {
         }
     }
     end() {
-        /* no-op */
+        super.end();
     }
     includeClientSideInstances() {
         return false;

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

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

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

@@ -20,7 +20,7 @@ export default class <%= componentClassName %>
   }
 
   public onRenderCell(event: IFieldCustomizerCellEventParameters): void {
-    event.domElement.classList.add(styles.<%= componentName %>);
+    event.domElement.classList.add(styles.<%= componentNameCamelCase %>);
   }
 
   public onDisposeCell(event: IFieldCustomizerCellEventParameters): void {

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

@@ -1,4 +1,4 @@
-.<%= componentName %> {
+.<%= componentNameCamelCase %> {
   background-color: "[theme:themePrimary, default:#0078d4]";
   color: "[theme:white, default:#ffffff]";
   text-align: center;

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

@@ -37,7 +37,7 @@ export default class <%= componentClassName %>
 
     event.domElement.innerText = text;
 
-    event.domElement.classList.add(styles.<%= componentName %>);
+    event.domElement.classList.add(styles.<%= componentNameCamelCase %>);
   }
 
   public onDisposeCell(event: IFieldCustomizerCellEventParameters): void {

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

@@ -1,4 +1,4 @@
-.<%= componentName %> {
+.<%= componentNameCamelCase %> {
   background-color: "[theme:themePrimary, default:#0078d4]";
   color: "[theme:white, default:#ffffff]";
   text-align: center;

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

@@ -20,7 +20,7 @@ export default class <%= componentName %> extends React.Component<I<%= component
 
   public render(): React.ReactElement<{}> {
     return (
-      <div className={styles.<%= componentName %>}>
+      <div className={styles.<%= componentNameCamelCase %>}>
         { this.props.text }
       </div>
     );

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

@@ -0,0 +1,24 @@
+import { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
+import * as BaseExtension from '../extension/BaseExtensionGenerator';
+export interface IFormCustomizerOptions extends BaseExtension.IBaseExtensionOptions {
+}
+export interface IFormCustomizerContext extends BaseExtension.IBaseExtensionContext {
+}
+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 FormCustomizerGenerator extends BaseExtension.BaseExtensionGenerator<IFormCustomizerOptions, IFormCustomizerContext> {
+    protected readonly friendlyName: string;
+    protected readonly codeName: string;
+    protected readonly allowedTemplates: AvailableTemplates[];
+    initializing(): void;
+    prompting(): Promise<void>;
+    configuring(): void;
+    writing(): void;
+    install(): void;
+    end(): void;
+    protected constructor(args: string | string[], options: IFormCustomizerOptions);
+    protected addFeature(): void;
+    protected includeClientSideInstances(): boolean;
+    private shouldExecute;
+}
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/formCustomizer/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,sBAAuB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AACtF,MAAM,WAAW,sBAAuB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAEtF,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,uBAAwB,SAAQ,aAAa,CAAC,sBAAsB,CAC/E,sBAAsB,EACtB,sBAAsB,CACvB;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAqB;IAC5D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAoB;IACvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAqB;IAEvE,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1B,WAAW,IAAI,IAAI;IAgDnB,OAAO,IAAI,IAAI;IAgBf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,sBAAsB;IAK9E,SAAS,CAAC,UAAU,IAAI,IAAI;IAY5B,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,aAAa;CAOtB"}

package/lib/generators/formCustomizer/index.js

@@ -0,0 +1,142 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormCustomizerGenerator = exports.defineOptions = exports.composeWith = void 0;
+const path = __importStar(require("path"));
+const Utils = __importStar(require("../../common/utilities"));
+const YeomanConfiguration_1 = require("../../common/YeomanConfiguration");
+const BaseExtension = __importStar(require("../extension/BaseExtensionGenerator"));
+function composeWith(base, options) {
+    Utils.compose(path.basename(__dirname), base, options);
+}
+exports.composeWith = composeWith;
+function defineOptions(generator) {
+    BaseExtension.defineOptions(generator, 'Form Customizer');
+}
+exports.defineOptions = defineOptions;
+class FormCustomizerGenerator extends BaseExtension.BaseExtensionGenerator {
+    constructor(args, options) {
+        super(args, options);
+        this.friendlyName = 'Form Customizer';
+        this.codeName = 'FormCustomizer';
+        this.allowedTemplates = ['react', 'none'];
+        defineOptions(this);
+    }
+    initializing() {
+        /* no-op */
+    }
+    prompting() {
+        this.ensureCorrectFolder();
+        if (!this.shouldExecute()) {
+            return Promise.resolve();
+        }
+        return super.prompting();
+    }
+    configuring() {
+        if (this.shouldExecute()) {
+            super.configuring();
+            this.ensureDependencyGroup('formCustomizer');
+            // New Form
+            this.serveJson.addConfiguration(`${this.context.componentNameCamelCase}_NewForm`, {
+                pageUrl: 'https://contoso.sharepoint.com/sites/mySite/_layouts/15/SPListForm.aspx',
+                formCustomizer: {
+                    componentId: this.context.componentId,
+                    PageType: 8,
+                    RootFolder: '/sites/mySite/Lists/MyList',
+                    properties: {
+                        sampleText: 'Value'
+                    }
+                }
+            });
+            // Edit Form
+            this.serveJson.addConfiguration(`${this.context.componentNameCamelCase}_EditForm`, {
+                pageUrl: 'https://contoso.sharepoint.com/sites/mySite/_layouts/15/SPListForm.aspx',
+                formCustomizer: {
+                    componentId: this.context.componentId,
+                    PageType: 6,
+                    RootFolder: '/sites/mySite/Lists/MyList',
+                    ID: 1,
+                    properties: {
+                        sampleText: 'Value'
+                    }
+                }
+            });
+            // View Form
+            this.serveJson.addConfiguration(`${this.context.componentNameCamelCase}_ViewForm`, {
+                pageUrl: 'https://contoso.sharepoint.com/sites/mySite/_layouts/15/SPListForm.aspx',
+                formCustomizer: {
+                    componentId: this.context.componentId,
+                    PageType: 4,
+                    RootFolder: '/sites/mySite/Lists/MyList',
+                    ID: 1,
+                    properties: {
+                        sampleText: 'Value'
+                    }
+                }
+            });
+        }
+    }
+    writing() {
+        if (this.shouldExecute()) {
+            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(), 'base'), dest);
+        }
+    }
+    install() {
+        if (this.shouldExecute()) {
+            super.install();
+        }
+    }
+    end() {
+        super.end();
+    }
+    addFeature() {
+        if (!this.hasElementsXml()) {
+            const solutionName = YeomanConfiguration_1.YeomanConfiguration.libraryName;
+            this.packageSolutionJson.addFeature(Utils.generateGuid(), `${solutionName} Feature`, `The feature that activates elements of the ${solutionName} solution.`, false);
+        }
+    }
+    includeClientSideInstances() {
+        return false;
+    }
+    shouldExecute() {
+        return (this.config.get('environment') === 'spo' &&
+            this.config.get('componentType') === 'extension' &&
+            this.config.get('extensionType') === 'FormCustomizer');
+    }
+}
+exports.FormCustomizerGenerator = FormCustomizerGenerator;
+// Yeoman expects exports of this type, which overrides the TS exports above
+// Ensure that anything marked as export above is also listed here
+module.exports = FormCustomizerGenerator;
+module.exports.defineOptions = defineOptions;
+module.exports.composeWith = composeWith;
+//# sourceMappingURL=index.js.map

package/lib/generators/formCustomizer/templates/base/{componentClassName}.manifest.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/spfx/client-side-extension-manifest.schema.json",
+
+  "id": "<%= componentId %>",
+  "alias": "<%= componentAlias %>",
+  "componentType": "Extension",
+  "extensionType": "FormCustomizer",
+
+  // 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
+}

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

@@ -0,0 +1,7 @@
+define([], function() {
+  return {
+    "Save": "Save",
+    "Cancel": "Cancel",
+    "Close": "Close"
+  }
+});

package/lib/generators/formCustomizer/templates/loc/myStrings.d.ts

@@ -0,0 +1,10 @@
+declare interface I<%= componentStrings %> {
+  Save: string;
+  Cancel: string;
+  Close: string;
+}
+
+declare module '<%= componentStrings %>' {
+  const strings: I<%= componentStrings %>;
+  export = strings;
+}

package/lib/generators/formCustomizer/templates/none/{componentClassName}.module.scss

@@ -0,0 +1,5 @@
+.<%= componentNameCamelCase %> {
+  background-color: "[theme:white, default:#ffffff]";
+  color: "[theme:themePrimary, default:#0078d4]";
+  padding: 0.5rem;
+}

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

@@ -0,0 +1,53 @@
+import { Log } from '@microsoft/sp-core-library';
+import {
+  BaseFormCustomizer
+} from '@microsoft/sp-listview-extensibility';
+
+import * as strings from '<%= componentStrings %>';
+import styles from './<%= componentClassName %>.module.scss';
+
+/**
+ * If your form 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 {
+  // This is an example; replace with your own property
+  sampleText?: string;
+}
+
+const LOG_SOURCE: string = '<%= componentClassName %>';
+
+export default class <%= componentClassName %>
+  extends BaseFormCustomizer<I<%= componentClassName %>Properties> {
+
+  public onInit(): Promise<void> {
+    // Add your custom initialization to this method. The framework will wait
+    // for the returned promise to resolve before rendering the form.
+    Log.info(LOG_SOURCE, 'Activated <%= componentClassName %> with properties:');
+    Log.info(LOG_SOURCE, JSON.stringify(this.properties, undefined, 2));
+    return Promise.resolve();
+  }
+
+  public render(): void {
+    // Use this method to perform your custom rendering.
+    this.domElement.innerHTML = `<div class="${ styles.<%= componentNameCamelCase %> }"></div>`;
+  }
+
+  public onDispose(): void {
+    // This method should be used to free any resources that were allocated during rendering.
+    super.onDispose();
+  }
+
+  private _onSave = (): void => {
+
+    // You MUST call this.formSaved() after you save the form.
+    this.formSaved();
+  }
+
+  private _onClose = (): void => {
+
+    // You MUST call this.formClosed() after you close the form.
+    this.formClosed();
+  }
+}

package/lib/generators/formCustomizer/templates/react/components/{componentName}.module.scss

@@ -0,0 +1,5 @@
+.<%= componentNameCamelCase %> {
+  background-color: "[theme:white, default:#ffffff]";
+  color: "[theme:themePrimary, default:#0078d4]";
+  padding: 0.5rem;
+}