@pnp/cli-microsoft365 5.1.0-beta.c8f5fd7 → 5.1.0-beta.efdacec

package/.eslintrc.js

@@ -35,6 +35,7 @@ const dictionary = [
   'is',
   'issue',
   'list',
+  'management',
   'member',
   'messaging',
   'news',

package/dist/cli/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -58,6 +58,9 @@ class AadAppAddCommand extends GraphCommand_1.default {
             if (_appInfo.secret) {
                 appInfo.secret = _appInfo.secret;
             }
+            if (_appInfo.secrets) {
+                appInfo.secrets = _appInfo.secrets;
+            }
             logger.log(appInfo);
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
@@ -111,6 +114,10 @@ class AadAppAddCommand extends GraphCommand_1.default {
         delete v2Manifest.id;
         delete v2Manifest.appId;
         delete v2Manifest.publisherDomain;
+        // extract secrets from the manifest. Store them in a separate variable
+        // and remove them from the manifest because we need to create them
+        // separately
+        const secrets = this.getSecretsFromManifest(v2Manifest);
         // Azure Portal returns v2 manifest whereas the Graph API expects a v1.6
         const graphManifest = this.transformManifest(v2Manifest);
         const updateAppRequestOptions = {
@@ -124,7 +131,26 @@ class AadAppAddCommand extends GraphCommand_1.default {
         return request_1.default
             .patch(updateAppRequestOptions)
             .then(_ => this.updatePreAuthorizedAppsFromManifest(v2Manifest, appInfo))
-            .then(_ => Promise.resolve(appInfo));
+            .then(_ => this.createSecrets(secrets, appInfo));
+    }
+    getSecretsFromManifest(manifest) {
+        if (!manifest.passwordCredentials || manifest.passwordCredentials.length === 0) {
+            return [];
+        }
+        const secrets = manifest.passwordCredentials.map((c) => {
+            const startDate = new Date(c.startDate);
+            const endDate = new Date(c.endDate);
+            const expirationDate = new Date();
+            expirationDate.setMilliseconds(endDate.valueOf() - startDate.valueOf());
+            return {
+                name: c.displayName,
+                expirationDate
+            };
+        });
+        // delete the secrets from the manifest so that we won't try to set them
+        // from the manifest
+        delete manifest.passwordCredentials;
+        return secrets;
     }
     updatePreAuthorizedAppsFromManifest(manifest, appInfo) {
         if (!manifest ||
@@ -153,6 +179,21 @@ class AadAppAddCommand extends GraphCommand_1.default {
             .patch(updateAppRequestOptions)
             .then(_ => Promise.resolve(appInfo));
     }
+    createSecrets(secrets, appInfo) {
+        if (secrets.length === 0) {
+            return Promise.resolve(appInfo);
+        }
+        return Promise
+            .all(secrets.map(secret => this.createSecret({
+            appObjectId: appInfo.id,
+            displayName: secret.name,
+            expirationDate: secret.expirationDate
+        })))
+            .then(secrets => {
+            appInfo.secrets = secrets;
+            return appInfo;
+        });
+    }
     transformManifest(v2Manifest) {
         var _a, _b, _c, _d;
         const graphManifest = JSON.parse(JSON.stringify(v2Manifest));
@@ -187,7 +228,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         unsupportedProperties.forEach(p => delete graphManifest[p]);
         graphManifest.api.acceptMappedClaims = v2Manifest.acceptMappedClaims;
         delete graphManifest.acceptMappedClaims;
-        graphManifest.publicClient = v2Manifest.allowPublicClient;
+        graphManifest.isFallbackPublicClient = v2Manifest.allowPublicClient;
         delete graphManifest.allowPublicClient;
         graphManifest.info.termsOfServiceUrl = (_a = v2Manifest.informationalUrls) === null || _a === void 0 ? void 0 : _a.termsOfService;
         graphManifest.info.supportUrl = (_b = v2Manifest.informationalUrls) === null || _b === void 0 ? void 0 : _b.support;
@@ -234,6 +275,11 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
         graphManifest.web.homePageUrl = v2Manifest.signInUrl;
         delete graphManifest.signInUrl;
+        if (graphManifest.appRoles) {
+            graphManifest.appRoles.forEach((role) => {
+                delete role.lang;
+            });
+        }
         return graphManifest;
     }
     configureUri(args, appInfo, logger) {
@@ -357,27 +403,39 @@ class AadAppAddCommand extends GraphCommand_1.default {
         if (this.verbose) {
             logger.logToStderr(`Configure Azure AD app secret...`);
         }
-        const secretExpirationDate = new Date();
-        secretExpirationDate.setFullYear(secretExpirationDate.getFullYear() + 1);
+        return this
+            .createSecret({ appObjectId: appInfo.id })
+            .then(secret => {
+            appInfo.secret = secret.value;
+            return Promise.resolve(appInfo);
+        });
+    }
+    createSecret({ appObjectId, displayName = undefined, expirationDate = undefined }) {
+        let secretExpirationDate = expirationDate;
+        if (!secretExpirationDate) {
+            secretExpirationDate = new Date();
+            secretExpirationDate.setFullYear(secretExpirationDate.getFullYear() + 1);
+        }
+        const secretName = displayName !== null && displayName !== void 0 ? displayName : 'Default';
         const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}/addPassword`,
+            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}/addPassword`,
             headers: {
                 'content-type': 'application/json'
             },
             responseType: 'json',
             data: {
                 passwordCredential: {
-                    displayName: 'Default',
+                    displayName: secretName,
                     endDateTime: secretExpirationDate.toISOString()
                 }
             }
         };
         return request_1.default
             .post(requestOptions)
-            .then((password) => {
-            appInfo.secret = password.secretText;
-            return Promise.resolve(appInfo);
-        });
+            .then((password) => Promise.resolve({
+            displayName: secretName,
+            value: password.secretText
+        }));
     }
     saveAppInfo(args, appInfo, logger) {
         if (!args.options.save) {

package/dist/m365/aad/commands/app/app-role-delete.js

@@ -56,7 +56,7 @@ class AadAppRoleDeleteCommand extends GraphCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Deleting role with ${appRoleDeleteIdentifierNameValue} from Azure AD app ${aadApp.id}...`);
             }
-            // Find the role search criteria provided by the user.     
+            // Find the role search criteria provided by the user.
             const appRoleDeleteIdentifierProperty = args.options.name ? `displayName` : (args.options.claim ? `value` : `id`);
             const appRoleDeleteIdentifierValue = args.options.name ? args.options.name : (args.options.claim ? args.options.claim : args.options.id);
             const appRoleToDelete = aadApp.appRoles.filter((role) => role[appRoleDeleteIdentifierProperty] === appRoleDeleteIdentifierValue);

package/dist/m365/base/PowerPlatformCommand.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../Command");
+class PowerPlatformCommand extends Command_1.default {
+    get resource() {
+        return 'https://api.bap.microsoft.com';
+    }
+}
+exports.default = PowerPlatformCommand;
+//# sourceMappingURL=PowerPlatformCommand.js.map

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

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpManagementAppAddCommand extends PowerPlatformCommand_1.default {
+    get name() {
+        return commands_1.default.MANAGEMENTAPP_ADD;
+    }
+    get description() {
+        return 'Register management application for Power Platform';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.appId = typeof args.options.appId !== 'undefined';
+        telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
+        telemetryProps.name = typeof args.options.name !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getAppId(args)
+            .then((appId) => {
+            const requestOptions = {
+                // This should be refactored once we implement a PowerPlatform base class as api.bap will differ between envs.
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/adminApplications/${appId}?api-version=2020-06-01`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.put(requestOptions);
+        })
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getAppId(args) {
+        if (args.options.appId) {
+            return Promise.resolve(args.options.appId);
+        }
+        const { objectId, name } = args.options;
+        const filter = objectId ?
+            `id eq '${encodeURIComponent(objectId)}'` :
+            `displayName eq '${encodeURIComponent(name)}'`;
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/myorganization/applications?$filter=${filter}&$select=appId`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get((requestOptions))
+            .then((aadApps) => {
+            if (aadApps.value.length === 0) {
+                const applicationIdentifier = objectId ? `ID ${objectId}` : `name ${name}`;
+                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+            }
+            if (aadApps.value.length === 1 && aadApps.value[0].appId) {
+                return Promise.resolve(aadApps.value[0].appId);
+            }
+            return Promise.reject(`Multiple Azure AD application registration with name ${name} found. Please disambiguate (app IDs): ${aadApps.value.map(a => a.appId).join(', ')}`);
+        });
+    }
+    options() {
+        const options = [
+            { option: '--appId [appId]' },
+            { option: '--objectId [objectId]' },
+            { option: '--name [name]' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!args.options.appId &&
+            !args.options.objectId &&
+            !args.options.name) {
+            return 'Specify either appId, objectId, or name';
+        }
+        if ((args.options.appId && args.options.objectId) ||
+            (args.options.appId && args.options.name) ||
+            (args.options.objectId && args.options.name)) {
+            return 'Specify either appId, objectId, or name but not both';
+        }
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
+            return `${args.options.objectId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new PpManagementAppAddCommand();
+//# sourceMappingURL=managementapp-add.js.map

package/dist/m365/pp/commands.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const prefix = 'pp';
+exports.default = {
+    MANAGEMENTAPP_ADD: `${prefix} managementapp add`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/project/model/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/m365/spfx/commands/project/project-externalize/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN001033_DEP_tslib = void 0;
+const DependencyRule_1 = require("./DependencyRule");
+class FN001033_DEP_tslib extends DependencyRule_1.DependencyRule {
+    constructor(packageVersion) {
+        super('tslib', packageVersion, false, false);
+    }
+    get id() {
+        return 'FN001033';
+    }
+}
+exports.FN001033_DEP_tslib = FN001033_DEP_tslib;
+//# sourceMappingURL=FN001033_DEP_tslib.js.map

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

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN023002_GITIGNORE_heft = void 0;
+const Rule_1 = require("./Rule");
+class FN023002_GITIGNORE_heft extends Rule_1.Rule {
+    constructor() {
+        super();
+    }
+    get id() {
+        return 'FN023002';
+    }
+    get title() {
+        return `.gitignore '.heft' folder`;
+    }
+    get description() {
+        return `To .gitignore add the '.heft' folder`;
+    }
+    get resolution() {
+        return `.heft`;
+    }
+    get resolutionType() {
+        return 'text';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './.gitignore';
+    }
+    visit(project, findings) {
+        if (!project.gitignore) {
+            return;
+        }
+        if (!/^\.heft$/m.test(project.gitignore.source)) {
+            this.addFinding(findings);
+        }
+    }
+}
+exports.FN023002_GITIGNORE_heft = FN023002_GITIGNORE_heft;
+//# sourceMappingURL=FN023002_GITIGNORE_heft.js.map

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_microsoft_sp_core_library");
+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 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");
+const FN001014_DEP_microsoft_sp_listview_extensibility_1 = require("./rules/FN001014_DEP_microsoft_sp_listview_extensibility");
+const FN001021_DEP_microsoft_sp_property_pane_1 = require("./rules/FN001021_DEP_microsoft_sp_property_pane");
+const FN001022_DEP_office_ui_fabric_react_1 = require("./rules/FN001022_DEP_office_ui_fabric_react");
+const FN001023_DEP_microsoft_sp_component_base_1 = require("./rules/FN001023_DEP_microsoft_sp_component_base");
+const FN001024_DEP_microsoft_sp_diagnostics_1 = require("./rules/FN001024_DEP_microsoft_sp_diagnostics");
+const FN001025_DEP_microsoft_sp_dynamic_data_1 = require("./rules/FN001025_DEP_microsoft_sp_dynamic_data");
+const FN001026_DEP_microsoft_sp_extension_base_1 = require("./rules/FN001026_DEP_microsoft_sp_extension_base");
+const FN001027_DEP_microsoft_sp_http_1 = require("./rules/FN001027_DEP_microsoft_sp_http");
+const FN001028_DEP_microsoft_sp_list_subscription_1 = require("./rules/FN001028_DEP_microsoft_sp_list_subscription");
+const FN001029_DEP_microsoft_sp_loader_1 = require("./rules/FN001029_DEP_microsoft_sp_loader");
+const FN001030_DEP_microsoft_sp_module_interfaces_1 = require("./rules/FN001030_DEP_microsoft_sp_module_interfaces");
+const FN001031_DEP_microsoft_sp_odata_types_1 = require("./rules/FN001031_DEP_microsoft_sp_odata_types");
+const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_microsoft_sp_page_context");
+const FN001033_DEP_tslib_1 = require("./rules/FN001033_DEP_tslib");
+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 FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
+const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
+const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
+const FN006004_CFG_PS_developer_1 = require("./rules/FN006004_CFG_PS_developer");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+const FN023002_GITIGNORE_heft_1 = require("./rules/FN023002_GITIGNORE_heft");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.15.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.15.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.15.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.15.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.15.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.15.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.15.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.15.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.15.0-beta.1'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.181.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.15.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.15.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.15.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.15.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.15.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.15.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.15.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.15.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.15.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.15.0-beta.1'),
+    new FN001033_DEP_tslib_1.FN001033_DEP_tslib('1.13.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.15.0-beta.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.15.0-beta.1'),
+    new FN002007_DEVDEP_ajv_1.FN002007_DEVDEP_ajv('6.12.5'),
+    new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('1.15.0-beta.1'),
+    new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('1.15.2'),
+    new FN006004_CFG_PS_developer_1.FN006004_CFG_PS_developer('1.15.0-beta.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.15.0-beta.1'),
+    new FN023002_GITIGNORE_heft_1.FN023002_GITIGNORE_heft()
+];
+//# sourceMappingURL=upgrade-1.15.0-beta.1.js.map

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+// uncomment to support upgrading to preview releases
+const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
@@ -43,7 +45,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.12.1',
             '1.13.0',
             '1.13.1',
-            '1.14.0'
+            '1.14.0',
+            '1.15.0-beta.1'
         ];
     }
     get name() {
@@ -56,9 +59,9 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.toVersion = args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (prerelease(telemetryProps.toVersion) && !args.options.preview) {
-        //   telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(telemetryProps.toVersion) && !args.options.preview) {
+            telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         telemetryProps.packageManager = args.options.packageManager || 'npm';
         telemetryProps.shell = args.options.shell || 'bash';
         telemetryProps.preview = args.options.preview;
@@ -72,15 +75,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         }
         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 &&
+            (0, semver_1.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) {
@@ -501,11 +504,11 @@ ${f.resolution}
             },
             {
                 option: '--packageManager [packageManager]',
-                autocomplete: ['npm', 'pnpm', 'yarn']
+                autocomplete: SpfxProjectUpgradeCommand.packageManagers
             },
             {
                 option: '--shell [shell]',
-                autocomplete: ['bash', 'powershell', 'cmd']
+                autocomplete: SpfxProjectUpgradeCommand.shells
             },
             {
                 option: '--preview'
@@ -521,18 +524,20 @@ ${f.resolution}
     }
     validate(args) {
         if (args.options.packageManager) {
-            if (['npm', 'pnpm', 'yarn'].indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are npm, pnpm and yarn`;
+            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 (args.options.shell) {
-            if (['bash', 'powershell', 'logger'].indexOf(args.options.shell) < 0) {
-                return `${args.options.shell} is not a supported shell. Supported shells are bash, powershell and cmd`;
+            if (SpfxProjectUpgradeCommand.shells.indexOf(args.options.shell) < 0) {
+                return `${args.options.shell} is not a supported shell. Supported shells are ${SpfxProjectUpgradeCommand.shells.join(', ')}`;
             }
         }
         return true;
     }
 }
+SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
+SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
 SpfxProjectUpgradeCommand.packageCommands = {
     npm: {
         install: 'npm i -SE',

package/dist/m365/spo/commands/site/site-recyclebinitem-restore.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteRecycleBinItemRestoreCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_RECYCLEBINITEM_RESTORE;
+    }
+    get description() {
+        return 'Restores given items from the site recycle bin';
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Restoring items from recycle bin at ${args.options.siteUrl}...`);
+        }
+        const requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin/RestoreByIds`;
+        const ids = utils_1.formatting.splitAndTrim(args.options.ids);
+        const idsChunks = [];
+        while (ids.length) {
+            idsChunks.push(ids.splice(0, 20));
+        }
+        Promise.all(idsChunks.map((idsChunk) => {
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    ids: idsChunk
+                }
+            };
+            return request_1.default.post(requestOptions);
+        })).then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --siteUrl <siteUrl>'
+            },
+            {
+                option: '-i, --ids <ids>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        const invalidIds = utils_1.formatting
+            .splitAndTrim(args.options.ids)
+            .filter(id => !utils_1.validation.isValidGuid(id));
+        if (invalidIds.length > 0) {
+            return `The following IDs are invalid: ${invalidIds.join(', ')}`;
+        }
+        return true;
+    }
+}
+module.exports = new SpoSiteRecycleBinItemRestoreCommand();
+//# sourceMappingURL=site-recyclebinitem-restore.js.map

package/dist/m365/spo/commands.js

@@ -185,6 +185,7 @@ exports.default = {
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
+    SITE_RECYCLEBINITEM_RESTORE: `${prefix} site recyclebinitem restore`,
     SITE_REMOVE: `${prefix} site remove`,
     SITE_RENAME: `${prefix} site rename`,
     SITE_SET: `${prefix} site set`,