Adds support for SPFx v1.20.0. Closes #6391

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

@@ -35,7 +35,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.19.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.20.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.
 

src/m365/spfx/commands/project/project-doctor.spec.ts

@@ -576,8 +576,8 @@ describe(commands.PROJECT_DOCTOR, () => {
     assert.strictEqual(findings.length, 0);
   });
 
-  it('e2e: shows correct number of findings for a valid 1.20.0-rc.1 project', async () => {
-    sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1200-rc1-webpart-react'));
+  it('e2e: shows correct number of findings for a valid 1.20.0 project', async () => {
+    sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1200-webpart-react'));
 
     await command.action(logger, { options: {} } as any);
     const findings: FindingToReport[] = log[0];

src/m365/spfx/commands/project/project-doctor.ts

@@ -75,7 +75,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
     '1.18.1',
     '1.18.2',
     '1.19.0',
-    '1.20.0-rc.1'
+    '1.20.0'
   ];
 
   protected get allowedOutputs(): string[] {

src/m365/spfx/commands/project/project-doctor/doctor-1.20.0-rc.1.ts → src/m365/spfx/commands/project/project-doctor/doctor-1.20.0.ts

@@ -1,3 +1,4 @@
+import { FN002021_DEVDEP_rushstack_eslint_config } from '../project-upgrade/rules/FN002021_DEVDEP_rushstack_eslint_config.js';
 import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
 import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
 import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
@@ -20,6 +21,7 @@ export default [
   new FN002015_DEVDEP_types_react('17'),
   new FN002016_DEVDEP_types_react_dom('17'),
   new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7']),
+  new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
   new FN021001_PKG_spfx_deps_versions_match_project_version(false),
-  new FN021013_PKG_spfx_devdeps_match_version('1.20.1')
+  new FN021013_PKG_spfx_devdeps_match_version('1.20.2')
 ];

src/m365/spfx/commands/project/project-doctor/rules/FN002021_DEVDEP_rushstack_eslint_config.ts

@@ -0,0 +1,11 @@
+import { DependencyRule } from './DependencyRule.js';
+
+export class FN002021_DEVDEP_rushstack_eslint_config extends DependencyRule {
+  constructor(supportedRange: string) {
+    super('@rushstack/eslint-config', supportedRange, true);
+  }
+
+  get id(): string {
+    return 'FN002021';
+  }
+}

src/m365/spfx/commands/project/project-upgrade.spec.ts

@@ -3305,68 +3305,68 @@ describe(commands.PROJECT_UPGRADE, () => {
   //#endregion
 
   //#region 1.19.0
-  it('e2e: shows correct number of findings for upgrading ace 1.19.0 project to 1.20.0-rc.1', async () => {
+  it('e2e: shows correct number of findings for upgrading ace 1.19.0 project to 1.20.0', async () => {
     sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1190-ace'));
 
-    await command.action(logger, { options: { toVersion: '1.20.0-rc.1', preview: true, output: 'json' } } as any);
+    await command.action(logger, { options: { toVersion: '1.20.0', preview: true, output: 'json' } } as any);
     const findings: FindingToReport[] = log[0];
-    assert.strictEqual(findings.length, 7);
+    assert.strictEqual(findings.length, 12);
   });
 
-  it('e2e: shows correct number of findings for upgrading application customizer 1.19.0 project to 1.20.0-rc.1', async () => {
+  it('e2e: shows correct number of findings for upgrading application customizer 1.19.0 project to 1.20.0', async () => {
     sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1190-applicationcustomizer'));
 
-    await command.action(logger, { options: { toVersion: '1.20.0-rc.1', preview: true, output: 'json' } } as any);
+    await command.action(logger, { options: { toVersion: '1.20.0', preview: true, output: 'json' } } as any);
     const findings: FindingToReport[] = log[0];
-    assert.strictEqual(findings.length, 9);
+    assert.strictEqual(findings.length, 14);
   });
 
-  it('e2e: shows correct number of findings for upgrading field customizer react 1.19.0 project to 1.20.0-rc.1', async () => {
+  it('e2e: shows correct number of findings for upgrading field customizer react 1.19.0 project to 1.20.0', async () => {
     sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1190-fieldcustomizer-react'));
 
-    await command.action(logger, { options: { toVersion: '1.20.0-rc.1', preview: true, output: 'json' } } as any);
+    await command.action(logger, { options: { toVersion: '1.20.0', preview: true, output: 'json' } } as any);
     const findings: FindingToReport[] = log[0];
-    assert.strictEqual(findings.length, 8);
+    assert.strictEqual(findings.length, 13);
   });
 
-  it('e2e: shows correct number of findings for upgrading form customizer react 1.19.0 project to 1.20.0-rc.1', async () => {
+  it('e2e: shows correct number of findings for upgrading form customizer react 1.19.0 project to 1.20.0', async () => {
     sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1190-formcustomizer-react'));
 
-    await command.action(logger, { options: { toVersion: '1.20.0-rc.1', preview: true, output: 'json' } } as any);
+    await command.action(logger, { options: { toVersion: '1.20.0', preview: true, output: 'json' } } as any);
     const findings: FindingToReport[] = log[0];
-    assert.strictEqual(findings.length, 10);
+    assert.strictEqual(findings.length, 15);
   });
 
-  it('e2e: shows correct number of findings for upgrading list view command set 1.19.0 project to 1.20.0-rc.1', async () => {
+  it('e2e: shows correct number of findings for upgrading list view command set 1.19.0 project to 1.20.0', async () => {
     sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1182-listviewcommandset'));
 
-    await command.action(logger, { options: { toVersion: '1.20.0-rc.1', preview: true, output: 'json' } } as any);
+    await command.action(logger, { options: { toVersion: '1.20.0', preview: true, output: 'json' } } as any);
     const findings: FindingToReport[] = log[0];
-    assert.strictEqual(findings.length, 13);
+    assert.strictEqual(findings.length, 14);
   });
 
-  it('e2e: shows correct number of findings for upgrading no framework web part 1.19.0 project to 1.20.0-rc.1', async () => {
+  it('e2e: shows correct number of findings for upgrading no framework web part 1.19.0 project to 1.20.0', async () => {
     sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1190-webpart-nolib'));
 
-    await command.action(logger, { options: { toVersion: '1.20.0-rc.1', preview: true, output: 'json' } } as any);
+    await command.action(logger, { options: { toVersion: '1.20.0', preview: true, output: 'json' } } as any);
     const findings: FindingToReport[] = log[0];
-    assert.strictEqual(findings.length, 11);
+    assert.strictEqual(findings.length, 16);
   });
 
-  it('e2e: shows correct number of findings for upgrading react web part 1.19.0 project to 1.20.0-rc.1', async () => {
+  it('e2e: shows correct number of findings for upgrading react web part 1.19.0 project to 1.20.0', async () => {
     sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1190-webpart-react'));
 
-    await command.action(logger, { options: { toVersion: '1.20.0-rc.1', preview: true, output: 'json' } } as any);
+    await command.action(logger, { options: { toVersion: '1.20.0', preview: true, output: 'json' } } as any);
     const findings: FindingToReport[] = log[0];
-    assert.strictEqual(findings.length, 11);
+    assert.strictEqual(findings.length, 16);
   });
 
-  it('e2e: shows correct number of findings for upgrading web part with optional dependencies 1.19.0 project to 1.20.0-rc.1', async () => {
+  it('e2e: shows correct number of findings for upgrading web part with optional dependencies 1.19.0 project to 1.20.0', async () => {
     sinon.stub(command as any, 'getProjectRoot').callsFake(_ => path.join(process.cwd(), 'src/m365/spfx/commands/project/test-projects/spfx-1190-webpart-optionaldeps'));
 
-    await command.action(logger, { options: { toVersion: '1.20.0-rc.1', preview: true, output: 'json' } } as any);
+    await command.action(logger, { options: { toVersion: '1.20.0', preview: true, output: 'json' } } as any);
     const findings: FindingToReport[] = log[0];
-    assert.strictEqual(findings.length, 20);
+    assert.strictEqual(findings.length, 25);
   });
   //#endregion
 

src/m365/spfx/commands/project/project-upgrade.ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 // uncomment to support upgrading to preview releases
-import { prerelease } from 'semver';
+// import { prerelease } from 'semver';
 import { Logger } from '../../../../cli/Logger.js';
 import Command, { CommandError } from '../../../../Command.js';
 import GlobalOptions from '../../../../GlobalOptions.js';
@@ -80,7 +80,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
     '1.18.1',
     '1.18.2',
     '1.19.0',
-    '1.20.0-rc.1'
+    '1.20.0'
   ];
 
   public static ERROR_NO_PROJECT_ROOT_FOLDER: number = 1;
@@ -118,9 +118,9 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         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];
+      // }
     });
   }
 
@@ -177,15 +177,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';
 

src/m365/spfx/commands/project/project-upgrade/upgrade-1.20.0-rc.1.ts → src/m365/spfx/commands/project/project-upgrade/upgrade-1.20.0.ts

@@ -20,38 +20,40 @@ import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_mic
 import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
 import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
 import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002021_DEVDEP_rushstack_eslint_config } from './rules/FN002021_DEVDEP_rushstack_eslint_config.js';
 import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
 import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
 import { FN002024_DEVDEP_eslint } from './rules/FN002024_DEVDEP_eslint.js';
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.js';
 
 export default [
-  new FN001001_DEP_microsoft_sp_core_library('1.20.0-rc.1'),
-  new FN001002_DEP_microsoft_sp_lodash_subset('1.20.0-rc.1'),
-  new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.20.0-rc.1'),
-  new FN001004_DEP_microsoft_sp_webpart_base('1.20.0-rc.1'),
-  new FN001011_DEP_microsoft_sp_dialog('1.20.0-rc.1'),
-  new FN001012_DEP_microsoft_sp_application_base('1.20.0-rc.1'),
-  new FN001014_DEP_microsoft_sp_listview_extensibility('1.20.0-rc.1'),
-  new FN001021_DEP_microsoft_sp_property_pane('1.20.0-rc.1'),
-  new FN001023_DEP_microsoft_sp_component_base('1.20.0-rc.1'),
-  new FN001024_DEP_microsoft_sp_diagnostics('1.20.0-rc.1'),
-  new FN001025_DEP_microsoft_sp_dynamic_data('1.20.0-rc.1'),
-  new FN001026_DEP_microsoft_sp_extension_base('1.20.0-rc.1'),
-  new FN001027_DEP_microsoft_sp_http('1.20.0-rc.1'),
-  new FN001028_DEP_microsoft_sp_list_subscription('1.20.0-rc.1'),
-  new FN001029_DEP_microsoft_sp_loader('1.20.0-rc.1'),
-  new FN001030_DEP_microsoft_sp_module_interfaces('1.20.0-rc.1'),
-  new FN001031_DEP_microsoft_sp_odata_types('1.20.0-rc.1'),
-  new FN001032_DEP_microsoft_sp_page_context('1.20.0-rc.1'),
-  new FN001013_DEP_microsoft_decorators('1.20.0-rc.1'),
-  new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.20.0-rc.1'),
-  new FN002001_DEVDEP_microsoft_sp_build_web('1.20.1'),
-  new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.1'),
+  new FN001001_DEP_microsoft_sp_core_library('1.20.0'),
+  new FN001002_DEP_microsoft_sp_lodash_subset('1.20.0'),
+  new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.20.0'),
+  new FN001004_DEP_microsoft_sp_webpart_base('1.20.0'),
+  new FN001011_DEP_microsoft_sp_dialog('1.20.0'),
+  new FN001012_DEP_microsoft_sp_application_base('1.20.0'),
+  new FN001014_DEP_microsoft_sp_listview_extensibility('1.20.0'),
+  new FN001021_DEP_microsoft_sp_property_pane('1.20.0'),
+  new FN001023_DEP_microsoft_sp_component_base('1.20.0'),
+  new FN001024_DEP_microsoft_sp_diagnostics('1.20.0'),
+  new FN001025_DEP_microsoft_sp_dynamic_data('1.20.0'),
+  new FN001026_DEP_microsoft_sp_extension_base('1.20.0'),
+  new FN001027_DEP_microsoft_sp_http('1.20.0'),
+  new FN001028_DEP_microsoft_sp_list_subscription('1.20.0'),
+  new FN001029_DEP_microsoft_sp_loader('1.20.0'),
+  new FN001030_DEP_microsoft_sp_module_interfaces('1.20.0'),
+  new FN001031_DEP_microsoft_sp_odata_types('1.20.0'),
+  new FN001032_DEP_microsoft_sp_page_context('1.20.0'),
+  new FN001013_DEP_microsoft_decorators('1.20.0'),
+  new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.20.0'),
+  new FN002001_DEVDEP_microsoft_sp_build_web('1.20.2'),
+  new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.2'),
+  new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
   new FN002024_DEVDEP_eslint('8.57.0'),
-  new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.1'),
-  new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.1'),
-  new FN010001_YORC_version('1.20.0-rc.1'),
+  new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.2'),
+  new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.2'),
+  new FN010001_YORC_version('1.20.0'),
   new FN010010_YORC_sdkVersions_teams_js('2.24.0')
 ];

src/m365/spfx/commands/project/test-projects/spfx-1200-rc1-webpart-react/.yo-rc.json → src/m365/spfx/commands/project/test-projects/spfx-1200-webpart-react/.yo-rc.json

@@ -16,7 +16,7 @@
       "@microsoft/microsoft-graph-client": "3.0.2",
       "@microsoft/teams-js": "2.24.0"
     },
-    "version": "1.20.0-rc.1",
+    "version": "1.20.0",
     "libraryName": "spfx",
     "libraryId": "79067c55-84bb-4576-91f5-006afa4679c8",
     "packageManager": "npm",

src/m365/spfx/commands/project/test-projects/spfx-1200-rc1-webpart-react/README.md → src/m365/spfx/commands/project/test-projects/spfx-1200-webpart-react/README.md

@@ -8,7 +8,7 @@ Short summary on functionality and used technologies.
 
 ## Used SharePoint Framework Version
 
-![version](https://img.shields.io/badge/version-1.20.0--rc.1-yellow.svg)
+![version](https://img.shields.io/badge/version-1.20.0-green.svg)
 
 ## Applies to
 

src/m365/spfx/commands/project/test-projects/spfx-1200-rc1-webpart-react/package.json → src/m365/spfx/commands/project/test-projects/spfx-1200-webpart-react/package.json

@@ -16,19 +16,19 @@
     "react": "17.0.1",
     "react-dom": "17.0.1",
     "@fluentui/react": "^8.106.4",
-    "@microsoft/sp-core-library": "1.20.0-rc.1",
-    "@microsoft/sp-component-base": "1.20.0-rc.1",
-    "@microsoft/sp-property-pane": "1.20.0-rc.1",
-    "@microsoft/sp-webpart-base": "1.20.0-rc.1",
-    "@microsoft/sp-lodash-subset": "1.20.0-rc.1",
-    "@microsoft/sp-office-ui-fabric-core": "1.20.0-rc.1"
+    "@microsoft/sp-core-library": "1.20.0",
+    "@microsoft/sp-component-base": "1.20.0",
+    "@microsoft/sp-property-pane": "1.20.0",
+    "@microsoft/sp-webpart-base": "1.20.0",
+    "@microsoft/sp-lodash-subset": "1.20.0",
+    "@microsoft/sp-office-ui-fabric-core": "1.20.0"
   },
   "devDependencies": {
     "@microsoft/rush-stack-compiler-4.7": "0.1.0",
-    "@rushstack/eslint-config": "2.5.1",
-    "@microsoft/eslint-plugin-spfx": "1.20.1",
-    "@microsoft/eslint-config-spfx": "1.20.1",
-    "@microsoft/sp-build-web": "1.20.1",
+    "@rushstack/eslint-config": "4.0.1",
+    "@microsoft/eslint-plugin-spfx": "1.20.2",
+    "@microsoft/eslint-config-spfx": "1.20.2",
+    "@microsoft/sp-build-web": "1.20.2",
     "@types/webpack-env": "~1.15.2",
     "ajv": "^6.12.5",
     "eslint": "8.57.0",
@@ -37,6 +37,6 @@
     "@types/react": "17.0.45",
     "@types/react-dom": "17.0.17",
     "eslint-plugin-react-hooks": "4.3.0",
-    "@microsoft/sp-module-interfaces": "1.20.1"
+    "@microsoft/sp-module-interfaces": "1.20.2"
   }
 }

src/m365/spfx/commands/spfx-doctor.ts

@@ -596,7 +596,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
         fix: 'npm i -g yo@5'
       }
     },
-    '1.20.0-rc.1': {
+    '1.20.0': {
       gulpCli: {
         range: '^1 || ^2 || ^3',
         fix: 'npm i -g gulp-cli@3'