@pnp/cli-microsoft365 7.0.0-beta.99e75a7 → 7.0.0-beta.aa2d71e

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-beta.5'
         ];
         __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-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/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.'
               }
             }
           }

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

@@ -27,33 +27,33 @@ import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_D
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.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-beta.5'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.5'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.5'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.5'),
+    new FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.5'),
+    new FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.5'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.5'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.5'),
     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-beta.5'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.5'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.5'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.5'),
+    new FN001027_DEP_microsoft_sp_http('1.18.0-beta.5'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.5'),
+    new FN001029_DEP_microsoft_sp_loader('1.18.0-beta.5'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.5'),
+    new FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.5'),
     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 FN001013_DEP_microsoft_decorators('1.18.0-beta.5'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.5'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.5'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.5'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.5'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN010001_YORC_version('1.18.0-beta.5'),
     new FN010010_YORC_sdkVersions_teams_js('2.12.0')
 ];
-//# sourceMappingURL=upgrade-1.18.0-beta.1.js.map
+//# sourceMappingURL=upgrade-1.18.0-beta.5.js.map

package/dist/m365/spfx/commands/project/project-upgrade.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 _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';
@@ -71,7 +71,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0-beta.5'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -80,7 +80,7 @@ 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
@@ -96,19 +96,19 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         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 +470,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],
@@ -488,10 +488,10 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
         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 +503,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-beta.5': {
                 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.14.0 <17.0.0',
+                    fix: 'Install Node.js >=16.14.0 <17.0.0'
                 },
                 sp: SharePointVersion.SPO,
                 yo: {

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-list.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 _SpoApplicationCustomizerListCommand_instances, _SpoApplicationCustomizerListCommand_initOptions, _SpoApplicationCustomizerListCommand_initTelemetry, _SpoApplicationCustomizerListCommand_initValidators;
+var _SpoApplicationCustomizerListCommand_instances, _a, _SpoApplicationCustomizerListCommand_initOptions, _SpoApplicationCustomizerListCommand_initTelemetry, _SpoApplicationCustomizerListCommand_initValidators;
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -33,12 +33,12 @@ class SpoApplicationCustomizerListCommand extends SpoCommand {
         await logger.log(applicationCustomizers);
     }
 }
-_SpoApplicationCustomizerListCommand_instances = new WeakSet(), _SpoApplicationCustomizerListCommand_initOptions = function _SpoApplicationCustomizerListCommand_initOptions() {
+_a = SpoApplicationCustomizerListCommand, _SpoApplicationCustomizerListCommand_instances = new WeakSet(), _SpoApplicationCustomizerListCommand_initOptions = function _SpoApplicationCustomizerListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
-        autocomplete: SpoApplicationCustomizerListCommand.scopes
+        autocomplete: _a.scopes
     });
 }, _SpoApplicationCustomizerListCommand_initTelemetry = function _SpoApplicationCustomizerListCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -48,8 +48,8 @@ _SpoApplicationCustomizerListCommand_instances = new WeakSet(), _SpoApplicationC
     });
 }, _SpoApplicationCustomizerListCommand_initValidators = function _SpoApplicationCustomizerListCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.scope && SpoApplicationCustomizerListCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoApplicationCustomizerListCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });