@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

package/dist/m365/pp/commands/card/card-get.js

@@ -10,6 +10,7 @@ import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+import { formatting } from '../../../../utils/formatting.js';
 class PpCardGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.CARD_GET;
@@ -59,11 +60,8 @@ class PpCardGetCommand extends PowerPlatformCommand {
             throw `The specified card '${options.name}' does not exist.`;
         }
         if (result.value.length > 1) {
-            const resultAsKeyValuePair = {};
-            result.value.forEach((obj) => {
-                resultAsKeyValuePair[obj.cardid] = obj;
-            });
-            return Cli.handleMultipleResultsFound(`Multiple cards with name '${options.name}' found. Choose the correct ID:`, `Multiple cards with name '${options.name}' found.`, resultAsKeyValuePair);
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('cardid', result.value);
+            return Cli.handleMultipleResultsFound(`Multiple cards with name '${options.name}' found`, resultAsKeyValuePair);
         }
         return result.value[0];
     }

package/dist/m365/pp/commands/chatbot/chatbot-get.js

@@ -10,6 +10,7 @@ import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class PpChatbotGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.CHATBOT_GET;
@@ -56,7 +57,8 @@ class PpChatbotGetCommand extends PowerPlatformCommand {
         requestOptions.url = `${dynamicsApiUrl}/api/data/v9.1/bots?$filter=name eq '${formatting.encodeQueryParameter(options.name)}'`;
         const result = await request.get(requestOptions);
         if (result.value.length > 1) {
-            throw `Multiple chatbots with name '${options.name}' found: ${result.value.map(x => x.botid).join(',')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('botid', result.value);
+            return await Cli.handleMultipleResultsFound(`Multiple chatbots with name '${options.name}' found.`, resultAsKeyValuePair);
         }
         if (result.value.length === 0) {
             throw `The specified chatbot '${options.name}' does not exist.`;

package/dist/m365/pp/commands/chatbot/chatbot-list.js

@@ -16,7 +16,7 @@ class PpChatbotListCommand extends PowerPlatformCommand {
         return 'Lists Microsoft Power Platform chatbots in the specified Power Platform environment';
     }
     defaultProperties() {
-        return ['displayName', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
+        return ['name', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
     }
     constructor() {
         super();
@@ -55,7 +55,7 @@ class PpChatbotListCommand extends PowerPlatformCommand {
           <attribute name='timezoneruleversionnumber' alias='timezoneRuleVersionNumber' />,
           <attribute name='utcconversiontimezonecode' alias='utcConversionTimezoneCode' />,
           <attribute name='versionnumber' alias='versionNumber' />,
-          <attribute name='name' alias='displayName' />,
+          <attribute name='name' alias='name' />,
           <attribute name='botid' alias='cdsBotId' />,
           <attribute name='ownerid' alias='ownerId' />,
           <attribute name='synchronizationstatus' alias='synchronizationStatus' />

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -9,6 +9,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class PpManagementAppAddCommand extends PowerPlatformCommand {
     get name() {
         return commands.MANAGEMENTAPP_ADD;
@@ -65,7 +66,9 @@ class PpManagementAppAddCommand extends PowerPlatformCommand {
         if (aadApps.value.length === 1 && aadApps.value[0].appId) {
             return aadApps.value[0].appId;
         }
-        throw `Multiple Azure AD application registration with name ${name} found. Please disambiguate (app IDs): ${aadApps.value.map(a => a.appId).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', aadApps.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        return result.appId;
     }
 }
 _PpManagementAppAddCommand_instances = new WeakSet(), _PpManagementAppAddCommand_initTelemetry = function _PpManagementAppAddCommand_initTelemetry() {

package/dist/m365/purview/commands/retentionlabel/retentionlabel-add.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PurviewRetentionLabelAddCommand_instances, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators, _PurviewRetentionLabelAddCommand_initOptionSets;
+var _PurviewRetentionLabelAddCommand_instances, _a, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators, _PurviewRetentionLabelAddCommand_initOptionSets;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -90,7 +90,7 @@ class PurviewRetentionLabelAddCommand extends GraphCommand {
         return filteredEventTypes[0].id;
     }
 }
-_PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLabelAddCommand_initTelemetry = function _PurviewRetentionLabelAddCommand_initTelemetry() {
+_a = PurviewRetentionLabelAddCommand, _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLabelAddCommand_initTelemetry = function _PurviewRetentionLabelAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             retentionTrigger: typeof args.options.retentionTrigger !== 'undefined',
@@ -107,18 +107,18 @@ _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLab
         option: '-n, --displayName <displayName>'
     }, {
         option: '--behaviorDuringRetentionPeriod <behaviorDuringRetentionPeriod>',
-        autocomplete: PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods
+        autocomplete: _a.behaviorDuringRetentionPeriods
     }, {
         option: '--actionAfterRetentionPeriod <actionAfterRetentionPeriod>',
-        autocomplete: PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods
+        autocomplete: _a.actionAfterRetentionPeriods
     }, {
         option: '--retentionDuration <retentionDuration>'
     }, {
         option: '-t, --retentionTrigger [retentionTrigger]',
-        autocomplete: PurviewRetentionLabelAddCommand.retentionTriggers
+        autocomplete: _a.retentionTriggers
     }, {
         option: '--defaultRecordBehavior [defaultRecordBehavior]',
-        autocomplete: PurviewRetentionLabelAddCommand.defaultRecordBehavior
+        autocomplete: _a.defaultRecordBehavior
     }, {
         option: '--descriptionForUsers [descriptionForUsers]'
     }, {
@@ -135,19 +135,19 @@ _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLab
         if (isNaN(args.options.retentionDuration)) {
             return `Specified retentionDuration ${args.options.retentionDuration} is not a number`;
         }
-        if (PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods.indexOf(args.options.behaviorDuringRetentionPeriod) === -1) {
-            return `${args.options.behaviorDuringRetentionPeriod} is not a valid behavior of a document with the label. Allowed values are ${PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods.join(', ')}`;
+        if (_a.behaviorDuringRetentionPeriods.indexOf(args.options.behaviorDuringRetentionPeriod) === -1) {
+            return `${args.options.behaviorDuringRetentionPeriod} is not a valid behavior of a document with the label. Allowed values are ${_a.behaviorDuringRetentionPeriods.join(', ')}`;
         }
-        if (PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods.indexOf(args.options.actionAfterRetentionPeriod) === -1) {
-            return `${args.options.actionAfterRetentionPeriod} is not a valid action to take on a document with the label. Allowed values are ${PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods.join(', ')}`;
+        if (_a.actionAfterRetentionPeriods.indexOf(args.options.actionAfterRetentionPeriod) === -1) {
+            return `${args.options.actionAfterRetentionPeriod} is not a valid action to take on a document with the label. Allowed values are ${_a.actionAfterRetentionPeriods.join(', ')}`;
         }
         if (args.options.retentionTrigger &&
-            PurviewRetentionLabelAddCommand.retentionTriggers.indexOf(args.options.retentionTrigger) === -1) {
-            return `${args.options.retentionTrigger} is not a valid action retention duration calculation. Allowed values are ${PurviewRetentionLabelAddCommand.retentionTriggers.join(', ')}`;
+            _a.retentionTriggers.indexOf(args.options.retentionTrigger) === -1) {
+            return `${args.options.retentionTrigger} is not a valid action retention duration calculation. Allowed values are ${_a.retentionTriggers.join(', ')}`;
         }
         if (args.options.defaultRecordBehavior &&
-            PurviewRetentionLabelAddCommand.defaultRecordBehavior.indexOf(args.options.defaultRecordBehavior) === -1) {
-            return `${args.options.defaultRecordBehavior} is not a valid state of a record label. Allowed values are ${PurviewRetentionLabelAddCommand.defaultRecordBehavior.join(', ')}`;
+            _a.defaultRecordBehavior.indexOf(args.options.defaultRecordBehavior) === -1) {
+            return `${args.options.defaultRecordBehavior} is not a valid state of a record label. Allowed values are ${_a.defaultRecordBehavior.join(', ')}`;
         }
         return true;
     });

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -41,7 +41,9 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand {
         if (res.value.length === 0) {
             throw `The specified connection does not exist in Microsoft Search`;
         }
-        throw `Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple external connections with name ${args.options.name} found.`, resultAsKeyValuePair);
+        return result.id;
     }
     async commandAction(logger, args) {
         if (args.options.force) {

package/dist/m365/spfx/commands/package/package-generate.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpfxPackageGenerateCommand_instances, _SpfxPackageGenerateCommand_initTelemetry, _SpfxPackageGenerateCommand_initOptions, _SpfxPackageGenerateCommand_initValidators;
+var _SpfxPackageGenerateCommand_instances, _a, _SpfxPackageGenerateCommand_initTelemetry, _SpfxPackageGenerateCommand_initOptions, _SpfxPackageGenerateCommand_initValidators;
 import AdmZip from 'adm-zip';
 import fs from 'fs';
 import os from 'os';
@@ -37,7 +37,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
             supportedHosts.push('TeamsPersonalApp');
         }
         const tokens = {
-            clientSideAssetsFeatureId: SpfxPackageGenerateCommand.generateNewId(),
+            clientSideAssetsFeatureId: _a.generateNewId(),
             developerName: args.options.developerName || 'Contoso',
             developerWebsiteUrl: args.options.developerWebsiteUrl || 'https://contoso.com/my-app',
             developerPrivacyUrl: args.options.developerPrivacyUrl || 'https://contoso.com/privacy',
@@ -46,18 +46,18 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
             exposePageContextGlobally: args.options.exposePageContextGlobally ? '!0' : '!1',
             exposeTeamsContextGlobally: args.options.exposeTeamsContextGlobally ? '!0' : '!1',
             html: args.options.html.replace(/"/g, '\\"').replace(/\r\n/g, ' ').replace(/\n/g, ' '),
-            packageName: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle),
-            productId: SpfxPackageGenerateCommand.generateNewId(),
+            packageName: _a.getSafePackageName(args.options.webPartTitle),
+            productId: _a.generateNewId(),
             skipFeatureDeployment: (args.options.allowTenantWideDeployment === true).toString(),
             supportedHosts: JSON.stringify(supportedHosts).replace(/"/g, '"'),
-            webPartId: SpfxPackageGenerateCommand.generateNewId(),
+            webPartId: _a.generateNewId(),
             webPartFeatureName: `${args.options.webPartTitle} Feature`,
             webPartFeatureDescription: `A feature which activates the Client-Side WebPart named ${args.options.webPartTitle}`,
-            webPartAlias: SpfxPackageGenerateCommand.getWebPartAlias(args.options.webPartTitle),
+            webPartAlias: _a.getWebPartAlias(args.options.webPartTitle),
             webPartName: args.options.webPartTitle,
-            webPartSafeName: SpfxPackageGenerateCommand.getSafeWebPartName(args.options.webPartTitle),
+            webPartSafeName: _a.getSafeWebPartName(args.options.webPartTitle),
             webPartDescription: args.options.webPartDescription,
-            webPartModule: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle)
+            webPartModule: _a.getSafePackageName(args.options.webPartTitle)
         };
         let tmpDir = undefined;
         let error;
@@ -73,7 +73,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                 await logger.log('Copying files...');
             }
             const src = path.join(__dirname, 'package-generate', 'assets');
-            fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
+            fsUtil.copyRecursiveSync(src, tmpDir, s => _a.replaceTokens(s, tokens));
             const files = fsUtil.readdirR(tmpDir);
             if (this.verbose) {
                 await logger.log('Processing files...');
@@ -82,7 +82,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                 if (this.debug) {
                     await logger.log(`Processing ${filePath}...`);
                 }
-                if (!SpfxPackageGenerateCommand.isBinaryFile(filePath)) {
+                if (!_a.isBinaryFile(filePath)) {
                     if (this.verbose) {
                         await logger.log('Replacing tokens...');
                     }
@@ -91,7 +91,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                         await logger.log('Before:');
                         await logger.log(fileContents);
                     }
-                    fileContents = SpfxPackageGenerateCommand.replaceTokens(fileContents, tokens);
+                    fileContents = _a.replaceTokens(fileContents, tokens);
                     if (this.debug) {
                         await logger.log('After:');
                         await logger.log(fileContents);
@@ -170,7 +170,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
         return 'AutoWP' + webPartName.replace(/[^a-zA-Z0-9]/g, '').substr(0, 40);
     }
 }
-_SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateCommand_initTelemetry = function _SpfxPackageGenerateCommand_initTelemetry() {
+_a = SpfxPackageGenerateCommand, _SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateCommand_initTelemetry = function _SpfxPackageGenerateCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             allowTenantWideDeployment: args.options.allowTenantWideDeployment === true,
@@ -187,13 +187,13 @@ _SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateComma
 }, _SpfxPackageGenerateCommand_initOptions = function _SpfxPackageGenerateCommand_initOptions() {
     this.options.unshift({ option: '-t, --webPartTitle <webPartTitle>' }, { option: '-d, --webPartDescription <webPartDescription>' }, { option: '-n, --name <name>' }, { option: '--html <html>' }, {
         option: '--enableForTeams [enableForTeams]',
-        autocomplete: SpfxPackageGenerateCommand.enableForTeamsOptions
+        autocomplete: _a.enableForTeamsOptions
     }, { option: '--exposePageContextGlobally' }, { option: '--exposeTeamsContextGlobally' }, { option: '--allowTenantWideDeployment' }, { option: '--developerName [developerName]' }, { option: '--developerPrivacyUrl [developerPrivacyUrl]' }, { option: '--developerTermsOfUseUrl [developerTermsOfUseUrl]' }, { option: '--developerWebsiteUrl [developerWebsiteUrl]' }, { option: '--developerMpnId [developerMpnId]' });
 }, _SpfxPackageGenerateCommand_initValidators = function _SpfxPackageGenerateCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.enableForTeams &&
-            SpfxPackageGenerateCommand.enableForTeamsOptions.indexOf(args.options.enableForTeams) < 0) {
-            return `${args.options.enableForTeams} is not a valid value for enableForTeams. Allowed values are: ${SpfxPackageGenerateCommand.enableForTeamsOptions.join(', ')}`;
+            _a.enableForTeamsOptions.indexOf(args.options.enableForTeams) < 0) {
+            return `${args.options.enableForTeams} is not a valid value for enableForTeams. Allowed values are: ${_a.enableForTeamsOptions.join(', ')}`;
         }
         return true;
     });

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -0,0 +1,55 @@
+export const workflow = {
+    name: "Deploy Solution {{ name }}",
+    on: {
+        push: {
+            branches: [
+                "main"
+            ]
+        }
+    },
+    jobs: {
+        "build-and-deploy": {
+            "runs-on": "ubuntu-latest",
+            steps: [
+                {
+                    name: "Checkout",
+                    uses: "actions/checkout@v3.5.3"
+                },
+                {
+                    name: "Use Node.js 16.x",
+                    uses: "actions/setup-node@v3.7.0",
+                    with: {
+                        "node-version": "16.x"
+                    }
+                },
+                {
+                    name: "Run npm ci",
+                    run: "npm ci"
+                },
+                {
+                    name: "Bundle & Package",
+                    run: "gulp bundle --ship\ngulp package-solution --ship\n"
+                },
+                {
+                    name: "CLI for Microsoft 365 Login",
+                    uses: "pnp/action-cli-login@v2.2.2",
+                    with: {
+                        "CERTIFICATE_ENCODED": "${{ secrets.CERTIFICATE_ENCODED }}",
+                        "CERTIFICATE_PASSWORD": "${{ secrets.CERTIFICATE_PASSWORD }}",
+                        "APP_ID": "${{ secrets.APP_ID }}"
+                    }
+                },
+                {
+                    name: "CLI for Microsoft 365 Deploy App",
+                    uses: "pnp/action-cli-deploy@v3.0.1",
+                    with: {
+                        "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
+                        "SKIP_FEATURE_DEPLOYMENT": false,
+                        "OVERWRITE": false
+                    }
+                }
+            ]
+        }
+    }
+};
+//# sourceMappingURL=DeployWorkflow.js.map

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.18.0-beta.1.js → doctor-1.18.0.js}

