@pnp/cli-microsoft365 6.0.0-beta.3a04435 → 6.0.0-beta.3bf0c3c

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

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN010010_YORC_sdkVersions_teams_js = void 0;
+const JsonRule_1 = require("../../JsonRule");
+class FN010010_YORC_sdkVersions_teams_js extends JsonRule_1.JsonRule {
+    constructor(version) {
+        super();
+        this.version = version;
+    }
+    get id() {
+        return 'FN010010';
+    }
+    get title() {
+        return '.yo-rc.json @microsoft/teams-js SDK version';
+    }
+    get description() {
+        return `Update @microsoft/teams-js SDK version in .yo-rc.json`;
+    }
+    get resolution() {
+        return `{
+  "@microsoft/generator-sharepoint": {
+    "sdkVersions": {
+      "@microsoft/teams-js": "${this.version}"
+    }
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Recommended';
+    }
+    get file() {
+        return './.yo-rc.json';
+    }
+    visit(project, findings) {
+        var _a, _b, _c;
+        if (!project.yoRcJson) {
+            return;
+        }
+        if (((_b = (_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.sdkVersions) === null || _b === void 0 ? void 0 : _b['@microsoft/teams-js']) !== this.version) {
+            let nodePath = '@microsoft/generator-sharepoint';
+            if ((_c = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _c === void 0 ? void 0 : _c.sdkVersions) {
+                nodePath += '.sdkVersions';
+                if (project.yoRcJson["@microsoft/generator-sharepoint"].sdkVersions['@microsoft/teams-js']) {
+                    nodePath += '.@microsoft/teams-js';
+                }
+            }
+            const node = this.getAstNodeFromFile(project.yoRcJson, nodePath);
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+exports.FN010010_YORC_sdkVersions_teams_js = FN010010_YORC_sdkVersions_teams_js;
+//# sourceMappingURL=FN010010_YORC_sdkVersions_teams_js.js.map

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

@@ -4,6 +4,8 @@ const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_m
 const FN001002_DEP_microsoft_sp_lodash_subset_1 = require("./rules/FN001002_DEP_microsoft_sp_lodash_subset");
 const FN001003_DEP_microsoft_sp_office_ui_fabric_core_1 = require("./rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core");
 const FN001004_DEP_microsoft_sp_webpart_base_1 = require("./rules/FN001004_DEP_microsoft_sp_webpart_base");
+const FN001008_DEP_react_1 = require("./rules/FN001008_DEP_react");
+const FN001009_DEP_react_dom_1 = require("./rules/FN001009_DEP_react_dom");
 const FN001011_DEP_microsoft_sp_dialog_1 = require("./rules/FN001011_DEP_microsoft_sp_dialog");
 const FN001012_DEP_microsoft_sp_application_base_1 = require("./rules/FN001012_DEP_microsoft_sp_application_base");
 const FN001013_DEP_microsoft_decorators_1 = require("./rules/FN001013_DEP_microsoft_decorators");
@@ -23,39 +25,53 @@ const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_m
 const FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1 = require("./rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base");
 const FN002001_DEVDEP_microsoft_sp_build_web_1 = require("./rules/FN002001_DEVDEP_microsoft_sp_build_web");
 const FN002002_DEVDEP_microsoft_sp_module_interfaces_1 = require("./rules/FN002002_DEVDEP_microsoft_sp_module_interfaces");
+const FN002015_DEVDEP_types_react_1 = require("./rules/FN002015_DEVDEP_types_react");
+const FN002016_DEVDEP_types_react_dom_1 = require("./rules/FN002016_DEVDEP_types_react_dom");
 const FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
 const FN002023_DEVDEP_microsoft_eslint_config_spfx_1 = require("./rules/FN002023_DEVDEP_microsoft_eslint_config_spfx");
 const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
 const FN010008_YORC_nodeVersion_1 = require("./rules/FN010008_YORC_nodeVersion");
+const FN010009_YORC_sdkVersions_microsoft_graph_client_1 = require("./rules/FN010009_YORC_sdkVersions_microsoft_graph_client");
+const FN010010_YORC_sdkVersions_teams_js_1 = require("./rules/FN010010_YORC_sdkVersions_teams_js");
 const FN021003_PKG_engines_node_1 = require("./rules/FN021003_PKG_engines_node");
+const FN022001_SCSS_remove_fabric_react_1 = require("./rules/FN022001_SCSS_remove_fabric_react");
+const FN022002_SCSS_add_fabric_react_1 = require("./rules/FN022002_SCSS_add_fabric_react");
 module.exports = [
-    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.0-beta.1'),
-    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.0-beta.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.0-beta.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.0-beta.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.0-beta.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.0-beta.1'),
-    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.192.0'),
-    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.0-beta.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.0-beta.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.0-beta.1'),
-    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.0-beta.1'),
-    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.0-beta.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.0-beta.1'),
-    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.0-beta.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.0-beta.1'),
-    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.0-beta.1'),
-    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.0-beta.1'),
-    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.0-beta.1'),
-    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.0-beta.1'),
-    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.0-beta.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.0-beta.1'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.0-beta.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.0-beta.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.0-beta.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.0-beta.1'),
-    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.0-beta.1'),
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.0-rc.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.0-rc.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.0-rc.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.0-rc.0'),
+    new FN001008_DEP_react_1.FN001008_DEP_react('17.0.1'),
+    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('17.0.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.0-rc.0'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.0-rc.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.0-rc.0'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.0-rc.0'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.199.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.0-rc.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.0-rc.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.0-rc.0'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.0-rc.0'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.0-rc.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.0-rc.0'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.0-rc.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.0-rc.0'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.0-rc.0'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.0-rc.0'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.0-rc.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.0-rc.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.0-rc.0'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.0-rc.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.0-rc.0'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.0-rc.0'),
+    new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('17.0.45'),
+    new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17.0.17'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.0-rc.0'),
     new FN010008_YORC_nodeVersion_1.FN010008_YORC_nodeVersion(),
-    new FN021003_PKG_engines_node_1.FN021003_PKG_engines_node('>=16.13.0 <17.0.0')
+    new FN010009_YORC_sdkVersions_microsoft_graph_client_1.FN010009_YORC_sdkVersions_microsoft_graph_client('3.0.2'),
+    new FN010010_YORC_sdkVersions_teams_js_1.FN010010_YORC_sdkVersions_teams_js('2.4.1'),
+    new FN021003_PKG_engines_node_1.FN021003_PKG_engines_node('>=16.13.0 <17.0.0'),
+    new FN022001_SCSS_remove_fabric_react_1.FN022001_SCSS_remove_fabric_react('~office-ui-fabric-react/dist/sass/References.scss'),
+    new FN022002_SCSS_add_fabric_react_1.FN022002_SCSS_add_fabric_react('~@fluentui/react/dist/sass/References.scss')
 ];
-//# sourceMappingURL=upgrade-1.16.0-beta.1.js.map
+//# sourceMappingURL=upgrade-1.16.0-rc.0.js.map

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

@@ -66,7 +66,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.14.0',
             '1.15.0',
             '1.15.2',
-            '1.16.0-beta.1'
+            '1.16.0-rc.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -78,6 +78,9 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
     get description() {
         return 'Upgrades SharePoint Framework project to the specified version';
     }
+    get allowedOutputs() {
+        return ['json', 'text', 'md', 'tour'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             this.projectRootPath = this.getProjectRoot(process.cwd());
@@ -494,7 +497,7 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
     });
     this.options.forEach(o => {
         if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = ['json', 'text', 'md', 'tour'];
+            o.autocomplete = this.allowedOutputs;
         }
     });
 }, _SpfxProjectUpgradeCommand_initValidators = function _SpfxProjectUpgradeCommand_initValidators() {

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

@@ -429,14 +429,14 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.16.0-beta.1': {
+            '1.16.0-rc.0': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
-                    range: '^16.13',
-                    fix: 'Install Node.js v16.13 or higher'
+                    range: '>=16.13.0 <17.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0'
                 },
                 sp: SharePointVersion.SPO,
                 yo: {

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators, _SpoAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
@@ -63,7 +64,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                     logger.logToStderr(`Retrieving information for app ${appId}...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(appId)}')`,
+                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(appId)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInstallCommand_instances, _SpoAppInstallCommand_initTelemetry, _SpoAppInstallCommand_initOptions, _SpoAppInstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,7 +41,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
             }
             const requestOptions = {
-                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/install`,
+                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/install`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 }

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

