@pnp/cli-microsoft365 7.0.0-beta.31d0077 → 7.0.0-beta.602a03f

package/dist/m365/pp/commands/solution/solution-remove.js

@@ -42,7 +42,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing solution '${args.options.id || args.options.name}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteSolution(args);
             }
             else {
@@ -64,7 +64,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
     deleteSolution(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const solutionId = yield this.getSolutionId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/solutions(${solutionId})`,
@@ -101,12 +101,12 @@ _PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_ini
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
             asAdmin: !!args.options.asAdmin,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PpSolutionRemoveCommand_initOptions = function _PpSolutionRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -114,7 +114,7 @@ _PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_ini
     }, {
         option: '--asAdmin'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PpSolutionRemoveCommand_initOptionSets = function _PpSolutionRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });

package/dist/m365/purview/commands/retentionevent/retentionevent-remove.js

@@ -36,23 +36,8 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEvent = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/security/triggers/retentionEvents/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
-            if (args.options.confirm) {
-                yield removeRetentionEvent();
+            if (args.options.force) {
+                yield this.removeRetentionEvent(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,23 +47,40 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEvent();
+                    yield this.removeRetentionEvent(args.options);
                 }
             }
         });
     }
+    removeRetentionEvent(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggers/retentionEvents/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventRemoveCommand_initTelemetry = function _PurviewRetentionEventRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PurviewRetentionEventRemoveCommand_initOptions = function _PurviewRetentionEventRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PurviewRetentionEventRemoveCommand_initValidators = function _PurviewRetentionEventRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-remove.js

@@ -36,23 +36,8 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEventType = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
-            if (args.options.confirm) {
-                yield removeRetentionEventType();
+            if (args.options.force) {
+                yield this.removeRetentionEventType(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,23 +47,40 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event type with id ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEventType();
+                    yield this.removeRetentionEventType(args.options);
                 }
             }
         });
     }
+    removeRetentionEventType(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventTypeRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventTypeRemoveCommand_initTelemetry = function _PurviewRetentionEventTypeRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PurviewRetentionEventTypeRemoveCommand_initOptions = function _PurviewRetentionEventTypeRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PurviewRetentionEventTypeRemoveCommand_initValidators = function _PurviewRetentionEventTypeRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/purview/commands/retentionlabel/retentionlabel-remove.js

@@ -36,7 +36,7 @@ class PurviewRetentionLabelRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeRetentionLabel(args);
             }
             else {
@@ -73,14 +73,14 @@ class PurviewRetentionLabelRemoveCommand extends GraphCommand_1.default {
 _PurviewRetentionLabelRemoveCommand_instances = new WeakSet(), _PurviewRetentionLabelRemoveCommand_initTelemetry = function _PurviewRetentionLabelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PurviewRetentionLabelRemoveCommand_initOptions = function _PurviewRetentionLabelRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PurviewRetentionLabelRemoveCommand_initValidators = function _PurviewRetentionLabelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -35,48 +35,31 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
     }
     getExternalConnectionId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/external/connections?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/external/connections?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
-                return Promise.reject(`The specified connection does not exist in Microsoft Search`);
+                throw `The specified connection does not exist in Microsoft Search`;
             }
-            return Promise.reject(`Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`);
+            throw `Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`;
         });
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeExternalConnection = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const externalConnectionId = yield this.getExternalConnectionId(args);
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/external/connections/${formatting_1.formatting.encodeQueryParameter(externalConnectionId)}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
-            if (args.options.confirm) {
-                yield removeExternalConnection();
+            if (args.options.force) {
+                yield this.removeExternalConnection(args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -86,22 +69,40 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
                 });
                 if (result.continue) {
-                    yield removeExternalConnection();
+                    yield this.removeExternalConnection(args);
                 }
             }
         });
     }
+    removeExternalConnection(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const externalConnectionId = yield this.getExternalConnectionId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/external/connections/${formatting_1.formatting.encodeQueryParameter(externalConnectionId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SearchExternalConnectionRemoveCommand_initOptions = function _SearchExternalConnectionRemoveCommand_initOptions() {
-    this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '--confirm' });
+    this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '-f, --force' });
 }, _SearchExternalConnectionRemoveCommand_initOptionSets = function _SearchExternalConnectionRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });
 };

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.18.0-beta.1.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001008_DEP_react_1 = require("./rules/FN001008_DEP_react");
+const FN001009_DEP_react_dom_1 = require("./rules/FN001009_DEP_react_dom");
+const FN001035_DEP_fluentui_react_1 = require("./rules/FN001035_DEP_fluentui_react");
+const FN002004_DEVDEP_gulp_1 = require("./rules/FN002004_DEVDEP_gulp");
+const FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
+const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
+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 FN002019_DEVDEP_microsoft_rush_stack_compiler_1 = require("./rules/FN002019_DEVDEP_microsoft_rush_stack_compiler");
+module.exports = [
+    new FN001008_DEP_react_1.FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('17'),
+    new FN001035_DEP_fluentui_react_1.FN001035_DEP_fluentui_react('^8.106.4'),
+    new FN002004_DEVDEP_gulp_1.FN002004_DEVDEP_gulp('4.0.2'),
+    new FN002007_DEVDEP_ajv_1.FN002007_DEVDEP_ajv('^6.12.5'),
+    new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('~1.15.2'),
+    new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler_1.FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
+];
+//# sourceMappingURL=doctor-1.18.0-beta.1.js.map

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

@@ -77,7 +77,8 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.17.1',
             '1.17.2',
             '1.17.3',
-            '1.17.4'
+            '1.17.4',
+            '1.18.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

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

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicRule = void 0;
 const fs = require("fs");
@@ -12,36 +21,32 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
         this.fileVariationSuffixes = ['.min', '.bundle', '-min', '.bundle.min'];
     }
     visit(project) {
-        if (!project.packageJson ||
-            !project.packageJson.dependencies) {
-            return Promise.resolve({ entries: [], suggestions: [] });
-        }
-        const validPackageNames = Object.getOwnPropertyNames(project.packageJson.dependencies)
-            .filter(x => this.restrictedNamespaces.map(y => x.indexOf(y) === -1).reduce((y, z) => y && z))
-            .filter(x => this.restrictedModules.indexOf(x) === -1);
-        return Promise
-            .all(validPackageNames.map((x) => this.getExternalEntryForPackage(x, project)))
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!project.packageJson || !project.packageJson.dependencies) {
+                return { entries: [], suggestions: [] };
+            }
+            const validPackageNames = Object.getOwnPropertyNames(project.packageJson.dependencies)
+                .filter(x => this.restrictedNamespaces.map(y => x.indexOf(y) === -1).reduce((y, z) => y && z))
+                .filter(x => this.restrictedModules.indexOf(x) === -1);
+            const res = yield Promise.all(validPackageNames.map((x) => this.getExternalEntryForPackage(x, project)));
             return {
-                entries: res
-                    .filter(x => x !== undefined)
-                    .map(x => x),
+                entries: res.filter(x => x !== undefined),
                 suggestions: []
             };
         });
     }
     getExternalEntryForPackage(packageName, project) {
-        const version = project.packageJson.dependencies[packageName];
-        const filesPaths = this.getFilePath(packageName).map(x => this.cleanFilePath(x));
-        if (!version || filesPaths.length === 0) {
-            return Promise.resolve(undefined);
-        }
-        const filesPathsVariations = filesPaths
-            .map(x => this.fileVariationSuffixes.map(y => x.indexOf(y) === -1 ? x.replace('.js', `${y}.js`) : x))
-            .reduce((x, y) => [...x, ...y]);
-        const pathsAndVariations = [...filesPaths, ...filesPathsVariations];
-        return Promise.all(pathsAndVariations.map(x => this.getExternalEntryForFilePath(x, packageName, version)))
-            .then((externalizeEntryCandidates) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const version = project.packageJson.dependencies[packageName];
+            const filesPaths = this.getFilePath(packageName).map(x => this.cleanFilePath(x));
+            if (!version || filesPaths.length === 0) {
+                return undefined;
+            }
+            const filesPathsVariations = filesPaths
+                .map(x => this.fileVariationSuffixes.map(y => x.indexOf(y) === -1 ? x.replace('.js', `${y}.js`) : x))
+                .reduce((x, y) => [...x, ...y]);
+            const pathsAndVariations = [...filesPaths, ...filesPathsVariations];
+            const externalizeEntryCandidates = yield Promise.all(pathsAndVariations.map(x => this.getExternalEntryForFilePath(x, packageName, version)));
             const dExternalizeEntryCandidates = externalizeEntryCandidates.filter(x => x !== undefined);
             const minifiedModule = dExternalizeEntryCandidates.find(x => !x.globalName && this.pathContainsMinifySuffix(x.path));
             const minifiedNonModule = dExternalizeEntryCandidates.find(x => x.globalName && this.pathContainsMinifySuffix(x.path));
@@ -57,31 +62,29 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
             .filter(y => y > -1).length > 0;
     }
     getExternalEntryForFilePath(filePath, packageName, version) {
-        const url = this.getFileUrl(packageName, version, filePath);
-        return this
-            .testUrl(url)
-            .then((testResult) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = this.getFileUrl(packageName, version, filePath);
+            const testResult = yield this.testUrl(url);
             if (!testResult) {
-                return Promise.resolve(undefined);
+                return undefined;
+            }
+            const moduleInfo = yield this.getModuleType(url);
+            if (moduleInfo.scriptType === 'CommonJs') {
+                return undefined; //browsers don't support those module types without an additional library
+            }
+            else if (moduleInfo.scriptType === 'ES2015' || moduleInfo.scriptType === 'AMD') {
+                return {
+                    key: packageName,
+                    path: url
+                };
+            }
+            else { //TODO for non-module and UMD we should technically add dependencies as well
+                return {
+                    key: packageName,
+                    path: url,
+                    globalName: moduleInfo.exports && moduleInfo.exports.length > 0 ? moduleInfo.exports[0] : packageName // examples where this is not good https://unpkg.com/@pnp/polyfill-ie11@^1.0.2/dist/index.js https://unpkg.com/moment-timezone@^0.5.27/builds/moment-timezone-with-data.js
+                };
             }
-            return this.getModuleType(url).then((moduleInfo) => {
-                if (moduleInfo.scriptType === 'CommonJs') {
-                    return Promise.resolve(undefined); //browsers don't support those module types without an additional library
-                }
-                else if (moduleInfo.scriptType === 'ES2015' || moduleInfo.scriptType === 'AMD') {
-                    return {
-                        key: packageName,
-                        path: url
-                    };
-                }
-                else { //TODO for non-module and UMD we should technically add dependencies as well
-                    return {
-                        key: packageName,
-                        path: url,
-                        globalName: moduleInfo.exports && moduleInfo.exports.length > 0 ? moduleInfo.exports[0] : packageName // examples where this is not good https://unpkg.com/@pnp/polyfill-ie11@^1.0.2/dist/index.js https://unpkg.com/moment-timezone@^0.5.27/builds/moment-timezone-with-data.js
-                    };
-                }
-            });
         });
     }
     getModuleType(url) {
@@ -101,10 +104,15 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
         return `https://unpkg.com/${packageName}@${version}/${filePath}`;
     }
     testUrl(url) {
-        return request_1.default
-            .head({ url: url, headers: { 'x-anonymous': 'true' } })
-            .then(() => true)
-            .catch(() => false);
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield request_1.default.head({ url: url, headers: { 'x-anonymous': 'true' } });
+                return true;
+            }
+            catch (_a) {
+                return false;
+            }
+        });
     }
     getFilePath(packageName) {
         const packageJsonFilePath = `node_modules/${packageName}/package.json`;

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

@@ -4,8 +4,8 @@ exports.FN001022_DEP_office_ui_fabric_react = void 0;
 const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001022_DEP_office_ui_fabric_react extends DependencyRule_1.DependencyRule {
-    constructor(packageVersion) {
-        super('office-ui-fabric-react', packageVersion, false, true);
+    constructor(packageVersion, add = true) {
+        super('office-ui-fabric-react', packageVersion, false, add);
     }
     get id() {
         return 'FN001022';

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

@@ -0,0 +1,61 @@
+"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 FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1 = require("./rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base");
+const FN001035_DEP_fluentui_react_1 = require("./rules/FN001035_DEP_fluentui_react");
+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 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 FN010010_YORC_sdkVersions_teams_js_1 = require("./rules/FN010010_YORC_sdkVersions_teams_js");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.1'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('', false),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.18.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.18.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.1'),
+    new FN001035_DEP_fluentui_react_1.FN001035_DEP_fluentui_react('8.106.4'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.18.0-beta.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.18.0-beta.1'),
+    new FN010010_YORC_sdkVersions_teams_js_1.FN010010_YORC_sdkVersions_teams_js('2.12.0')
+];
+//# sourceMappingURL=upgrade-1.18.0-beta.1.js.map

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

@@ -18,6 +18,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 fsUtil_1 = require("../../../../utils/fsUtil");
 const packageManager_1 = require("../../../../utils/packageManager");
@@ -79,7 +81,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.17.1',
             '1.17.2',
             '1.17.3',
-            '1.17.4'
+            '1.17.4',
+            '1.18.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -93,15 +96,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) {
@@ -488,9 +491,9 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(this.telemetryProperties.toVersion) && !args.options.preview) {
+            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({