@@ -16,6 +16,6 @@ export default [
     new FN002013_DEVDEP_types_webpack_env('~1.15.2'),
     new FN002015_DEVDEP_types_react('17'),
     new FN002016_DEVDEP_types_react_dom('17'),
-    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7'])
 ];
-//# sourceMappingURL=doctor-1.18.0-beta.1.js.map
+//# sourceMappingURL=doctor-1.18.0.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpfxProjectDoctorCommand_instances, _SpfxProjectDoctorCommand_initTelemetry, _SpfxProjectDoctorCommand_initOptions, _SpfxProjectDoctorCommand_initValidators;
+var _SpfxProjectDoctorCommand_instances, _a, _SpfxProjectDoctorCommand_initTelemetry, _SpfxProjectDoctorCommand_initOptions, _SpfxProjectDoctorCommand_initValidators;
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
@@ -67,7 +67,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);
@@ -76,7 +76,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
-            throw new CommandError(`Couldn't find project root folder`, SpfxProjectDoctorCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         this.packageManager = args.options.packageManager || 'npm';
         if (this.verbose) {
@@ -89,10 +89,10 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
         }
         project.version = this.getProjectVersion();
         if (!project.version) {
-            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectDoctorCommand.ERROR_NO_VERSION);
+            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, _a.ERROR_NO_VERSION);
         }
         if (!this.supportedVersions.includes(project.version)) {
-            throw new CommandError(`CLI for Microsoft 365 doesn't support validating projects built using SharePoint Framework v${project.version}`, SpfxProjectDoctorCommand.ERROR_UNSUPPORTED_VERSION);
+            throw new CommandError(`CLI for Microsoft 365 doesn't support validating projects built using SharePoint Framework v${project.version}`, _a.ERROR_UNSUPPORTED_VERSION);
         }
         if (this.verbose) {
             await logger.logToStderr(`Project built using SPFx v${project.version}`);
@@ -327,7 +327,7 @@ ${f.resolution}
         };
     }
 }