@@ -17,6 +17,7 @@ var _SpoAppRemoveCommand_instances, _SpoAppRemoveCommand_initTelemetry, _SpoAppR
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
@@ -46,7 +47,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                         logger.logToStderr(`Retrieved app catalog URL ${appCatalogUrl}. Removing app from the app catalog...`);
                     }
                     const requestOptions = {
-                        url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/remove`,
+                        url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/remove`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         }

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

@@ -17,6 +17,7 @@ var _SpoAppRetractCommand_instances, _SpoAppRetractCommand_initTelemetry, _SpoAp
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
@@ -46,7 +47,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                         logger.logToStderr(`Retracting app...`);
                     }
                     const requestOptions = {
-                        url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/retract`,
+                        url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/retract`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         }

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
@@ -103,7 +104,7 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
                 url += `GetList('${serverRelativeAppCatalogListUrl}')/GetItemById(${args.options.appItemId})?$expand=File&$select=File/Name`;
             }
             else if (args.options.appName) {
-                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${encodeURIComponent(args.options.appName)}')/ListItemAllFields?$select=Id`;
+                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${formatting_1.formatting.encodeQueryParameter(args.options.appName)}')/ListItemAllFields?$select=Id`;
             }
             const requestOptions = {
                 url,

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

@@ -17,6 +17,7 @@ var _SpoAppUninstallCommand_instances, _SpoAppUninstallCommand_initTelemetry, _S
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -42,7 +43,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Uninstalling app '${args.options.id}' from the site '${args.options.siteUrl}'...`);
                 }
                 const requestOptions = {
-                    url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/uninstall`,
+                    url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/uninstall`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     }

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppUpgradeCommand_instances, _SpoAppUpgradeCommand_initTelemetry, _SpoAppUpgradeCommand_initOptions, _SpoAppUpgradeCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,7 +41,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Upgrading app '${args.options.id}' in site '${args.options.siteUrl}'...`);
             }
             const requestOptions = {
-                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/upgrade`,
+                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/upgrade`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 }

