@microsoft/generator-sharepoint 1.17.4 → 1.18.0-beta.2

package/lib/generators/searchAdaptiveCardExtension/templates/base/loc/mystring.d.ts

@@ -0,0 +1,15 @@
+declare interface I<%= componentStrings %> {
+  PropertyPaneDescription: string;
+  TitleFieldLabel: string;
+  Title: string;
+  SubTitle: string;
+  PrimaryText: string;
+  Suggested: string;
+  SearchAction: string;
+  Placeholder: string;
+}
+
+declare module '<%= componentStrings %>' {
+  const strings: I<%= componentStrings %>;
+  export = strings;
+}

package/lib/generators/searchAdaptiveCardExtension/templates/none/cardView/CardView.ts

@@ -0,0 +1,64 @@
+import {
+  BaseComponentsCardView,
+  ISearchCardViewParameters,
+  SearchCardView,
+  IExternalLinkCardAction,
+  IQuickViewCardAction
+} from '@microsoft/sp-adaptive-card-extension-base';
+import * as strings from '<%= componentStrings %>';
+import {
+  I<%= componentClassName %>Props,
+  I<%= componentClassName %>State,
+  SEARCH_RESULTS_QUICK_VIEW_REGISTRY_ID,
+  ITEM_QUICK_VIEW_REGISTRY_ID,
+  SEARCH_BOX_ID
+} from '../<%= componentClassName %>';
+
+export class CardView extends BaseComponentsCardView<
+  I<%= componentClassName %>Props,
+  I<%= componentClassName %>State,
+  ISearchCardViewParameters
+> {
+  public get cardViewParameters(): ISearchCardViewParameters {
+    return SearchCardView({
+      cardBar: {
+        componentName: 'cardBar',
+        title: this.properties.title
+      },
+      header: {
+        componentName: 'text',
+        text: strings.PrimaryText
+      },
+      body: {
+        componentName: 'searchBox',
+        placeholder: strings.Placeholder,
+        id: SEARCH_BOX_ID,
+        button: {
+          action: {
+            type: 'QuickView',
+            parameters: {
+              view: SEARCH_RESULTS_QUICK_VIEW_REGISTRY_ID
+            }
+          }
+        }
+      },
+      footer: {
+        componentName: 'searchFooter',
+        title: strings.Suggested,
+        imageInitials: 'MB',
+        text: strings.Title,
+        secondaryText: strings.SubTitle,
+        onSelection: {
+          type: 'QuickView',
+          parameters: {
+            view: ITEM_QUICK_VIEW_REGISTRY_ID
+          }
+        }
+      }
+    });
+  }
+
+  public get onCardSelection(): IQuickViewCardAction | IExternalLinkCardAction | undefined {
+    return undefined;
+  }
+}

package/lib/generators/searchAdaptiveCardExtension/templates/none/quickView/ItemQuickView.ts

@@ -0,0 +1,28 @@
+import { ISPFxAdaptiveCard, BaseAdaptiveCardQuickView } from '@microsoft/sp-adaptive-card-extension-base';
+import * as strings from '<%= componentStrings %>';
+import {
+  I<%= componentClassName %>Props,
+  I<%= componentClassName %>State
+} from '../<%= componentClassName %>';
+
+export interface IItemQuickViewData {
+  subTitle: string;
+  title: string;
+}
+
+export class ItemQuickView extends BaseAdaptiveCardQuickView<
+  I<%= componentClassName %>Props,
+  I<%= componentClassName %>State,
+  IItemQuickViewData
+> {
+  public get data(): IItemQuickViewData {
+    return {
+      subTitle: strings.SubTitle,
+      title: strings.Title
+    };
+  }
+
+  public get template(): ISPFxAdaptiveCard {
+    return require('./template/ItemQuickViewTemplate.json');
+  }
+}

package/lib/generators/searchAdaptiveCardExtension/templates/none/quickView/SearchResultsQuickView.ts

