@pnp/cli-microsoft365 7.2.0-beta.c7e1c03 → 7.2.0-beta.d785eb6

package/dist/cli/Cli.js

@@ -1,10 +1,11 @@
 import Configstore from 'configstore';
 import fs from 'fs';
 import minimist from 'minimist';
+import { createRequire } from 'module';
 import ora from 'ora';
 import os from 'os';
 import path from 'path';
-import { pathToFileURL } from 'url';
+import { fileURLToPath, pathToFileURL } from 'url';
 import Command, { CommandError } from '../Command.js';
 import config from '../config.js';
 import request from '../request.js';
@@ -12,10 +13,12 @@ import { settingsNames } from '../settingsNames.js';
 import { telemetry } from '../telemetry.js';
 import { app } from '../utils/app.js';
 import { formatting } from '../utils/formatting.js';
-import { fsUtil } from '../utils/fsUtil.js';
 import { md } from '../utils/md.js';
 import { validation } from '../utils/validation.js';
 import { prompt } from '../utils/prompt.js';
+import { timings } from './timings.js';
+const require = createRequire(import.meta.url);
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
 export class Cli {
     get config() {
         if (!this._config) {
@@ -34,7 +37,6 @@ export class Cli {
     }
     constructor() {
         this.commands = [];
-        this.commandsFolder = '';
         const options = {
             text: 'Running command...',
             /* c8 ignore next 1 */
@@ -48,8 +50,9 @@ export class Cli {
         }
         return Cli.instance;
     }
-    async execute(commandsFolder, rawArgs) {
-        this.commandsFolder = commandsFolder;
+    async execute(rawArgs) {
+        const start = process.hrtime.bigint();
+        this.loadAllCommandsInfo();
         // check if help for a specific command has been requested using the
         // 'm365 help xyz' format. If so, remove 'help' from the array of words
         // to use lazy loading commands but keep track of the fact that help should
@@ -59,22 +62,10 @@ export class Cli {
             showHelp = true;
             rawArgs.shift();
         }
-        // parse args to see if a command has been specified and can be loaded
-        // rather than loading all commands
+        // parse args to see if a command has been specified
         const parsedArgs = minimist(rawArgs);
-        // load commands
+        // load command
         await this.loadCommandFromArgs(parsedArgs._);
-        if (this.currentCommandName) {
-            for (let i = 0; i < this.commands.length; i++) {
-                const command = this.commands[i];
-                if (command.name === this.currentCommandName ||
-                    (command.aliases &&
-                        command.aliases.indexOf(this.currentCommandName) > -1)) {
-                    this.commandToExecute = command;
-                    break;
-                }
-            }
-        }
         if (this.commandToExecute) {
             // we have found a command to execute. Parse args again taking into
             // account short and long options, option types and whether the command
@@ -90,6 +81,8 @@ export class Cli {
             }
         }
         else {
+            // we need this to properly support displaying commands
+            // from the current group
             this.optionsFromArgs = {
                 options: parsedArgs
             };
@@ -113,26 +106,56 @@ export class Cli {
         catch (e) {
             return this.closeWithError(e, optionsWithoutShorts);
         }
+        const startProcessing = process.hrtime.bigint();
         try {
             // process options before passing them on to validation stage
             const contextCommandOptions = await this.loadOptionsFromContext(this.commandToExecute.options, optionsWithoutShorts.options.debug);
             optionsWithoutShorts.options = { ...contextCommandOptions, ...optionsWithoutShorts.options };
             await this.commandToExecute.command.processOptions(optionsWithoutShorts.options);
+            const endProcessing = process.hrtime.bigint();
+            timings.options.push(Number(endProcessing - startProcessing));
         }
         catch (e) {
+            const endProcessing = process.hrtime.bigint();
+            timings.options.push(Number(endProcessing - startProcessing));
             return this.closeWithError(e.message, optionsWithoutShorts, false);
         }
         // if output not specified, set the configured output value (if any)
         if (optionsWithoutShorts.options.output === undefined) {
             optionsWithoutShorts.options.output = this.getSettingWithDefaultValue(settingsNames.output, 'json');
         }
+        const startValidation = process.hrtime.bigint();
         const validationResult = await this.commandToExecute.command.validate(optionsWithoutShorts, this.commandToExecute);
+        const endValidation = process.hrtime.bigint();
+        timings.validation.push(Number(endValidation - startValidation));
         if (validationResult !== true) {
             return this.closeWithError(validationResult, optionsWithoutShorts, true);
         }
-        return Cli
-            .executeCommand(this.commandToExecute.command, optionsWithoutShorts)
-            .then(_ => process.exit(0), err => this.closeWithError(err, optionsWithoutShorts));
+        const end = process.hrtime.bigint();
+        timings.core.push(Number(end - start));
+        try {
+            await Cli.executeCommand(this.commandToExecute.command, optionsWithoutShorts);
+            const endTotal = process.hrtime.bigint();
+            timings.total.push(Number(endTotal - start));
+            this.printTimings(rawArgs);
+            process.exit(0);
+        }
+        catch (err) {
+            const endTotal = process.hrtime.bigint();
+            timings.total.push(Number(endTotal - start));
+            this.printTimings(rawArgs);
+            await this.closeWithError(err, optionsWithoutShorts);
+            /* c8 ignore next */
+        }
+    }
+    printTimings(rawArgs) {
+        if (rawArgs.some(arg => arg === '--debug')) {
+            Cli.error('');
+            Cli.error('Timings:');
+            Object.getOwnPropertyNames(timings).forEach(key => {
+                Cli.error(`${key}: ${timings[key].reduce((a, b) => a + b, 0) / 1e6}ms`);
+            });
+        }
     }
     static async executeCommand(command, args) {
         const logger = {
@@ -167,6 +190,7 @@ export class Cli {
         if (showSpinner && typeof global.it === 'undefined') {
             cli.spinner.start();
         }
+        const startCommand = process.hrtime.bigint();
         try {
             await command.action(logger, args);
             if (args.options.debug || args.options.verbose) {
@@ -181,6 +205,8 @@ export class Cli {
             if (cli.spinner.isSpinning) {
                 cli.spinner.stop();
             }
+            const endCommand = process.hrtime.bigint();
+            timings.command.push(Number(endCommand - startCommand));
         }
     }
     static async executeCommandWithOutput(command, args, listener) {
@@ -248,55 +274,25 @@ export class Cli {
             request.logger = currentLogger;
         }
     }
-    async loadAllCommands() {
-        const files = fsUtil.readdirR(this.commandsFolder);
-        await Promise.all(files.map(async (filePath) => {
-            const file = pathToFileURL(filePath).toString();
-            if (file.indexOf(`/commands/`) > -1 &&
-                file.indexOf(`/assets/`) < 0 &&
-                file.endsWith('.js') &&
-                !file.endsWith('.spec.js')) {
-                try {
-                    const command = await import(file);
-                    if (command.default instanceof Command) {
-                        this.loadCommand(command.default);
-                    }
-                }
-                catch (e) {
-                    this.closeWithError(e, { options: {} });
-                }
-            }
-        }));
+    loadAllCommandsInfo() {
+        this.commands = require(path.join(__dirname, '../../allCommands.json'));
     }
     /**
      * Loads command files into CLI based on the specified arguments.
      *
      * @param commandNameWords Array of words specified as args
-     */
+    */
     async loadCommandFromArgs(commandNameWords) {
-        this.currentCommandName = commandNameWords.join(' ');
         if (commandNameWords.length === 0) {
-            await this.loadAllCommands();
             return;
         }
-        const isCompletionCommand = commandNameWords.indexOf('completion') > -1;
-        if (isCompletionCommand) {
-            await this.loadAllCommands();
-            return;
-        }
-        let commandFilePath = '';
-        if (commandNameWords.length === 1) {
-            commandFilePath = path.join(this.commandsFolder, 'commands', `${commandNameWords[0]}.js`);
-        }
-        else {
-            if (commandNameWords.length === 2) {
-                commandFilePath = path.join(this.commandsFolder, commandNameWords[0], 'commands', `${commandNameWords.join('-')}.js`);
-            }
-            else {
-                commandFilePath = path.join(this.commandsFolder, commandNameWords[0], 'commands', commandNameWords[1], commandNameWords.slice(1).join('-') + '.js');
-            }
+        this.currentCommandName = commandNameWords.join(' ');
+        const commandFilePath = this.commands
+            .find(c => c.name === this.currentCommandName ||
+            c.aliases?.find(a => a === this.currentCommandName))?.file ?? '';
+        if (commandFilePath) {
+            await this.loadCommandFromFile(commandFilePath);
         }
-        await this.loadCommandFromFile(commandFilePath);
     }
     async loadOptionsFromContext(commandOptions, debug) {
         const filePath = '.m365rc.json';
@@ -339,39 +335,37 @@ export class Cli {
      * Loads command from the specified file into CLI. If can't find the file
      * or the file doesn't contain a command, loads all available commands.
      *
-     * @param commandFilePath File path of the file with command to load
+     * @param commandFilePathUrl File path of the file with command to load
      */
-    async loadCommandFromFile(commandFilePath) {
-        if (!fs.existsSync(commandFilePath)) {
-            await this.loadAllCommands();
+    async loadCommandFromFile(commandFileUrl) {
+        const commandsFolder = path.join(__dirname, '../m365');
+        const filePath = path.join(commandsFolder, commandFileUrl);
+        if (!fs.existsSync(filePath)) {
+            // reset command name
+            this.currentCommandName = undefined;
             return;
         }
         try {
-            const commandFileUrl = pathToFileURL(commandFilePath).toString();
-            const command = await import(commandFileUrl);
+            const command = await import(pathToFileURL(filePath).toString());
             if (command.default instanceof Command) {
-                this.loadCommand(command.default);
+                const commandInfo = this.commands.find(c => c.file === commandFileUrl);
+                this.commandToExecute = Cli.getCommandInfo(command.default, commandFileUrl, commandInfo?.help);
             }
-            else {
-                await this.loadAllCommands();
-            }
-        }
-        catch {
-            await this.loadAllCommands();
         }
+        catch { }
     }
-    static getCommandInfo(command) {
+    static getCommandInfo(command, filePath = '', helpFilePath = '') {
         return {
             aliases: command.alias(),
             name: command.name,
+            description: command.description,
             command: command,
             options: this.getCommandOptions(command),
-            defaultProperties: command.defaultProperties()
+            defaultProperties: command.defaultProperties(),
+            file: filePath,
+            help: helpFilePath
         };
     }
-    loadCommand(command) {
-        this.commands.push(Cli.getCommandInfo(command));
-    }
     static getCommandOptions(command) {
         const options = [];
         command.options.forEach(option => {
@@ -568,58 +562,39 @@ export class Cli {
         process.exit(exitCode);
     }
     printCommandHelp(helpMode) {
-        let helpFilePath = '';
-        let commandNameWords = [];
-        if (this.commandToExecute) {
-            commandNameWords = (this.commandToExecute.name).split(' ');
-        }
-        const pathChunks = [this.commandsFolder, '..', '..', 'docs', 'docs', 'cmd'];
-        if (commandNameWords.length === 1) {
-            pathChunks.push(`${commandNameWords[0]}.mdx`);
-        }
-        else {
-            if (commandNameWords.length === 2) {
-                pathChunks.push(commandNameWords[0], `${commandNameWords.join('-')}.mdx`);
-            }
-            else {
-                pathChunks.push(commandNameWords[0], commandNameWords[1], commandNameWords.slice(1).join('-') + '.mdx');
-            }
-        }
-        helpFilePath = path.join(...pathChunks);
+        const docsRootDir = path.join(__dirname, '..', '..', 'docs');
+        const helpFilePath = path.join(docsRootDir, 'docs', 'cmd', this.commandToExecute.help);
         if (fs.existsSync(helpFilePath)) {
             let helpContents = fs.readFileSync(helpFilePath, 'utf8');
             helpContents = this.getHelpSection(helpMode, helpContents);
-            helpContents = md.md2plain(helpContents, path.join(this.commandsFolder, '..', '..', 'docs'));
+            helpContents = md.md2plain(helpContents, docsRootDir);
             Cli.log();
             Cli.log(helpContents);
         }
     }
     async getHelpMode(options) {
-        const h = options.h;
-        const help = options.help;
+        const { h, help } = options;
+        if (!h && !help) {
+            return this.getSettingWithDefaultValue(settingsNames.helpMode, Cli.defaultHelpMode);
+        }
         // user passed -h or --help, let's see if they passed a specific mode
         // or requested the default
-        if (h || help) {
-            const helpMode = h ?? help;
-            if (typeof helpMode === 'boolean' || typeof helpMode !== 'string') {
-                // requested default mode or passed a number, let's use default
-                return this.getSettingWithDefaultValue(settingsNames.helpMode, Cli.defaultHelpMode);
+        const helpMode = h ?? help;
+        if (typeof helpMode === 'boolean' || typeof helpMode !== 'string') {
+            // requested default mode or passed a number, let's use default
+            return this.getSettingWithDefaultValue(settingsNames.helpMode, Cli.defaultHelpMode);
+        }
+        else {
+            const lowerCaseHelpMode = helpMode.toLowerCase();
+            if (Cli.helpModes.indexOf(lowerCaseHelpMode) < 0) {
+                await Cli.getInstance().closeWithError(`Unknown help mode ${helpMode}. Allowed values are ${Cli.helpModes.join(', ')}`, { options }, false);
+                /* c8 ignore next 2 */
+                return ''; // noop
             }
             else {
-                const lowerCaseHelpMode = helpMode.toLowerCase();
-                if (Cli.helpModes.indexOf(lowerCaseHelpMode) < 0) {
-                    await Cli.getInstance().closeWithError(`Unknown help mode ${helpMode}. Allowed values are ${Cli.helpModes.join(', ')}`, { options }, false);
-                    /* c8 ignore next 2 */
-                    return ''; // noop
-                }
-                else {
-                    return lowerCaseHelpMode;
-                }
+                return lowerCaseHelpMode;
             }
         }
-        else {
-            return this.getSettingWithDefaultValue(settingsNames.helpMode, Cli.defaultHelpMode);
-        }
     }
     getHelpSection(helpMode, helpContents) {
         if (helpMode === 'full') {
@@ -709,7 +684,7 @@ export class Cli {
             Cli.log();
             const sortedCommandNamesToPrint = Object.getOwnPropertyNames(commandsToPrint).sort();
             sortedCommandNamesToPrint.forEach(commandName => {
-                Cli.log(`  ${`${commandName} [options]`.padEnd(maxLength, ' ')}  ${commandsToPrint[commandName].command.description}`);
+                Cli.log(`  ${`${commandName} [options]`.padEnd(maxLength, ' ')}  ${commandsToPrint[commandName].description}`);
             });
         }
         const namesOfCommandGroupsToPrint = Object.keys(commandGroupsToPrint);

package/dist/cli/timings.js

@@ -0,0 +1,9 @@
+export const timings = {
+    api: [],
+    core: [],
+    command: [],
+    options: [],
+    total: [],
+    validation: []
+};
+//# sourceMappingURL=timings.js.map

package/dist/index.js

@@ -1,11 +1,7 @@
 #!/usr/bin/env node
-import fs from 'fs';
-import path from 'path';
-import url from 'url';
 import { Cli } from './cli/Cli.js';
 import { telemetry } from './telemetry.js';
 import { app } from './utils/app.js';
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 // required to make console.log() in combination with piped output synchronous
 // on Windows/in PowerShell so that the output is not trimmed by calling
 // process.exit() after executing the command, while the output is still
@@ -18,14 +14,12 @@ if (!process.env.CLIMICROSOFT365_NOUPDATE) {
         updateNotifier.default({ pkg: app.packageJson() }).notify({ defer: false });
     });
 }
-fs.realpath(__dirname, async (err, resolvedPath) => {
-    try {
-        const cli = Cli.getInstance();
-        await cli.execute(path.join(resolvedPath, 'm365'), process.argv.slice(2));
-    }
-    catch (e) {
-        telemetry.trackException(e);
-        process.exit(1);
-    }
-});
+try {
+    const cli = Cli.getInstance();
+    cli.execute(process.argv.slice(2));
+}
+catch (e) {
+    telemetry.trackException(e);
+    process.exit(1);
+}
 //# sourceMappingURL=index.js.map

package/dist/m365/flow/commands/environment/environment-list.js

@@ -17,10 +17,12 @@ class FlowEnvironmentListCommand extends AzmgmtCommand {
         }
         try {
             const res = await odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
-            if (args.options.output !== 'json' && res.length > 0) {
-                res.forEach(e => {
-                    e.displayName = e.properties.displayName;
-                });
+            if (res.length > 0) {
+                if (args.options.output !== 'json') {
+                    res.forEach(e => {
+                        e.displayName = e.properties.displayName;
+                    });
+                }
                 await logger.log(res);
             }
         }

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -16,10 +16,10 @@ export const workflow = {
                     uses: "actions/checkout@v3.5.3"
                 },
                 {
-                    name: "Use Node.js 16.x",
+                    name: "Use Node.js",
                     uses: "actions/setup-node@v3.7.0",
                     with: {
-                        "node-version": "16.x"
+                        "node-version": "18.x"
                     }
                 },
                 {
@@ -32,7 +32,7 @@ export const workflow = {
                 },
                 {
                     name: "CLI for Microsoft 365 Login",
-                    uses: "pnp/action-cli-login@v2.2.2",
+                    uses: "pnp/action-cli-login@v2.2.4",
                     with: {
                         "CERTIFICATE_ENCODED": "${{ secrets.CERTIFICATE_ENCODED }}",
                         "CERTIFICATE_PASSWORD": "${{ secrets.CERTIFICATE_PASSWORD }}",
@@ -41,7 +41,7 @@ export const workflow = {
                 },
                 {
                     name: "CLI for Microsoft 365 Deploy App",
-                    uses: "pnp/action-cli-deploy@v3.0.1",
+                    uses: "pnp/action-cli-deploy@v4.0.0",
                     with: {
                         "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
                         "SKIP_FEATURE_DEPLOYMENT": false,

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.18.1-rc.0.js → doctor-1.18.1.js}

@@ -18,4 +18,4 @@ export default [
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7'])
 ];
-//# sourceMappingURL=doctor-1.18.1-rc.0.js.map
+//# sourceMappingURL=doctor-1.18.1.js.map

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

@@ -68,7 +68,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.17.3',
             '1.17.4',
             '1.18.0',
-            '1.18.1-rc.0'
+            '1.18.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-github-workflow-add.js

@@ -63,6 +63,19 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             // eslint-disable-next-line camelcase
             workflow.on.workflow_dispatch = null;
         }
+        const version = this.getProjectVersion();
+        if (!version) {
+            throw `Unable to determine the version of the current SharePoint Framework project`;
+        }
+        const match = version.match(/^(\d+)\.(\d+)\.(\d+)$/);
+        const minorVersionString = match ? match[2] : null;
+        const minorVersion = minorVersionString ? Number(minorVersionString) : null;
+        if (minorVersion === null || isNaN(minorVersion)) {
+            throw `Unable to determine the minor version of the current SharePoint Framework project`;
+        }
+        if (minorVersion < 18) {
+            this.getNodeAction(workflow).with['node-version'] = '16.x';
+        }
         if (options.skipFeatureDeployment) {
             this.getDeployAction(workflow).with.SKIP_FEATURE_DEPLOYMENT = true;
         }
@@ -94,6 +107,10 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         const steps = this.getWorkFlowSteps(workflow);
         return steps.find(step => step.uses && step.uses.indexOf('action-cli-deploy') >= 0);
     }
+    getNodeAction(workflow) {
+        const steps = this.getWorkFlowSteps(workflow);
+        return steps.find(step => step.uses && step.uses.indexOf('actions/setup-node@') >= 0);
+    }
     getWorkFlowSteps(workflow) {
         return workflow.jobs['build-and-deploy'].steps;
     }

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

@@ -26,32 +26,32 @@ import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_D
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN014010_CODE_settings_filesexclude_jest } from './rules/FN014010_CODE_settings_filesexclude_jest.js';
 export default [
-    new FN001001_DEP_microsoft_sp_core_library('1.18.1-rc.0'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.1-rc.0'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.1-rc.0'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.18.1-rc.0'),
-    new FN001011_DEP_microsoft_sp_dialog('1.18.1-rc.0'),
-    new FN001012_DEP_microsoft_sp_application_base('1.18.1-rc.0'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.1-rc.0'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.18.1-rc.0'),
+    new FN001001_DEP_microsoft_sp_core_library('1.18.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.18.1'),
+    new FN001011_DEP_microsoft_sp_dialog('1.18.1'),
+    new FN001012_DEP_microsoft_sp_application_base('1.18.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.1'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.18.1'),
     new FN001022_DEP_office_ui_fabric_react('', false),
-    new FN001023_DEP_microsoft_sp_component_base('1.18.1-rc.0'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.18.1-rc.0'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.1-rc.0'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.18.1-rc.0'),
-    new FN001027_DEP_microsoft_sp_http('1.18.1-rc.0'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.18.1-rc.0'),
-    new FN001029_DEP_microsoft_sp_loader('1.18.1-rc.0'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.1-rc.0'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.18.1-rc.0'),
-    new FN001032_DEP_microsoft_sp_page_context('1.18.1-rc.0'),
-    new FN001013_DEP_microsoft_decorators('1.18.1-rc.0'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.1-rc.0'),
-    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.1-rc.0'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.1-rc.0'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.1-rc.0'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.1-rc.0'),
-    new FN010001_YORC_version('1.18.1-rc.0'),
+    new FN001023_DEP_microsoft_sp_component_base('1.18.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.18.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.1'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.18.1'),
+    new FN001027_DEP_microsoft_sp_http('1.18.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.18.1'),
+    new FN001029_DEP_microsoft_sp_loader('1.18.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.1'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.18.1'),
+    new FN001032_DEP_microsoft_sp_page_context('1.18.1'),
+    new FN001013_DEP_microsoft_decorators('1.18.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.1'),
+    new FN010001_YORC_version('1.18.1'),
     new FN014010_CODE_settings_filesexclude_jest()
 ];
-//# sourceMappingURL=upgrade-1.18.1-rc.0.js.map
+//# sourceMappingURL=upgrade-1.18.1.js.map

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

@@ -7,8 +7,6 @@ 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';
@@ -72,7 +70,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.17.3',
             '1.17.4',
             '1.18.0',
-            '1.18.1-rc.0'
+            '1.18.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -85,15 +83,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) {
@@ -480,9 +478,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

@@ -539,7 +539,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.18.1-rc.0': {
+            '1.18.1': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'