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

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

@@ -24,36 +24,44 @@ import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_
 import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
 import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
 import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
+import { FN002026_DEVDEP_typescript } from './rules/FN002026_DEVDEP_typescript.js';
+import { FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7 } from './rules/FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7.js';
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.js';
+import { FN012017_TSC_extends } from './rules/FN012017_TSC_extends.js';
+import { FN021003_PKG_engines_node } from './rules/FN021003_PKG_engines_node.js';
 export default [
-    new FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.1'),
-    new FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.1'),
-    new FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.1'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.1'),
+    new FN001001_DEP_microsoft_sp_core_library('1.18.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0'),
+    new FN001011_DEP_microsoft_sp_dialog('1.18.0'),
+    new FN001012_DEP_microsoft_sp_application_base('1.18.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.18.0'),
     new FN001022_DEP_office_ui_fabric_react('', false),
-    new FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.1'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.1'),
-    new FN001027_DEP_microsoft_sp_http('1.18.0-beta.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.1'),
-    new FN001029_DEP_microsoft_sp_loader('1.18.0-beta.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.1'),
-    new FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.1'),
+    new FN001023_DEP_microsoft_sp_component_base('1.18.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.18.0'),
+    new FN001027_DEP_microsoft_sp_http('1.18.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0'),
+    new FN001029_DEP_microsoft_sp_loader('1.18.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.18.0'),
+    new FN001032_DEP_microsoft_sp_page_context('1.18.0'),
     new FN001035_DEP_fluentui_react('8.106.4'),
-    new FN001013_DEP_microsoft_decorators('1.18.0-beta.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.1'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN010001_YORC_version('1.18.0-beta.1'),
-    new FN010010_YORC_sdkVersions_teams_js('2.12.0')
+    new FN001013_DEP_microsoft_decorators('1.18.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0'),
+    new FN002026_DEVDEP_typescript('4.7.4'),
+    new FN002028_DEVDEP_microsoft_rush_stack_compiler_4_7('0.1.0'),
+    new FN010001_YORC_version('1.18.0'),
+    new FN010010_YORC_sdkVersions_teams_js('2.12.0'),
+    new FN012017_TSC_extends('./node_modules/@microsoft/rush-stack-compiler-4.7/includes/tsconfig-web.json'),
+    new FN021003_PKG_engines_node('>=16.13.0 <17.0.0 || >=18.17.1 <19.0.0')
 ];
-//# sourceMappingURL=upgrade-1.18.0-beta.1.js.map
+//# sourceMappingURL=upgrade-1.18.0.js.map

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

@@ -3,12 +3,10 @@ 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 _SpfxProjectUpgradeCommand_instances, _SpfxProjectUpgradeCommand_initTelemetry, _SpfxProjectUpgradeCommand_initOptions, _SpfxProjectUpgradeCommand_initValidators;
+var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTelemetry, _SpfxProjectUpgradeCommand_initOptions, _SpfxProjectUpgradeCommand_initValidators;
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-// uncomment to support upgrading to preview releases
-import { prerelease } from 'semver';
 import { CommandError } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
@@ -71,7 +69,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -80,35 +78,35 @@ class SpfxProjectUpgradeCommand 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`, SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        if (!args.options.toVersion &&
-            !args.options.preview &&
-            prerelease(this.toVersion)) {
-            // no version and no preview specified while the current version to
-            // upgrade to is a prerelease so let's grab the first non-preview version
-            // since we're supporting only one preview version, it's sufficient for
-            // us to take second to last version
-            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (!args.options.toVersion &&
+        //   !args.options.preview &&
+        //   prerelease(this.toVersion)) {
+        //   // no version and no preview specified while the current version to
+        //   // upgrade to is a prerelease so let's grab the first non-preview version
+        //   // since we're supporting only one preview version, it's sufficient for
+        //   // us to take second to last version
+        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
-            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading SharePoint Framework projects to version ${this.toVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION);
+            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading SharePoint Framework projects to version ${this.toVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, _a.ERROR_UNSUPPORTED_TO_VERSION);
         }
         this.projectVersion = this.getProjectVersion();
         if (!this.projectVersion) {
-            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectUpgradeCommand.ERROR_NO_VERSION);
+            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, _a.ERROR_NO_VERSION);
         }
         const pos = this.supportedVersions.indexOf(this.projectVersion);
         if (pos < 0) {
-            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_FROM_VERSION);
+            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, _a.ERROR_UNSUPPORTED_FROM_VERSION);
         }
         const posTo = this.supportedVersions.indexOf(this.toVersion);
         if (pos > posTo) {
-            throw new CommandError('You cannot downgrade a project', SpfxProjectUpgradeCommand.ERROR_NO_DOWNGRADE);
+            throw new CommandError('You cannot downgrade a project', _a.ERROR_NO_DOWNGRADE);
         }
         if (pos === posTo) {
             await logger.log(`Project doesn't need to be upgraded`);