@@ -0,0 +1,30 @@
+import { ISPFxAdaptiveCard, BaseAdaptiveCardQuickView } from '@microsoft/sp-adaptive-card-extension-base';
+import * as strings from '<%= componentStrings %>';
+import {
+  I<%= componentClassName %>Props,
+  I<%= componentClassName %>State
+} from '../<%= componentClassName %>';
+
+export interface ISearchResultsQuickViewData {
+  searchActionTitle: string;
+  placeholder: string;
+  queryString: string;
+}
+
+export class SearchResultsQuickView extends BaseAdaptiveCardQuickView<
+  I<%= componentClassName %>Props,
+  I<%= componentClassName %>State,
+  ISearchResultsQuickViewData
+> {
+  public get data(): ISearchResultsQuickViewData {
+    return {
+      searchActionTitle: strings.SearchAction,
+      placeholder: strings.Placeholder,
+      queryString: this.state.queryString || ''
+    };
+  }
+
+  public get template(): ISPFxAdaptiveCard {
+    return require('./template/SearchResultsQuickViewTemplate.json');
+  }
+}

package/lib/generators/searchAdaptiveCardExtension/templates/none/quickView/template/ItemQuickViewTemplate.json

@@ -0,0 +1,28 @@
+{
+  "schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+  "type": "AdaptiveCard",
+  "version": "1.5",
+  "body": [
+    {
+      "type": "TextBlock",
+      "weight": "Bolder",
+      "text": "${title}"
+    },
+    {
+      "type": "ColumnSet",
+      "columns": [
+        {
+          "type": "Column",
+          "items": [
+            {
+              "type": "TextBlock",
+              "weight": "Bolder",
+              "text": "${subTitle}",
+              "wrap": true
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

package/lib/generators/searchAdaptiveCardExtension/templates/none/quickView/template/SearchResultsQuickViewTemplate.json

@@ -0,0 +1,27 @@
+{
+  "schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+  "type": "AdaptiveCard",
+  "version": "1.5",
+  "body": [
+    {
+      "type": "Input.Text",
+      "id": "filterByName",
+      "inlineAction": {
+        "type": "Action.Submit",
+        "title": "${searchActionTitle}",
+        "data": {
+          "id": "search"
+        }
+      },
+      "value": "${queryString}",
+      "placeholder": "${placeholder}"
+    },
+    {
+      "type": "TextBlock",
+      "text": "Add markup to display the results",
+      "size": "normal",
+      "separator": true,
+      "spacing": "extraLarge"
+    }
+  ]
+}

package/lib/generators/searchAdaptiveCardExtension/templates/none/{componentClassName}.manifest.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/spfx/adaptive-card-extension-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"],
+  "preconfiguredEntries": [{
+    "groupId": "bd067b1e-3ad5-4d5d-a5fe-505f07d7f59c", // Dashboard
+    "group": { "default": "Dashboard" },
+    "title": { "default": "<%= componentNameUnescaped %>" },
+    "description": { "default": "<%= componentDescription %>" },
+    "iconImageUrl": "https://res.cdn.office.net/files/fabric-cdn-prod_20230308.001/assets/brand-icons/product-monoline/svg/vivaconnections_32x1.svg",
+    "properties": {
+      "title": "<%= componentNameUnescaped %>"
+    },
+    "cardSize": "Large"
+  }]
+}

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

@@ -0,0 +1,83 @@
+import { IPropertyPaneConfiguration } from '@microsoft/sp-property-pane';
+import {
+  BaseAdaptiveCardExtension,
+  type IOnBeforeActionArguments,
+  type IQuickViewActionArguments
+} from '@microsoft/sp-adaptive-card-extension-base';
+import { CardView } from './cardView/CardView';
+import { <%= componentName %>PropertyPane } from './<%= componentName %>PropertyPane';
+
+export interface I<%= componentClassName %>Props {
+  title: string;
+}
+
+export interface I<%= componentClassName %>State {
+  queryString?: string;
+}
+
+const CARD_VIEW_REGISTRY_ID: string = '<%= componentName %>_CARD_VIEW';
+export const SEARCH_RESULTS_QUICK_VIEW_REGISTRY_ID: string = '<%= componentName %>_SEARCH_RESULTS_QUICK_VIEW';
+export const ITEM_QUICK_VIEW_REGISTRY_ID: string = '<%= componentName %>_ITEM_QUICK_VIEW';
+export const SEARCH_BOX_ID: string = 'searchBox';
+
+
+export default class <%= componentClassName %> extends BaseAdaptiveCardExtension<
+  I<%= componentClassName %>Props,
+  I<%= componentClassName %>State
+> {
+  private _deferredPropertyPane: <%= componentName %>PropertyPane;
+
+  public onInit(): Promise<void> {
+    this.state = { };
+
+    // registers the card view to be shown in a dashboard
+    this.cardNavigator.register(CARD_VIEW_REGISTRY_ID, () => new CardView());
+    // registers the defer-loaded quick view to show search results
+    this.quickViewNavigator.register(SEARCH_RESULTS_QUICK_VIEW_REGISTRY_ID, () => {
+      return import(/* webpackChunkName: '<%= componentName %>-search-results-qv'*/ './quickView/SearchResultsQuickView')
+      .then(module => new module.SearchResultsQuickView());
+    });
+    // registers the defer-loaded quick view to show single search item details
+    this.quickViewNavigator.register(ITEM_QUICK_VIEW_REGISTRY_ID, () => {
+      return import(/* webpackChunkName: '<%= componentName %>-item-qv'*/ './quickView/ItemQuickView')
+      .then(module => new module.ItemQuickView());
+    });
+
+    return Promise.resolve();
+  }
+
+  public onBeforeAction(action: IOnBeforeActionArguments): void {
+    if (action.type === 'QuickView') {
+      //
+      // for the QuickView action we can get search query from the data property.
+      // it allows to display the same query string in the quick view's text input.
+      //
+      const quickViewActionArguments: IQuickViewActionArguments = action as IQuickViewActionArguments;
+      if (quickViewActionArguments.viewId === SEARCH_RESULTS_QUICK_VIEW_REGISTRY_ID) {
+        this.setState({
+          queryString: quickViewActionArguments.data && quickViewActionArguments.data[SEARCH_BOX_ID]
+        });
+      }
+    }
+  }
+
+  protected loadPropertyPaneResources(): Promise<void> {
+    return import(
+      /* webpackChunkName: '<%= componentName %>-property-pane'*/
+      './<%= componentName %>PropertyPane'
+    )
+      .then(
+        (component) => {
+          this._deferredPropertyPane = new component.<%= componentName %>PropertyPane();
+        }
+      );
+  }
+
+  protected renderCard(): string | undefined {
+    return CARD_VIEW_REGISTRY_ID;
+  }
+
+  protected getPropertyPaneConfiguration(): IPropertyPaneConfiguration {
+    return this._deferredPropertyPane?.getPropertyPaneConfiguration();
+  }
+}

package/lib/generators/searchAdaptiveCardExtension/templates/none/{componentName}PropertyPane.ts

@@ -0,0 +1,23 @@
+import { IPropertyPaneConfiguration, PropertyPaneTextField } from '@microsoft/sp-property-pane';
+import * as strings from '<%= componentStrings %>';
+
+export class <%= componentName %>PropertyPane {
+  public getPropertyPaneConfiguration(): IPropertyPaneConfiguration {
+    return {
+      pages: [
+        {
+          header: { description: strings.PropertyPaneDescription },
+          groups: [
+            {
+              groupFields: [
+                PropertyPaneTextField('title', {
+                  label: strings.TitleFieldLabel
+                })
+              ]
+            }
+          ]
+        }
+      ]
+    };
+  }
+}

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

@@ -1,4 +1,4 @@
-import { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
+import type { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
 import * as BaseExtension from '../extension/BaseExtensionGenerator';
 export interface ISearchQueryModifierOptions extends BaseExtension.IBaseExtensionOptions {
 }
@@ -18,6 +18,6 @@ export declare class SearchQueryModifierGenerator extends BaseExtension.BaseExte
     end(): void;
     protected constructor(args: string | string[], options: ISearchQueryModifierOptions);
     protected includeClientSideInstances(): boolean;
-    private shouldExecute;
+    private _shouldExecute;
 }
 //# sourceMappingURL=index.d.ts.map

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,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,SAAS,MAAM,EAChF,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,SAAS,MAAM,EAClF,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;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,WAAW,IAAI,IAAI;IAmBnB,OAAO,IAAI,IAAI;IAMf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,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,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGlG,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,SAAS,MAAM,EAChF,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,SAAS,MAAM,EAClF,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;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,WAAW,IAAI,IAAI;IAmBnB,OAAO,IAAI,IAAI;IAMf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,2BAA2B;IAKnF,SAAS,CAAC,0BAA0B,IAAI,OAAO;IAI/C,OAAO,CAAC,cAAc;CAOvB"}

package/lib/generators/searchQueryModifier/index.js

@@ -48,12 +48,12 @@ class SearchQueryModifierGenerator extends BaseExtension.BaseExtensionGenerator
     }
     async prompting() {
         this.ensureCorrectFolder();
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             await super.prompting();
         }
     }
     configuring() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             super.configuring();
             this.ensureDependencyGroup('searchQueryModifier');
             this.serveJson.addConfiguration(this.context.componentNameCamelCase, {
@@ -70,12 +70,12 @@ class SearchQueryModifierGenerator extends BaseExtension.BaseExtensionGenerator
         }
     }
     writing() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             super.writing();
         }
     }
     install() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             super.install();
         }
     }
@@ -85,7 +85,7 @@ class SearchQueryModifierGenerator extends BaseExtension.BaseExtensionGenerator
     includeClientSideInstances() {
         return true;
     }
-    shouldExecute() {
+    _shouldExecute() {
         return (this.config.get('environment') === 'spo' &&
             this.config.get('componentType') === 'extension' &&
             this.config.get('extensionType') === 'SearchQueryModifier');

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

@@ -1,4 +1,4 @@
-import { BaseGenerator, IBaseOptions } from '../../common/BaseGenerator';
+import { BaseGenerator, type IBaseOptions } from '../../common/BaseGenerator';
 export interface ISolutionOptions extends IBaseOptions {
     solutionName: string;
     solutionShortDescription: string;

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,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;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,WAAW,EAAE,MAAM,CAAiD;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,SAAS,MAAM,EAChF,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,CAkChG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/solution/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI9E,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;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,WAAW,EAAE,MAAM,CAAiD;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,SAAS,MAAM,EAChF,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,CAkChG"}

package/lib/generators/solution/index.js

@@ -68,7 +68,7 @@ function defineOptions(generator) {
 }
 exports.defineOptions = defineOptions;
 class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
-    /* tslint:disable-next-line:no-any */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     constructor(args, options) {
         super(args, options);
         this.allowEmptyPackageJson = true;
@@ -79,7 +79,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
         /* no-op */
     }
     async prompting() {
-        if (!this.shouldExecute()) {
+        if (!this._shouldExecute()) {
             return;
         }
         const answers = await this.prompt([
@@ -173,7 +173,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
         this.packageSolutionJson.setUpSolution(this.context);
     }
     configuring() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             const packageJsonTemplate = this.context.useHeft
                 ? require('./heft.package.json')
                 : require('./non-heft.package.json');
@@ -201,7 +201,8 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
         }
     }
     writing() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
+            // eslint-disable-next-line no-console
             console.log();
             super.writing(false);
             const dest = this.destinationRoot();
@@ -219,7 +220,8 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
         }
     }
     install() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
+            // eslint-disable-next-line no-console
             console.log();
             this.tryInstall();
         }
@@ -227,7 +229,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
     end() {
         /* no-op */
     }
-    shouldExecute() {
+    _shouldExecute() {
         return this.config.get('isCreatingSolution');
     }
 }

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

@@ -1,4 +1,4 @@
-import { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
+import type { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
 import * as BaseComponent from '../component/BaseComponentGenerator';
 export interface IWebpartOptions extends BaseComponent.IBaseComponentOptions {
 }
@@ -18,6 +18,6 @@ export declare class WebpartGenerator extends BaseComponent.BaseComponentGenerat
     install(): void;
     end(): void;
     protected constructor(args: string | string[], options: IWebpartOptions);
-    private shouldExecute;
+    private _shouldExecute;
 }
 //# sourceMappingURL=index.d.ts.map

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,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,SAAS,MAAM,EAChF,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,SAAS,MAAM,EAClF,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;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/webpart/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIlG,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,SAAS,MAAM,EAChF,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,SAAS,MAAM,EAClF,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;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAOhC,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,cAAc;CAGvB"}

package/lib/generators/webpart/index.js

@@ -50,12 +50,12 @@ class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
     }
     async prompting() {
         this.ensureCorrectFolder();
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             await super.prompting();
         }
     }
     configuring() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             super.configuring();
             this.ensureDependencyGroup('webpart');
             this.serveJson.setUpForWebParts();
@@ -64,7 +64,7 @@ class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
         }
     }
     writing() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             super.writing(false);
             const dest = this._getOutputFolder(this.context.componentNameCamelCase);
             const template = this.context.template;
