@pnp/cli-microsoft365 11.7.0-beta.71e4ac5 → 11.7.0-beta.837cfea

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

@@ -76,7 +76,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.21.1',
             '1.22.0',
             '1.22.1',
-            '1.22.2'
+            '1.22.2',
+            '1.23.0-rc.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-github-workflow-add.js

@@ -13,6 +13,8 @@ import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { workflow } from './DeployWorkflow.js';
 import { BaseProjectCommand } from './base-project-command.js';
+import { versions } from '../SpfxCompatibilityMatrix.js';
+import { spfx } from '../../../../utils/spfx.js';
 class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_GITHUB_WORKFLOW_ADD;
@@ -43,7 +45,7 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             this.saveWorkflow(workflow);
         }
         catch (error) {
-            throw new CommandError(error);
+            this.handleError(error);
         }
     }
     saveWorkflow(workflow) {
@@ -59,6 +61,16 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (options.branchName) {
             workflow.on.push.branches[0] = options.branchName;
         }
+        const version = this.getProjectVersion();
+        if (!version) {
+            throw 'Unable to determine the version of the current SharePoint Framework project. Could not find the correct version based on the version property in the .yo-rc.json file.';
+        }
+        const versionRequirements = versions[version];
+        if (!versionRequirements) {
+            throw `Could not find Node version for version '${version}' of SharePoint Framework.`;
+        }
+        const nodeVersion = spfx.getHighestNodeVersion(versionRequirements.node.range);
+        this.assignNodeVersion(workflow, nodeVersion);
         if (options.manuallyTrigger) {
             // eslint-disable-next-line camelcase
             workflow.on.workflow_dispatch = null;
@@ -83,6 +95,9 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ solutionName }}', solutionName);
         }
     }
+    assignNodeVersion(workflow, nodeVersion) {
+        workflow.jobs['build-and-deploy'].env.NodeVersion = nodeVersion;
+    }
     getLoginAction(workflow) {
         const steps = this.getWorkFlowSteps(workflow);
         return steps.find(step => step.uses && step.uses.indexOf('action-cli-login') >= 0);

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

@@ -1,7 +1,7 @@
 import { DependencyRule } from "./DependencyRule.js";
 export class FN002021_DEVDEP_rushstack_eslint_config extends DependencyRule {
-    constructor(packageVersion) {
-        super('@rushstack/eslint-config', packageVersion, true);
+    constructor(packageVersion, add = true) {
+        super('@rushstack/eslint-config', packageVersion, true, false, add);
     }
     get id() {
         return 'FN002021';

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

@@ -1,7 +1,7 @@
 import { DependencyRule } from "./DependencyRule.js";
 export class FN002032_DEVDEP_typescript_eslint_parser extends DependencyRule {
-    constructor(packageVersion) {
-        super('@typescript-eslint/parser', packageVersion, true);
+    constructor(packageVersion, add = true) {
+        super('@typescript-eslint/parser', packageVersion, true, false, add);
     }
     get id() {
         return 'FN002032';

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

@@ -8,7 +8,7 @@ export class FN015008_FILE_eslintrc_js extends FileAddRemoveRule {
         return 'FN015008';
     }
     visit(project, notifications) {
-        if (spfx.isReactProject(project)) {
+        if (spfx.isReactProject(project) && this.contents) {
             this.contents = this.contents.replace('@microsoft/eslint-config-spfx/lib/profiles/default', '@microsoft/eslint-config-spfx/lib/profiles/react');
         }
         super.visit(project, notifications);

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

@@ -0,0 +1,10 @@
+import { FileAddRemoveRule } from "./FileAddRemoveRule.js";
+export class FN015016_FILE_eslint_config_js extends FileAddRemoveRule {
+    constructor(add, contents) {
+        super('./eslint.config.js', add, contents);
+    }
+    get id() {
+        return 'FN015016';
+    }
+}
+//# sourceMappingURL=FN015016_FILE_eslint_config_js.js.map

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

@@ -0,0 +1,84 @@
+import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
+import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
+import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
+import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
+import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
+import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
+import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
+import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
+import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
+import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
+import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
+import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
+import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
+import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
+import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
+import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
+import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
+import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
+import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
+import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.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 { FN002025_DEVDEP_eslint_plugin_react_hooks } from './rules/FN002025_DEVDEP_eslint_plugin_react_hooks.js';
+import { FN002030_DEVDEP_microsoft_spfx_web_build_rig } from './rules/FN002030_DEVDEP_microsoft_spfx_web_build_rig.js';
+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 { 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 { FN021009_PKG_overrides_rushstack_heft } from './rules/FN021009_PKG_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 FN021009_PKG_overrides_rushstack_heft('1.2.7'),
+    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');
+
+module.exports = [
+  ...spfxProfile,
+  {
+    files: ['**/*.ts', '**/*.tsx'],
+    languageOptions: {
+      parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: './tsconfig.json'
+      }
+    }
+  }
+];`),
+    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)
+];
+//# sourceMappingURL=upgrade-1.23.0-rc.0.js.map

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

@@ -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 { z } from 'zod';
 import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
@@ -85,7 +85,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.21.1',
             '1.22.0',
             '1.22.1',
-            '1.22.2'
+            '1.22.2',
+            '1.23.0-rc.0'
         ];
     }
     async commandAction(logger, args) {
@@ -95,15 +96,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 || 'powershell';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {