@pnp/cli-microsoft365 11.8.0-beta.6d1d954 → 11.8.0-beta.90f5865

package/dist/m365/spfx/commands/SpfxCompatibilityMatrix.js

@@ -624,7 +624,7 @@ export const versions = {
             fix: 'npm i -g yo@7'
         }
     },
-    '1.23.0-rc.0': {
+    '1.23.0': {
         heft: {
             range: '^1',
             fix: 'npm i -g @rushstack/heft@1'

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

@@ -16,4 +16,4 @@ export default [
     new FN002022_DEVDEP_typescript('~5.8.0'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(true)
 ];
-//# sourceMappingURL=doctor-1.23.0-rc.0.js.map
+//# sourceMappingURL=doctor-1.23.0.js.map

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

@@ -77,7 +77,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.22.0',
             '1.22.1',
             '1.22.2',
-            '1.23.0-rc.0'
+            '1.23.0'
         ];
         __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-upgrade/rules/FN002035_DEVDEP_types_heft_jest.js

@@ -1,7 +1,7 @@
 import { DependencyRule } from "./DependencyRule.js";
 export class FN002035_DEVDEP_types_heft_jest extends DependencyRule {
-    constructor(packageVersion) {
-        super('@types/heft-jest', packageVersion, true);
+    constructor(packageVersion, add = true) {
+        super('@types/heft-jest', packageVersion, true, false, add);
     }
     get id() {
         return 'FN002035';

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

@@ -0,0 +1,10 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN002036_DEVDEP_types_jest extends DependencyRule {
+    constructor(packageVersion) {
+        super('@types/jest', packageVersion, true);
+    }
+    get id() {
+        return 'FN002036';
+    }
+}
+//# sourceMappingURL=FN002036_DEVDEP_types_jest.js.map

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

@@ -6,5 +6,28 @@ export class FN027001_OVERRIDES_rushstack_heft extends DependencyRule {
     get id() {
         return 'FN027001';
     }
+    visit(project, findings) {
+        // If an override entry for the package already exists in package.json,
+        // emit an extra finding to remove the existing override first. This avoids
+        // having to use a separate remove-override rule (e.g. FN027002) in the upgrade scripts.
+        if (project.packageJson?.overrides?.[this.packageName] &&
+            project.packageJson.overrides[this.packageName] !== this.packageVersion) {
+            const node = this.getAstNodeFromFile(project.packageJson, `overrides.${this.packageName}`);
+            findings.push({
+                id: `${this.id}_REMOVE`,
+                title: this.packageName,
+                description: `Remove existing SharePoint Framework override dependency package ${this.packageName}`,
+                occurrences: [{
+                        file: this.file,
+                        resolution: `removeOverride overrides.${this.packageName}`,
+                        position: this.getPositionFromNode(node)
+                    }],
+                resolutionType: 'cmd',
+                severity: 'Required',
+                supersedes: []
+            });
+        }
+        super.visit(project, findings);
+    }
 }
 //# sourceMappingURL=FN027001_OVERRIDES_rushstack_heft.js.map

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

@@ -28,39 +28,43 @@ import { FN002030_DEVDEP_microsoft_spfx_web_build_rig } from './rules/FN002030_D
 import { FN002031_DEVDEP_rushstack_heft } from './rules/FN002031_DEVDEP_rushstack_heft.js';
 import { FN002032_DEVDEP_typescript_eslint_parser } from './rules/FN002032_DEVDEP_typescript_eslint_parser.js';
 import { FN002034_DEVDEP_microsoft_spfx_heft_plugins } from './rules/FN002034_DEVDEP_microsoft_spfx_heft_plugins.js';
+import { FN002035_DEVDEP_types_heft_jest } from './rules/FN002035_DEVDEP_types_heft_jest.js';
+import { FN002036_DEVDEP_types_jest } from './rules/FN002036_DEVDEP_types_jest.js';
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN015008_FILE_eslintrc_js } from './rules/FN015008_FILE_eslintrc_js.js';
 import { FN015016_FILE_eslint_config_js } from './rules/FN015016_FILE_eslint_config_js.js';
+import { FN022001_SCSS_remove_fabric_react } from './rules/FN022001_SCSS_remove_fabric_react.js';
+import { FN022002_SCSS_add_fabric_react } from './rules/FN022002_SCSS_add_fabric_react.js';
 import { FN027001_OVERRIDES_rushstack_heft } from './rules/FN027001_OVERRIDES_rushstack_heft.js';
 export default [
-    new FN001001_DEP_microsoft_sp_core_library('1.23.0-rc.0'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.23.0-rc.0'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.23.0-rc.0'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.23.0-rc.0'),
-    new FN001011_DEP_microsoft_sp_dialog('1.23.0-rc.0'),
-    new FN001012_DEP_microsoft_sp_application_base('1.23.0-rc.0'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.23.0-rc.0'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.23.0-rc.0'),
-    new FN001023_DEP_microsoft_sp_component_base('1.23.0-rc.0'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.23.0-rc.0'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.23.0-rc.0'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.23.0-rc.0'),
-    new FN001027_DEP_microsoft_sp_http('1.23.0-rc.0'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.23.0-rc.0'),
-    new FN001029_DEP_microsoft_sp_loader('1.23.0-rc.0'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.23.0-rc.0'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.23.0-rc.0'),
-    new FN001032_DEP_microsoft_sp_page_context('1.23.0-rc.0'),
-    new FN001013_DEP_microsoft_decorators('1.23.0-rc.0'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.23.0-rc.0'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.23.0-rc.0'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.23.0-rc.0'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.23.0-rc.0'),
-    new FN002030_DEVDEP_microsoft_spfx_web_build_rig('1.23.0-rc.0'),
-    new FN002034_DEVDEP_microsoft_spfx_heft_plugins('1.23.0-rc.0'),
-    new FN010001_YORC_version('1.23.0-rc.0'),
-    new FN002031_DEVDEP_rushstack_heft('1.2.7'),
-    new FN027001_OVERRIDES_rushstack_heft('1.2.7'),
+    new FN001001_DEP_microsoft_sp_core_library('1.23.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.23.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.23.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.23.0'),
+    new FN001011_DEP_microsoft_sp_dialog('1.23.0'),
+    new FN001012_DEP_microsoft_sp_application_base('1.23.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.23.0'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.23.0'),
+    new FN001023_DEP_microsoft_sp_component_base('1.23.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.23.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.23.0'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.23.0'),
+    new FN001027_DEP_microsoft_sp_http('1.23.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.23.0'),
+    new FN001029_DEP_microsoft_sp_loader('1.23.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.23.0'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.23.0'),
+    new FN001032_DEP_microsoft_sp_page_context('1.23.0'),
+    new FN001013_DEP_microsoft_decorators('1.23.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.23.0'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.23.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.23.0'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.23.0'),
+    new FN002030_DEVDEP_microsoft_spfx_web_build_rig('1.23.0'),
+    new FN002034_DEVDEP_microsoft_spfx_heft_plugins('1.23.0'),
+    new FN010001_YORC_version('1.23.0'),
+    new FN002031_DEVDEP_rushstack_heft('1.2.17'),
+    new FN027001_OVERRIDES_rushstack_heft('1.2.17'),
     new FN002025_DEVDEP_eslint_plugin_react_hooks('5.2.0'),
     new FN002024_DEVDEP_eslint('9.37.0'),
     new FN015016_FILE_eslint_config_js(true, `const spfxProfile = require('@microsoft/eslint-config-spfx/lib/flat-profiles/react');
@@ -79,6 +83,10 @@ module.exports = [
 ];`),
     new FN015008_FILE_eslintrc_js(false),
     new FN002021_DEVDEP_rushstack_eslint_config('4.5.2', false),
-    new FN002032_DEVDEP_typescript_eslint_parser('8.46.2', false)
+    new FN002032_DEVDEP_typescript_eslint_parser('8.46.2', false),
+    new FN002035_DEVDEP_types_heft_jest('1.0.2', false),
+    new FN002036_DEVDEP_types_jest('30.0.0'),
+    new FN022001_SCSS_remove_fabric_react('~@fluentui/react/dist/sass/References.scss'),
+    new FN022002_SCSS_add_fabric_react('pkg:@fluentui/react/dist/sass/References.scss')
 ];
-//# sourceMappingURL=upgrade-1.23.0-rc.0.js.map
+//# sourceMappingURL=upgrade-1.23.0.js.map

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

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-// uncomment to support upgrading to preview releases
-import { prerelease } from 'semver';
+// Uncomment to support upgrading to preview releases
+// import { prerelease } from 'semver';
 import { z } from 'zod';
 import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
@@ -86,7 +86,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.22.0',
             '1.22.1',
             '1.22.2',
-            '1.23.0-rc.0'
+            '1.23.0'
         ];
     }
     async commandAction(logger, args) {
@@ -95,16 +95,16 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             throw new CommandError(`Couldn't find project root folder`, SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         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];
-        }
+        // 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];
+        // }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'powershell';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {

package/dist/utils/packageManager.js

@@ -2,6 +2,7 @@ const packageCommands = {
     npm: {
         install: 'npm i -SE',
         installDev: 'npm i -DE',
+        installLockFile: 'npm i',
         uninstall: 'npm un -S',
         uninstallDev: 'npm un -D',
         override: 'npm pkg set',
@@ -10,6 +11,7 @@ const packageCommands = {
     pnpm: {
         install: 'pnpm i -E',
         installDev: 'pnpm i -DE',
+        installLockFile: 'pnpm i',
         uninstall: 'pnpm un',
         uninstallDev: 'pnpm un',
         override: 'pnpm pkg set',
@@ -56,16 +58,18 @@ export const packageManager = {
     },
     reducePackageManagerCommand({ packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn, packagesOverride, packagesOverrideRemove, packageMgr }) {
         const commandsToExecute = [];
-        // override commands must come first to ensure that install/uninstall operations
-        // use the correct package version when an override is added or removed for a
-        // package that is being updated, installed, or uninstalled
+        // removeOverride comes first to clear stale overrides before any install/uninstall
         // uninstall commands must come before install commands otherwise there is a
         // chance that whatever we recommended to install will be immediately uninstalled
+        // override (add) comes last so it is applied after all
+        // install/uninstall operations have completed
         if (packagesOverrideRemove.length > 0) {
             commandsToExecute.push(`${packageManager.getPackageManagerCommand('removeOverride', packageMgr)} ${packagesOverrideRemove.join(' ')}`);
-        }
-        if (packagesOverride.length > 0) {
-            commandsToExecute.push(`${packageManager.getPackageManagerCommand('override', packageMgr)} ${packagesOverride.join(' ')}`);
+            // removeOverride only updates package.json; run a plain install to update the lock file
+            // only needed when no other install/uninstall commands will already update the lock file
+            if (packagesDepUn.length === 0 && packagesDevUn.length === 0 && packagesDepExact.length === 0 && packagesDevExact.length === 0 && packagesOverride.length === 0) {
+                commandsToExecute.push(packageManager.getPackageManagerCommand('installLockFile', packageMgr));
+            }
         }
         if (packagesDepUn.length > 0) {
             commandsToExecute.push(`${packageManager.getPackageManagerCommand('uninstall', packageMgr)} ${packagesDepUn.join(' ')}`);
@@ -79,6 +83,11 @@ export const packageManager = {
         if (packagesDevExact.length > 0) {
             commandsToExecute.push(`${packageManager.getPackageManagerCommand('installDev', packageMgr)} ${packagesDevExact.join(' ')}`);
         }
+        if (packagesOverride.length > 0) {
+            commandsToExecute.push(`${packageManager.getPackageManagerCommand('override', packageMgr)} ${packagesOverride.join(' ')}`);
+            // override only updates package.json; run a plain install to update the lock file
+            commandsToExecute.push(packageManager.getPackageManagerCommand('installLockFile', packageMgr));
+        }
         return commandsToExecute;
     }
 };

package/docs/docs/cmd/spfx/project/project-upgrade.mdx

@@ -45,7 +45,7 @@ m365 spfx project upgrade [options]
 
 ## Remarks
 
-The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.23.0-rc.0).
+The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.23.0).
 
 This command doesn't change your project files. Instead, it gives you a report with all steps necessary to upgrade your project to the specified version of the SharePoint Framework. Changing project files is error-prone, especially when it comes to updating your solution's code. This is why at this moment, this command produces a report that you can use yourself to perform the necessary updates and verify that everything is working as expected.