package/dist/m365/spo/commands/contenttype/contenttype-field-set.js

@@ -49,7 +49,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Retrieving field link for field ${args.options.id}...`);
                 }
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
+                    url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
@@ -83,7 +83,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                         logger.logToStderr(`Retrieving information about field link for field ${args.options.id}...`);
                     }
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
+                        url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },

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

@@ -52,10 +52,10 @@ class SpoContentTypeGetCommand extends SpoCommand_1.default {
             }
             requestUrl += "/contenttypes";
             if (args.options.id) {
-                requestUrl += `('${encodeURIComponent(args.options.id)}')`;
+                requestUrl += `('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else if (args.options.name) {
-                requestUrl += `?$filter=Name eq '${encodeURIComponent(args.options.name)}'`;
+                requestUrl += `?$filter=Name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`;
             }
             const requestOptions = {
                 url: requestUrl,

package/dist/m365/spo/commands/contenttype/contenttype-list.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,7 +42,7 @@ class SpoContentTypeListCommand extends SpoCommand_1.default {
             try {
                 let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes`;
                 if (args.options.category) {
-                    requestUrl += `?$filter=Group eq '${encodeURIComponent(args.options.category)}'`;
+                    requestUrl += `?$filter=Group eq '${formatting_1.formatting.encodeQueryParameter(args.options.category)}'`;
                 }
                 const requestOptions = {
                     url: requestUrl,

package/dist/m365/spo/commands/contenttype/contenttype-remove.js

@@ -17,6 +17,7 @@ var _SpoContentTypeRemoveCommand_instances, _SpoContentTypeRemoveCommand_initTel
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -56,7 +57,7 @@ class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
                             logger.logToStderr(`Looking up the ID of content type ${contentTypeIdentifierLabel}...`);
                         }
                         const requestOptions = {
-                            url: `${args.options.webUrl}/_api/web/availableContentTypes?$filter=(Name eq '${encodeURIComponent(args.options.name)}')`,
+                            url: `${args.options.webUrl}/_api/web/availableContentTypes?$filter=(Name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}')`,
                             headers: {
                                 accept: 'application/json;odata=nometadata'
                             },
@@ -71,7 +72,7 @@ class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
                         contentTypeId = contentTypeIdResult.value[0].StringId;
                         //execute delete operation
                         const requestOptions = {
-                            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(contentTypeId)}')`,
+                            url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(contentTypeId)}')`,
                             headers: {
                                 'X-HTTP-Method': 'DELETE',
                                 'If-Match': '*',

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionGetCommand_instances, _SpoCustomActionGetCommand_initTelemetry, _SpoCustomActionGetCommand_initOptions, _SpoCustomActionGetCommand_initValidators, _SpoCustomActionGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -80,8 +81,8 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
     }
     getCustomAction(options) {
         const filter = options.id ?
-            `('${encodeURIComponent(options.id)}')` :
-            `?$filter=Title eq '${encodeURIComponent(options.title)}'`;
+            `('${formatting_1.formatting.encodeQueryParameter(options.id)}')` :
+            `?$filter=Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`;
         const requestOptions = {
             url: `${options.webUrl}/_api/${options.scope}/UserCustomActions${filter}`,
             headers: {

package/dist/m365/spo/commands/customaction/customaction-remove.js

@@ -17,6 +17,7 @@ var _SpoCustomActionRemoveCommand_instances, _SpoCustomActionRemoveCommand_initT
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -77,7 +78,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             return Promise.resolve(options.id);
         }
         const customActionRequestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${encodeURIComponent(options.title)}'`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -100,7 +101,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             .getCustomActionId(options)
             .then((customActionId) => {
             const requestOptions = {
-                url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(customActionId)}')')`,
+                url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customActionId)}')')`,
                 headers: {
                     accept: 'application/json;odata=nometadata',
                     'X-HTTP-Method': 'DELETE'

package/dist/m365/spo/commands/customaction/customaction-set.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionSetCommand_instances, _SpoCustomActionSetCommand_initTelemetry, _SpoCustomActionSetCommand_initOptions, _SpoCustomActionSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
@@ -74,7 +75,7 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
     updateCustomAction(options) {
         const requestBody = this.mapRequestBody(options);
         const requestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(options.id)}')`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(options.id)}')`,
             headers: {
                 accept: 'application/json;odata=nometadata',
                 'X-HTTP-Method': 'MERGE'

package/dist/m365/spo/commands/eventreceiver/eventreceiver-list.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoEventreceiverListCommand_instances, _SpoEventreceiverListCommand_initTelemetry, _SpoEventreceiverListCommand_initOptions, _SpoEventreceiverListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -42,14 +43,14 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
             let requestUrl = `${args.options.webUrl}/_api/`;
             let listUrl = '';
             if (args.options.listId) {
-                listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
             }
             else if (args.options.listTitle) {
-                listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+                listUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
             }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
             if (!args.options.scope || args.options.scope === 'web') {
                 requestUrl += `web/${listUrl}eventreceivers`;