@@ -470,7 +468,7 @@ ${f.resolution}
         };
     }
 }
-_SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand_initTelemetry = function _SpfxProjectUpgradeCommand_initTelemetry() {
+_a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand_initTelemetry = function _SpfxProjectUpgradeCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             toVersion: args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1],
@@ -479,19 +477,19 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({
         option: '-v, --toVersion [toVersion]'
     }, {
         option: '--packageManager [packageManager]',
-        autocomplete: SpfxProjectUpgradeCommand.packageManagers
+        autocomplete: _a.packageManagers
     }, {
         option: '--shell [shell]',
-        autocomplete: SpfxProjectUpgradeCommand.shells
+        autocomplete: _a.shells
     }, {
         option: '--preview'
     });
@@ -503,13 +501,13 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
 }, _SpfxProjectUpgradeCommand_initValidators = function _SpfxProjectUpgradeCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.packageManager) {
-            if (SpfxProjectUpgradeCommand.packageManagers.indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${SpfxProjectUpgradeCommand.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(', ')}`;
             }
         }
         if (args.options.shell) {
-            if (SpfxProjectUpgradeCommand.shells.indexOf(args.options.shell) < 0) {
-                return `${args.options.shell} is not a supported shell. Supported shells are ${SpfxProjectUpgradeCommand.shells.join(', ')}`;
+            if (_a.shells.indexOf(args.options.shell) < 0) {
+                return `${args.options.shell} is not a supported shell. Supported shells are ${_a.shells.join(', ')}`;
             }
         }
         return true;

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

@@ -524,14 +524,14 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.18.0-beta.1': {
+            '1.18.0': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
-                    range: '>=16.13.0 <17.0.0',
-                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                    range: '>=16.13.0 <17.0.0 || >=18.17.1 <19.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0 || >=18.17.1 <19.0.0'
                 },
                 sp: SharePointVersion.SPO,
                 yo: {
@@ -603,31 +603,21 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             this.handleRejectedPromise(err);
         }
     }
-    checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
-        return new Promise(async (resolve, reject) => {
-            if (args.options.env) {
-                const sp = this.spVersionStringToEnum(args.options.env);
-                if ((prerequisites.sp & sp) === sp) {
-                    await logger.log(formatting.getStatus(CheckStatus.Success, `Supported in ${SharePointVersion[sp]}`));
-                    resolve();
-                }
-                else {
-                    await logger.log(formatting.getStatus(CheckStatus.Failure, `Not supported in ${SharePointVersion[sp]}`));
-                    fixes.push(`Use SharePoint Framework v${(sp === SharePointVersion.SP2016 ? '1.1' : '1.4.1')}`);
-                    reject(`SharePoint Framework v${spfxVersion} is not supported in ${SharePointVersion[sp]}`);
-                }
-            }
-            else {
-                resolve();
+    async checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
+        if (args.options.env) {
+            const sp = this.spVersionStringToEnum(args.options.env);
+            if ((prerequisites.sp & sp) === sp) {
+                await logger.log(formatting.getStatus(CheckStatus.Success, `Supported in ${SharePointVersion[sp]}`));
+                return;
             }
-        });
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `Not supported in ${SharePointVersion[sp]}`));
+            fixes.push(`Use SharePoint Framework v${(sp === SharePointVersion.SP2016 ? '1.1' : '1.4.1')}`);
+            throw `SharePoint Framework v${spfxVersion} is not supported in ${SharePointVersion[sp]}`;
+        }
     }
-    checkNodeVersion(prerequisites, fixes, logger) {
-        return Promise
-            .resolve(this.getNodeVersion())
-            .then((nodeVersion) => {
-            this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
-        });
+    async checkNodeVersion(prerequisites, fixes, logger) {
+        const nodeVersion = this.getNodeVersion();
+        this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
     }
     async checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
         let spfxVersionDetected = await this.getSPFxVersionFromYoRcFile(logger);
@@ -646,54 +636,42 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             fixes.push(versionCheck.fix);
         }
     }
-    checkYo(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (yoVersion) => {
-            if (yoVersion) {
-                this.checkStatus('yo', yoVersion, prerequisites.yo, OptionalOrRequired.Required, fixes, logger);
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `yo not found`));
-                fixes.push(prerequisites.yo.fix);
-            }
-        });
+    async checkYo(prerequisites, fixes, logger) {
+        const yoVersion = await this.getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (yoVersion) {
+            this.checkStatus('yo', yoVersion, prerequisites.yo, OptionalOrRequired.Required, fixes, logger);
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `yo not found`));
+            fixes.push(prerequisites.yo.fix);
+        }
     }
-    checkGulpCli(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (gulpCliVersion) => {
-            if (gulpCliVersion) {
-                this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli, OptionalOrRequired.Required, fixes, logger);
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp-cli not found`));
-                fixes.push(prerequisites.gulpCli.fix);
-            }
-        });
+    async checkGulpCli(prerequisites, fixes, logger) {
+        const gulpCliVersion = await this.getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (gulpCliVersion) {
+            this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli, OptionalOrRequired.Required, fixes, logger);
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp-cli not found`));
+            fixes.push(prerequisites.gulpCli.fix);
+        }
     }
-    checkGulp(fixes, logger) {
-        return this
-            .getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (gulpVersion) => {
-            if (gulpVersion) {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp should be removed`));
-                fixes.push('npm un -g gulp');
-            }
-        });
+    async checkGulp(fixes, logger) {
+        const gulpVersion = await this.getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (gulpVersion) {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp should be removed`));
+            fixes.push('npm un -g gulp');
+        }
     }
-    checkTypeScript(fixes, logger) {
-        return this
-            .getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger)
-            .then(async (typeScriptVersion) => {
-            if (typeScriptVersion) {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `typescript v${typeScriptVersion} installed in the project`));
-                fixes.push('npm un typescript');
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Success, `bundled typescript used`));
-            }
-        });
+    async checkTypeScript(fixes, logger) {
+        const typeScriptVersion = await this.getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger);
+        if (typeScriptVersion) {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `typescript v${typeScriptVersion} installed in the project`));
+            fixes.push('npm un typescript');
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Success, `bundled typescript used`));
+        }
     }
     spVersionStringToEnum(sp) {
         return SharePointVersion[sp.toUpperCase()];
@@ -742,43 +720,35 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             }
         }
     }
-    getPackageVersion(packageName, searchMode, handlePromise, logger) {
-        return new Promise((resolve, reject) => {
-            const args = ['ls', packageName, '--depth=0', '--json'];
-            if (searchMode === PackageSearchMode.GlobalOnly) {
+    async getPackageVersion(packageName, searchMode, handlePromise, logger) {
+        const args = ['ls', packageName, '--depth=0', '--json'];
+        if (searchMode === PackageSearchMode.GlobalOnly) {
+            args.push('-g');
+        }
+        let version;
+        try {
+            version = await this.getPackageVersionFromNpm(args, logger);
+        }
+        catch {
+            if (searchMode === PackageSearchMode.LocalAndGlobal) {
                 args.push('-g');
+                version = await this.getPackageVersionFromNpm(args, logger);
             }
-            this
-                .getPackageVersionFromNpm(args, logger)
-                .then((version) => {
-                return Promise.resolve(version);
-            })
-                .catch(() => {
-                if (searchMode === PackageSearchMode.LocalAndGlobal) {
-                    args.push('-g');
-                    return this.getPackageVersionFromNpm(args, logger);
-                }
-                else {
-                    return Promise.resolve('');
-                }
-            })
-                .then((version) => {
-                if (version) {
-                    resolve(version);
-                }
-                else {
-                    if (handlePromise === HandlePromise.Continue) {
-                        resolve('');
-                    }
-                    else {
-                        reject();
-                    }
-                }
-            })
-                .catch((err) => {
-                reject(err);
-            });
-        });
+            else {
+                version = '';
+            }
+        }
+        if (version) {
+            return version;
+        }
+        else {
+            if (handlePromise === HandlePromise.Continue) {
+                return '';
+            }
+            else {
+                throw new Error();
+            }
+        }
     }
     getPackageVersionFromNpm(args, logger) {
         return new Promise(async (resolve, reject) => {

package/dist/m365/spfx/commands.js

@@ -4,6 +4,7 @@ export default {
     PACKAGE_GENERATE: `${prefix} package generate`,
     PROJECT_DOCTOR: `${prefix} project doctor`,
     PROJECT_EXTERNALIZE: `${prefix} project externalize`,
+    PROJECT_GITHUB_WORKFLOW_ADD: `${prefix} project github workflow add`,
     PROJECT_PERMISSIONS_GRANT: `${prefix} project permissions grant`,
     PROJECT_RENAME: `${prefix} project rename`,
     PROJECT_UPGRADE: `${prefix} project upgrade`

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -1,33 +1,34 @@
 import request from '../../../../request.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 export class SpoAppBaseCommand extends SpoCommand {
-    getAppCatalogSiteUrl(logger, authSiteUrl, args) {
-        return new Promise((resolve, reject) => {
-            if (args.options.appCatalogScope === 'sitecollection') {
-                return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
+    async getAppCatalogSiteUrl(logger, authSiteUrl, args) {
+        if (args.options.appCatalogScope === 'sitecollection') {
+            // trim trailing slashes if there are any
+            const appCatalogUrl = args.options.appCatalogUrl.replace(/\/$/, '');
+            const appCatalogUrlChunks = appCatalogUrl.split('/');
+            // Trim the last part of the URL if it ends on '/appcatalog', but don't trim it if the site URL is called like that (/sites/appcatalog).
+            if (appCatalogUrl.toLowerCase().endsWith('/appcatalog') && appCatalogUrlChunks.length !== 5) {
+                return appCatalogUrl.substring(0, appCatalogUrl.lastIndexOf('/'));
             }
-            if (args.options.appCatalogUrl) {
-                return resolve(args.options.appCatalogUrl);
-            }
-            const requestOptions = {
-                url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request
-                .get(requestOptions)
-                .then((res) => {
-                if (res.CorporateCatalogUrl) {
-                    return resolve(res.CorporateCatalogUrl);
-                }
-                reject('Tenant app catalog is not configured.');
-            })
-                .catch((err) => {
-                reject(err);
-            });
-        });
+        }
+        if (args.options.appCatalogUrl) {
+            return args.options.appCatalogUrl.replace(/\/$/, '');
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Getting tenant app catalog url...');
+        }
+        const requestOptions = {
+            url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.CorporateCatalogUrl) {
+            return response.CorporateCatalogUrl;
+        }
+        throw new Error('Tenant app catalog is not configured.');
     }
 }
 //# sourceMappingURL=SpoAppBaseCommand.js.map

package/dist/m365/spo/commands/app/app-add.js

@@ -22,6 +22,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand {
     constructor() {
         super();
         _SpoAppAddCommand_instances.add(this);
+        this.appCatalogScopeOptions = ['tenant', 'sitecollection'];
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initValidators).call(this);
@@ -62,9 +63,9 @@ class SpoAppAddCommand extends SpoAppBaseCommand {
 _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            overwrite: (!(!args.options.overwrite)).toString(),
+            overwrite: !!args.options.overwrite,
             appCatalogScope: args.options.appCatalogScope || 'tenant',
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString()
+            appCatalogUrl: typeof args.options.appCatalogUrl !== 'undefined'
         });
     });
 }, _SpoAppAddCommand_initOptions = function _SpoAppAddCommand_initOptions() {
@@ -72,7 +73,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
         option: '-p, --filePath <filePath>'
     }, {
         option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
+        autocomplete: this.appCatalogScopeOptions
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
@@ -80,14 +81,13 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     });
 }, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        // verify either 'tenant' or 'sitecollection' specified if scope provided
         if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
+            const appCatalogScope = args.options.appCatalogScope.toLowerCase();
+            if (this.appCatalogScopeOptions.indexOf(appCatalogScope) === -1) {
+                return `${args.options.appCatalogScope} is not a valid appCatalogScope. Allowed values are: ${this.appCatalogScopeOptions.join(', ')}`;
             }
-            if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
+            if (appCatalogScope === 'sitecollection' && !args.options.appCatalogUrl) {
+                return `You must specify appCatalogUrl when appCatalogScope is sitecollection`;
             }
         }
         const fullPath = path.resolve(args.options.filePath);

package/dist/m365/spo/commands/applicationcustomizer/applicationcustomizer-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 _SpoApplicationCustomizerAddCommand_instances, _SpoApplicationCustomizerAddCommand_initOptions, _SpoApplicationCustomizerAddCommand_initTelemetry, _SpoApplicationCustomizerAddCommand_initValidators;
+var _SpoApplicationCustomizerAddCommand_instances, _a, _SpoApplicationCustomizerAddCommand_initOptions, _SpoApplicationCustomizerAddCommand_initTelemetry, _SpoApplicationCustomizerAddCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -47,7 +47,7 @@ class SpoApplicationCustomizerAddCommand extends SpoCommand {
         await request.post(requestOptions);
     }
 }
-_SpoApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoApplicationCustomizerAddCommand_initOptions = function _SpoApplicationCustomizerAddCommand_initOptions() {
+_a = SpoApplicationCustomizerAddCommand, _SpoApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoApplicationCustomizerAddCommand_initOptions = function _SpoApplicationCustomizerAddCommand_initOptions() {
     this.options.unshift({
         option: '-t, --title <title>'
     }, {
@@ -57,7 +57,7 @@ _SpoApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoApplicationCu
     }, {
         option: '--clientSideComponentProperties [clientSideComponentProperties]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoApplicationCustomizerAddCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     });
 }, _SpoApplicationCustomizerAddCommand_initTelemetry = function _SpoApplicationCustomizerAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -85,8 +85,8 @@ _SpoApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoApplicationCu
                 return `An error has occurred while parsing clientSideComponentProperties: ${e}`;
             }
         }
-        if (args.options.scope && SpoApplicationCustomizerAddCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid value for allowedMembers. Valid values are ${SpoApplicationCustomizerAddCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid value for allowedMembers. Valid values are ${_a.scopes.join(', ')}`;
         }
         return true;
     });

package/dist/m365/spo/commands/applicationcustomizer/applicationcustomizer-get.js

@@ -9,6 +9,7 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class SpoApplicationCustomizerGetCommand extends SpoCommand {
     get name() {
         return commands.APPLICATIONCUSTOMIZER_GET;
@@ -69,12 +70,13 @@ class SpoApplicationCustomizerGetCommand extends SpoCommand {
         if (customActions.length === 1) {
             return customActions[0];
         }
-        const errorMessage = options.title ? `title '${options.title}'` : `Client Side Component Id '${options.clientSideComponentId}'`;
+        const identifier = options.title ? `title '${options.title}'` : `Client Side Component Id '${options.clientSideComponentId}'`;
         if (customActions.length === 0) {
-            throw `No application customizer with ${errorMessage} found`;
+            throw `No application customizer with ${identifier} found`;
         }
         else {
-            throw `Multiple application customizers with ${errorMessage} found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', customActions);
+            return await Cli.handleMultipleResultsFound(`Multiple application customizers with ${identifier} found.`, resultAsKeyValuePair);
         }
     }
     humanizeScope(scope) {