@@ -79,14 +79,14 @@ class WebpartGenerator extends BaseComponent.BaseComponentGenerator {
         }
     }
     install() {
-        if (this.shouldExecute()) {
+        if (this._shouldExecute()) {
             super.install();
         }
     }
     end() {
         super.end();
     }
-    shouldExecute() {
+    _shouldExecute() {
         return this.config.get('environment') === 'spo' && this.config.get('componentType') === 'webpart';
     }
 }

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

@@ -1,10 +1,10 @@
 import { Version } from '@microsoft/sp-core-library';
-import {
+import type {
   IPropertyPaneConfiguration,
   PropertyPaneTextField
 } from '@microsoft/sp-property-pane';
 import { BaseClientSideWebPart } from '@microsoft/sp-webpart-base';
-import { IReadonlyTheme } from '@microsoft/sp-component-base';
+import type { IReadonlyTheme } from '@microsoft/sp-component-base';
 import { escape } from '@microsoft/sp-lodash-subset';
 
 import styles from './<%= componentClassName %>.module.scss';

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import styles from './<%= componentName %>.module.scss';
-import { I<%= componentName %>Props } from './I<%= componentName %>Props';
+import type { I<%= componentName %>Props } from './I<%= componentName %>Props';
 import { escape } from '@microsoft/sp-lodash-subset';
 
 export default class <%= componentName %> extends React.Component<I<%= componentName %>Props, {}> {

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as ReactDom from 'react-dom';
 import { Version } from '@microsoft/sp-core-library';
-import {
+import type {
   IPropertyPaneConfiguration,
   PropertyPaneTextField
 } from '@microsoft/sp-property-pane';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-sharepoint",
-  "version": "1.17.4",
+  "version": "1.18.0-beta.2",
   "description": "Yeoman generator for the SharePoint Framework",
   "engines": {
     "node": ">=16.13.0 <17.0.0"
@@ -12,18 +12,18 @@
   "homepage": "http://aka.ms/spfx",
   "main": "lib/generators/app/index.js",
   "dependencies": {
-    "@rushstack/node-core-library": "3.55.2",
+    "@rushstack/node-core-library": "3.59.4",
     "colors": "~1.2.1",
     "lodash": "4.17.21",
     "update-notifier": "5.1.0",
     "uuid": "~3.1.0",
     "yeoman-generator": "5.6.1",
     "yosay": "2.0.2",
-    "@microsoft/spfx-heft-plugins": "1.17.4"
+    "@microsoft/spfx-heft-plugins": "1.18.0-beta.2"
   },
   "devDependencies": {
-    "@microsoft/rush-lib": "5.93.1",
-    "@rushstack/heft": "0.49.7",
+    "@microsoft/rush-lib": "5.100.1",
+    "@rushstack/heft": "0.50.6",
     "@types/inquirer": "7.3.1",
     "@types/lodash": "4.14.117",
     "@types/mem-fs-editor": "7.0.1",
@@ -31,6 +31,7 @@
     "@types/uuid": "3.0.0",
     "@types/yeoman-generator": "5.2.10",
     "@types/yosay": "2.0.0",
+    "eslint": "8.7.0",
     "@odsp-web-tools/internal-node-rig": "0.1.0"
   },
   "scripts": {