@pnp/cli-microsoft365 10.10.0-beta.eb74779 → 10.11.0-beta.24af61c

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.22.0-beta.1.js

@@ -0,0 +1,241 @@
+import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
+import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
+import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
+import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
+import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
+import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
+import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
+import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
+import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
+import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
+import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
+import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
+import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
+import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
+import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
+import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
+import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
+import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
+import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
+import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
+import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
+import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
+import { FN002007_DEVDEP_ajv } from './rules/FN002007_DEVDEP_ajv.js';
+import { FN002021_DEVDEP_rushstack_eslint_config } from './rules/FN002021_DEVDEP_rushstack_eslint_config.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 { FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3 } from './rules/FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3.js';
+import { FN002030_DEVDEP_microsoft_spfx_web_build_rig } from './rules/FN002030_DEVDEP_microsoft_spfx_web_build_rig.js';
+import { FN002031_DEVDEP_rushstack_heft } from './rules/FN002031_DEVDEP_rushstack_heft.js';
+import { FN002032_DEVDEP_typescript_eslint_parser } from './rules/FN002032_DEVDEP_typescript_eslint_parser.js';
+import { FN002033_DEVDEP_jest_junit } from './rules/FN002033_DEVDEP_jest_junit.js';
+import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
+import { FN010011_YORC_useGulp } from './rules/FN010011_YORC_useGulp.js';
+import { FN015005_FILE_src_index_ts } from './rules/FN015005_FILE_src_index_ts.js';
+import { FN015010_FILE_gulpfile_js } from './rules/FN015010_FILE_gulpfile_js.js';
+import { FN015011_FILE_tsconfig_json } from './rules/FN015011_FILE_tsconfig_json.js';
+import { FN015012_FILE_config_heft_json } from './rules/FN015012_FILE_config_heft_json.js';
+import { FN015013_FILE_config_jest_config_json } from './rules/FN015013_FILE_config_jest_config_json.js';
+import { FN015014_FILE_config_rig_json } from './rules/FN015014_FILE_config_rig_json.js';
+import { FN015015_FILE_config_typescript_json } from './rules/FN015015_FILE_config_typescript_json.js';
+import { FN020001_RES_types_react } from './rules/FN020001_RES_types_react.js';
+import { FN021001_PKG_main } from './rules/FN021001_PKG_main.js';
+import { FN021004_PKG_scripts_build } from './rules/FN021004_PKG_scripts_build.js';
+import { FN021005_PKG_scripts_test } from './rules/FN021005_PKG_scripts_test.js';
+import { FN021006_PKG_scripts_clean } from './rules/FN021006_PKG_scripts_clean.js';
+import { FN021007_PKG_scripts_deploy } from './rules/FN021007_PKG_scripts_deploy.js';
+import { FN021008_PKG_scripts_start } from './rules/FN021008_PKG_scripts_start.js';
+import { FN021009_PKG_scripts_build_watch } from './rules/FN021009_PKG_scripts_build_watch.js';
+import { FN021010_PKG_scripts_package_solution } from './rules/FN021010_PKG_scripts_package_solution.js';
+import { FN021011_PKG_scripts_deploy_azure_storage } from './rules/FN021011_PKG_scripts_deploy_azure_storage.js';
+import { FN021012_PKG_scripts_eject_webpack } from './rules/FN021012_PKG_scripts_eject_webpack.js';
+import { FN021013_PKG_overrides_rushstack_heft } from './rules/FN021013_PKG_overrides_rushstack_heft.js';
+import { FN023003_GITIGNORE_libdts } from './rules/FN023003_GITIGNORE_libdts.js';
+import { FN023004_GITIGNORE_libcommonjs } from './rules/FN023004_GITIGNORE_libcommonjs.js';
+import { FN023005_GITIGNORE_libesm } from './rules/FN023005_GITIGNORE_libesm.js';
+import { FN023006_GITIGNORE_jestoutput } from './rules/FN023006_GITIGNORE_jestoutput.js';
+import { FN026001_CFG_SASS_schema } from './rules/FN026001_CFG_SASS_schema.js';
+import { FN026002_CFG_SASS_extends } from './rules/FN026002_CFG_SASS_extends.js';
+export default [
+    new FN001001_DEP_microsoft_sp_core_library('1.22.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.22.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.22.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.22.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog('1.22.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base('1.22.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.22.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.22.0-beta.1'),
+    new FN001023_DEP_microsoft_sp_component_base('1.22.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.22.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.22.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.22.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http('1.22.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.22.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader('1.22.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.22.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.22.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context('1.22.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators('1.22.0-beta.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.22.0-beta.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.22.0-beta.1', false),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.22.0-beta.1'),
+    new FN002004_DEVDEP_gulp('4.0.2', false),
+    new FN002007_DEVDEP_ajv('6.12.6', false),
+    new FN002021_DEVDEP_rushstack_eslint_config('4.3.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.22.0-beta.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.22.0-beta.1'),
+    new FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3('0.1.0', false),
+    new FN002030_DEVDEP_microsoft_spfx_web_build_rig('1.22.0-beta.1'),
+    new FN002031_DEVDEP_rushstack_heft('0.73.6'),
+    new FN002032_DEVDEP_typescript_eslint_parser('8.26.1'),
+    new FN002033_DEVDEP_jest_junit('12.3.0'),
+    new FN010001_YORC_version('1.22.0-beta.1'),
+    new FN010011_YORC_useGulp(true),
+    new FN015005_FILE_src_index_ts(false),
+    new FN015010_FILE_gulpfile_js(false),
+    new FN015011_FILE_tsconfig_json(true, `{
+  "extends": "./node_modules/@microsoft/spfx-web-build-rig/profiles/default/tsconfig-base.json",
+  "compilerOptions": {
+    "skipLibCheck": true
+  }
+}
+`),
+    new FN015012_FILE_config_heft_json(true, `{
+  "$schema": "https://developer.microsoft.com/json-schemas/heft/v0/heft.schema.json",
+
+  "extends": "@microsoft/spfx-web-build-rig/profiles/default/config/heft.json",
+
+  "phasesByName": {
+    "build": {
+      "tasksByName": {
+        // copies the localization js files to the lib folder
+        "copy-strings": {
+          "taskPlugin": {
+            "pluginPackage": "@rushstack/heft",
+            "pluginName": "copy-files-plugin",
+            "options": {
+              "copyOperations": [
+                {
+                  "sourcePath": "./src",
+                  "destinationFolders": ["./lib", "./lib-commonjs"],
+                  "fileExtensions": [".js"]
+                }
+              ]
+            }
+          }
+        }
+      }
+    },
+    "eject-webpack": {
+      "tasksByName": {
+        "eject-webpack": {
+          "taskPlugin": {
+            "pluginPackage": "@rushstack/heft",
+            "pluginName": "run-script-plugin",
+            "options": {
+              "scriptPath": "node_modules/@microsoft/spfx-heft-plugins/lib-commonjs/plugins/ejectWebpackPlugin/EjectWebpackPlugin.js"
+            }
+          }
+        }
+      }
+    }
+  }
+}
+`),
+    new FN015013_FILE_config_jest_config_json(true, `{
+  "extends": "@rushstack/heft-jest-plugin/includes/jest-shared.config.json",
+
+  "roots": ["<rootDir>/lib"],
+
+  "testMatch": ["<rootDir>/lib/**/*.test.js"],
+
+  "collectCoverageFrom": [
+    "lib/**/*.js",
+    "!lib/**/*.d.ts",
+    "!lib/**/*.test.js",
+    "!lib/**/test/**",
+    "!lib/**/__tests__/**",
+    "!lib/**/__fixtures__/**",
+    "!lib/**/__mocks__/**"
+  ],
+
+  "transformIgnorePatterns": ["[\\/]lib[\\/](.*)\\.js$"],
+
+  "testEnvironment": "jest-environment-jsdom",
+  "testEnvironmentOptions": {
+    "customExportConditions": ["require", "node", "umd"]
+  },
+
+  "moduleFileExtensions": ["cjs", "js", "json", "node", "css"],
+
+  // Enable code coverage for Jest
+  "collectCoverage": true,
+  "coverageDirectory": "<rootDir>/jest-output/coverage",
+  "coverageReporters": [
+    [
+      "cobertura",
+      {
+        "file": "cobertura/cobertura-coverage.xml"
+      }
+    ],
+    "html",
+    "json-summary"
+  ],
+
+  // Use v8 coverage provider to avoid Babel
+  "coverageProvider": "v8",
+
+  // Enable junit reporting for Jest
+  "reporters": [
+    "default",
+    [
+      "jest-junit",
+      {
+        "outputDirectory": "<rootDir>/jest-output",
+        "outputName": "JUnit.xml", // QTest expects this casing.
+        "classNameTemplate": "{classname} > ",
+        "titleTemplate": "{title} ({filepath})"
+      }
+    ]
+  ]
+}
+`),
+    new FN015014_FILE_config_rig_json(true, `{
+  // The "rig.json" file directs tools to look for their config files in an external package.
+  // Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
+  "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+
+  "rigPackageName": "@microsoft/spfx-web-build-rig"
+}
+`),
+    new FN015015_FILE_config_typescript_json(true, `{
+  "extends": "@microsoft/spfx-web-build-rig/profiles/default/config/typescript.json",
+
+  "staticAssetsToCopy": {
+    "fileExtensions": [".resx", ".jpg", ".png", ".woff", ".eot", ".ttf", ".svg", ".gif"],
+
+    "includeGlobs": ["webparts/*/loc/*.js"]
+  }
+}
+`),
+    new FN020001_RES_types_react('17.0.45'),
+    new FN021001_PKG_main(false),
+    new FN021004_PKG_scripts_build('heft test --clean'),
+    new FN021005_PKG_scripts_test('heft test'),
+    new FN021006_PKG_scripts_clean('heft clean'),
+    new FN021007_PKG_scripts_deploy('heft dev-deploy'),
+    new FN021008_PKG_scripts_start('heft start --clean'),
+    new FN021009_PKG_scripts_build_watch('heft build --lite'),
+    new FN021010_PKG_scripts_package_solution('heft package-solution'),
+    new FN021011_PKG_scripts_deploy_azure_storage('heft deploy-azure-storage'),
+    new FN021012_PKG_scripts_eject_webpack('heft eject-webpack'),
+    new FN021013_PKG_overrides_rushstack_heft('0.73.6'),
+    new FN023003_GITIGNORE_libdts(),
+    new FN023004_GITIGNORE_libcommonjs(),
+    new FN023005_GITIGNORE_libesm(),
+    new FN023006_GITIGNORE_jestoutput(),
+    new FN026001_CFG_SASS_schema('https://developer.microsoft.com/json-schemas/heft/v0/heft-sass-plugin.schema.json'),
+    new FN026002_CFG_SASS_extends('@microsoft/spfx-web-build-rig/profiles/default/config/sass.json')
+];
+//# sourceMappingURL=upgrade-1.22.0-beta.1.js.map

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

@@ -7,6 +7,8 @@ var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTel
 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';
@@ -75,7 +77,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.19.0',
             '1.20.0',
             '1.21.0',
-            '1.21.1'
+            '1.21.1',
+            '1.22.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -88,15 +91,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         }
         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) {
@@ -485,9 +488,9 @@ _a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakS
             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({

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

@@ -620,6 +620,17 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     range: '^4 || ^5',
                     fix: 'npm i -g yo@5'
                 }
+            },
+            '1.22.0-beta.1': {
+                node: {
+                    range: '>=22.14.0 < 23.0.0',
+                    fix: 'Install Node.js >=22.14.0 < 23.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4 || ^5',
+                    fix: 'npm i -g yo@5'
+                }
             }
         };
         this.output = '';
@@ -801,6 +812,10 @@ class SpfxDoctorCommand extends BaseProjectCommand {
         }
     }
     async checkGulpCli(prerequisites) {
+        if (!prerequisites.gulpCli) {
+            // gulp-cli is not required for this version of SPFx
+            return;
+        }
         const gulpCliVersion = await this.getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue);
         if (gulpCliVersion) {
             await this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli);

package/dist/m365/spo/commands/file/file-version-get.js

@@ -47,6 +47,7 @@ class SpoFileVersionGetCommand extends SpoCommand {
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
         }
+        requestUrl += `&$select=*,ExpirationDate`;
         const requestOptions = {
             url: requestUrl,
             headers: {

package/dist/m365/spo/commands/file/file-version-list.js

@@ -18,7 +18,7 @@ class SpoFileVersionListCommand extends SpoCommand {
         return 'Retrieves all versions of a file';
     }
     defaultProperties() {
-        return ['Created', 'ID', 'IsCurrentVersion', 'VersionLabel'];
+        return ['Created', 'ID', 'IsCurrentVersion', 'VersionLabel', 'ExpirationDate'];
     }
     constructor() {
         super();
@@ -42,7 +42,7 @@ class SpoFileVersionListCommand extends SpoCommand {
             else {
                 requestUrl += `/GetFileById('${args.options.fileId}')`;
             }
-            requestUrl += `/versions`;
+            requestUrl += `/versions?$select=*,ExpirationDate`;
             const response = await odata.getAllItems(requestUrl);
             await logger.log(response);
         }

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

@@ -1,48 +1,62 @@
-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 _SpoHomeSiteRemoveCommand_instances, _SpoHomeSiteRemoveCommand_initTelemetry, _SpoHomeSiteRemoveCommand_initOptions;
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { validation } from '../../../../utils/validation.js';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    url: zod.alias('u', z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+    })).optional()),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
 class SpoHomeSiteRemoveCommand extends SpoCommand {
     get name() {
         return commands.HOMESITE_REMOVE;
     }
     get description() {
-        return 'Removes the current Home Site';
+        return 'Removes a Home Site';
     }
-    constructor() {
-        super();
-        _SpoHomeSiteRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHomeSiteRemoveCommand_instances, "m", _SpoHomeSiteRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHomeSiteRemoveCommand_instances, "m", _SpoHomeSiteRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const removeHomeSite = async () => {
             try {
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing ${args.options.url ? `'${args.options.url}' as home site` : 'the current home site'}...`);
+                }
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 const reqDigest = await spo.getRequestDigest(spoAdminUrl);
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': reqDigest.FormDigestValue
-                    },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="28" ObjectPathId="27" /><Method Name="RemoveSPHSite" Id="29" ObjectPathId="27" /></Actions><ObjectPaths><Constructor Id="27" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                const res = await request.post(requestOptions);
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    throw response.ErrorInfo.ErrorMessage;
+                if (args.options.url) {
+                    await this.removeHomeSiteByUrl(args.options.url, spoAdminUrl, logger);
+                    await logger.log(`${args.options.url} has been removed as a Home Site. It may take some time for the change to apply. Check aka.ms/homesites for details.`);
                 }
                 else {
-                    await logger.log(json[json.length - 1]);
+                    await this.warn(logger, `The current way this command works is deprecated and will change in the next major release. The '--url' option will become required.`);
+                    const requestOptions = {
+                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        headers: {
+                            'X-RequestDigest': reqDigest.FormDigestValue
+                        },
+                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="28" ObjectPathId="27" /><Method Name="RemoveSPHSite" Id="29" ObjectPathId="27" /></Actions><ObjectPaths><Constructor Id="27" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    };
+                    const res = await request.post(requestOptions);
+                    const json = JSON.parse(res);
+                    const response = json[0];
+                    if (response.ErrorInfo) {
+                        throw response.ErrorInfo.ErrorMessage;
+                    }
+                    else {
+                        await logger.log(json[json.length - 1]);
+                    }
                 }
             }
             catch (err) {
@@ -53,23 +67,29 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
             await removeHomeSite();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the Home Site?` });
+            const result = await cli.promptForConfirmation({
+                message: args.options.url
+                    ? `Are you sure you want to remove '${args.options.url}' as home site?`
+                    : `Are you sure you want to remove the current home site?`
+            });
             if (result) {
                 await removeHomeSite();
             }
         }
     }
+    async removeHomeSiteByUrl(siteUrl, spoAdminUrl, logger) {
+        const siteAdminProperties = await spo.getSiteAdminPropertiesByUrl(siteUrl, false, logger, this.verbose);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_api/SPO.Tenant/RemoveTargetedSite`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            data: {
+                siteId: siteAdminProperties.SiteId
+            }
+        };
+        await request.post(requestOptions);
+    }
 }
-_SpoHomeSiteRemoveCommand_instances = new WeakSet(), _SpoHomeSiteRemoveCommand_initTelemetry = function _SpoHomeSiteRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _SpoHomeSiteRemoveCommand_initOptions = function _SpoHomeSiteRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new SpoHomeSiteRemoveCommand();
 //# sourceMappingURL=homesite-remove.js.map