-_SpfxProjectDoctorCommand_instances = new WeakSet(), _SpfxProjectDoctorCommand_initTelemetry = function _SpfxProjectDoctorCommand_initTelemetry() {
+_a = SpfxProjectDoctorCommand, _SpfxProjectDoctorCommand_instances = new WeakSet(), _SpfxProjectDoctorCommand_initTelemetry = function _SpfxProjectDoctorCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             packageManager: args.options.packageManager || 'npm'
@@ -341,13 +341,13 @@ _SpfxProjectDoctorCommand_instances = new WeakSet(), _SpfxProjectDoctorCommand_i
     });
     this.options.unshift({
         option: '--packageManager [packageManager]',
-        autocomplete: SpfxProjectDoctorCommand.packageManagers
+        autocomplete: _a.packageManagers
     });
 }, _SpfxProjectDoctorCommand_initValidators = function _SpfxProjectDoctorCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.packageManager) {
-            if (SpfxProjectDoctorCommand.packageManagers.indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${SpfxProjectDoctorCommand.packageManagers.join(', ')}`;
+            if (_a.packageManagers.indexOf(args.options.packageManager) < 0) {
+                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${_a.packageManagers.join(', ')}`;
             }
         }
         return true;

package/dist/m365/spfx/commands/project/project-externalize/rules/PnPJsRule.js

@@ -42,7 +42,7 @@ export class PnPJsRule extends BasicDependencyRule {
             }
         ];
     }
-    visit(project) {
+    async visit(project) {
         const findings = this.pnpModules
             .map(x => this.getModuleAndParents(project, x.key))
             .reduce((x, y) => [...x, ...y]);
@@ -67,7 +67,7 @@ export class PnPJsRule extends BasicDependencyRule {
                 targetValue: 'require(\"tslib\");'
             })));
         }
-        return Promise.resolve({ entries: findings, suggestions: fileEdits });
+        return { entries: findings, suggestions: fileEdits };
     }
     getEntryFilesList(project) {
         return project && project.manifests ? project.manifests.map(x => x.path.replace('.manifest.json', '.ts')) : [];

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -0,0 +1,157 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpfxProjectGithubWorkflowAddCommand_instances, _a, _SpfxProjectGithubWorkflowAddCommand_initTelemetry, _SpfxProjectGithubWorkflowAddCommand_initOptions, _SpfxProjectGithubWorkflowAddCommand_initValidators;
+import fs from 'fs';
+import path from 'path';
+import yaml from 'yaml';
+import { CommandError } from '../../../../Command.js';
+import { fsUtil } from '../../../../utils/fsUtil.js';
+import { validation } from '../../../../utils/validation.js';
+import commands from '../../commands.js';
+import { workflow } from './DeployWorkflow.js';
+import { BaseProjectCommand } from './base-project-command.js';
+class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
+    get name() {
+        return commands.PROJECT_GITHUB_WORKFLOW_ADD;
+    }
+    get description() {
+        return 'Adds a GitHub workflow for a SharePoint Framework project.';
+    }
+    constructor() {
+        super();
+        _SpfxProjectGithubWorkflowAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        this.projectRootPath = this.getProjectRoot(process.cwd());
+        if (this.projectRootPath === null) {
+            throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
+        }
+        const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
+        const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
+        const solutionName = JSON.parse(packageJson).name;
+        if (this.debug) {
+            logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
+        }
+        try {
+            this.updateWorkflow(solutionName, workflow, args.options);
+            this.saveWorkflow(workflow);
+        }
+        catch (error) {
+            throw new CommandError(error);
+        }
+    }
+    saveWorkflow(workflow) {
+        const githubPath = path.join(this.projectRootPath, '.github');
+        fsUtil.ensureDirectory(githubPath);
+        const workflowPath = path.join(githubPath, 'workflows');
+        fsUtil.ensureDirectory(workflowPath);
+        const workflowFile = path.join(workflowPath, 'deploy-spfx-solution.yml');
+        fs.writeFileSync(path.resolve(workflowFile), yaml.stringify(workflow), 'utf-8');
+    }
+    updateWorkflow(solutionName, workflow, options) {
+        workflow.name = workflow.name.replace('{{ name }}', options.name ?? solutionName);
+        if (options.branchName) {
+            workflow.on.push.branches[0] = options.branchName;
+        }
+        if (options.manuallyTrigger) {
+            // eslint-disable-next-line camelcase
+            workflow.on.workflow_dispatch = null;
+        }
+        if (options.skipFeatureDeployment) {
+            this.getDeployAction(workflow).with.SKIP_FEATURE_DEPLOYMENT = true;
+        }
+        if (options.overwrite) {
+            this.getDeployAction(workflow).with.OVERWRITE = true;
+        }
+        if (options.loginMethod === 'user') {
+            const loginAction = this.getLoginAction(workflow);
+            loginAction.with = {
+                ADMIN_USERNAME: '${{ secrets.ADMIN_USERNAME }}',
+                ADMIN_PASSWORD: '${{ secrets.ADMIN_PASSWORD }}'
+            };
+        }
+        if (options.scope === 'sitecollection') {
+            const deployAction = this.getDeployAction(workflow);
+            deployAction.with.SCOPE = 'sitecollection';
+            deployAction.with.SITE_COLLECTION_URL = options.siteUrl;
+        }
+        if (solutionName) {
+            const deployAction = this.getDeployAction(workflow);
+            deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ solutionName }}', solutionName);
+        }
+    }
+    getLoginAction(workflow) {
+        const steps = this.getWorkFlowSteps(workflow);
+        return steps.find(step => step.uses && step.uses.indexOf('action-cli-login') >= 0);
+    }
+    getDeployAction(workflow) {
+        const steps = this.getWorkFlowSteps(workflow);
+        return steps.find(step => step.uses && step.uses.indexOf('action-cli-deploy') >= 0);
+    }
+    getWorkFlowSteps(workflow) {
+        return workflow.jobs['build-and-deploy'].steps;
+    }
+}
+_a = SpfxProjectGithubWorkflowAddCommand, _SpfxProjectGithubWorkflowAddCommand_instances = new WeakSet(), _SpfxProjectGithubWorkflowAddCommand_initTelemetry = function _SpfxProjectGithubWorkflowAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined',
+            branchName: typeof args.options.branchName !== 'undefined',
+            manuallyTrigger: !!args.options.manuallyTrigger,
+            loginMethod: typeof args.options.loginMethod !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined',
+            skipFeatureDeployment: !!args.options.skipFeatureDeployment,
+            overwrite: !!args.options.overwrite
+        });
+    });
+}, _SpfxProjectGithubWorkflowAddCommand_initOptions = function _SpfxProjectGithubWorkflowAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name [name]'
+    }, {
+        option: '-b, --branchName [branchName]'
+    }, {
+        option: '-m, --manuallyTrigger'
+    }, {
+        option: '-l, --loginMethod [loginMethod]',
+        autocomplete: _a.loginMethod
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: _a.scope
+    }, {
+        option: '-u, --siteUrl [siteUrl]'
+    }, {
+        option: '--skipFeatureDeployment'
+    }, {
+        option: '--overwrite'
+    });
+}, _SpfxProjectGithubWorkflowAddCommand_initValidators = function _SpfxProjectGithubWorkflowAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.scope && args.options.scope === 'sitecollection') {
+            if (!args.options.siteUrl) {
+                return `siteUrl option has to be defined when scope set to ${args.options.scope}`;
+            }
+            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.siteUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
+        if (args.options.loginMethod && _a.loginMethod.indexOf(args.options.loginMethod) < 0) {
+            return `${args.options.loginMethod} is not a valid login method. Allowed values are ${_a.loginMethod.join(', ')}`;
+        }
+        if (args.options.scope && _a.scope.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scope.join(', ')}`;
+        }
+        return true;
+    });
+};
+SpfxProjectGithubWorkflowAddCommand.loginMethod = ['application', 'user'];
+SpfxProjectGithubWorkflowAddCommand.scope = ['tenant', 'sitecollection'];
+SpfxProjectGithubWorkflowAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
+export default new SpfxProjectGithubWorkflowAddCommand();
+//# sourceMappingURL=project-github-workflow-add.js.map

package/dist/m365/spfx/commands/project/project-github-workflow-model.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=project-github-workflow-model.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN001022_DEP_office_ui_fabric_react.js

@@ -2,7 +2,7 @@ import { spfx } from "../../../../../../utils/spfx.js";
 import { DependencyRule } from "./DependencyRule.js";
 export class FN001022_DEP_office_ui_fabric_react extends DependencyRule {
     constructor(packageVersion, add = true) {
-        super('office-ui-fabric-react', packageVersion, false, add);
+        super('office-ui-fabric-react', packageVersion, false, true, add);
     }
     get id() {
         return 'FN001022';

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7.js

@@ -0,0 +1,13 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7 extends DependencyRule {
+    constructor(packageVersion) {
+        super('@microsoft/rush-stack-compiler-4.7', packageVersion, true);
+    }
+    get id() {
+        return 'FN002028';
+    }
+    get supersedes() {
+        return ['FN002010', 'FN002011', 'FN002012', 'FN002017', 'FN002018', 'FN002020'];
+    }
+}
+//# sourceMappingURL=FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.2.js

@@ -103,7 +103,7 @@ export default [
                 'fixWith': 'symbol'
               },
               'Function': {
-                'message': 'The \\'Function\\' type accepts any function-like value.\nIt provides no type safety when calling the function, which can be a common source of bugs.\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \'new\'.\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
+                'message': 'The \\'Function\\' type accepts any function-like value.\\nIt provides no type safety when calling the function, which can be a common source of bugs.\\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \\'new\\'.\\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
               }
             }
           }