@pnp/cli-microsoft365 11.3.0-beta.c16a3a7 → 11.4.0-beta.0b6d893

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.20.0',
             '1.21.0',
             '1.21.1',
-            '1.22.0-rc.0'
+            '1.22.0',
+            '1.22.1'
         ];
     }
     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) {

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

@@ -621,7 +621,26 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@5'
                 }
             },
-            '1.22.0-rc.0': {
+            '1.22.0': {
+                heft: {
+                    range: '^1',
+                    fix: 'npm i -g @rushstack/heft@1'
+                },
+                node: {
+                    range: '>=22.14.0 < 23.0.0',
+                    fix: 'Install Node.js >=22.14.0 < 23.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4 || ^5 || ^6',
+                    fix: 'npm i -g yo@6'
+                }
+            },
+            '1.22.1': {
+                heft: {
+                    range: '^1',
+                    fix: 'npm i -g @rushstack/heft@1'
+                },
                 node: {
                     range: '>=22.14.0 < 23.0.0',
                     fix: 'Install Node.js >=22.14.0 < 23.0.0'
@@ -702,6 +721,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             await this.checkYo(prerequisites);
             await this.checkGulp();
             await this.checkGulpCli(prerequisites);
+            await this.checkHeft(prerequisites);
             await this.checkTypeScript();
             if (this.resultsObject.some(y => y.fix !== undefined)) {
                 await this.logMessage('Recommended fixes:');
@@ -831,6 +851,26 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             await this.logMessage(formatting.getStatus(CheckStatus.Failure, message));
         }
     }
+    async checkHeft(prerequisites) {
+        if (!prerequisites.heft) {
+            // heft is not required for this version of SPFx
+            return;
+        }
+        const heftVersion = await this.getPackageVersion('@rushstack/heft', PackageSearchMode.GlobalOnly, HandlePromise.Continue);
+        if (heftVersion) {
+            await this.checkStatus('@rushstack/heft', heftVersion, prerequisites.heft);
+        }
+        else {
+            const message = '@rushstack/heft not found';
+            this.resultsObject.push({
+                check: '@rushstack/heft',
+                passed: false,
+                message: message,
+                fix: prerequisites.heft.fix
+            });
+            await this.logMessage(formatting.getStatus(CheckStatus.Failure, message));
+        }
+    }
     async checkGulp() {
         const gulpVersion = await this.getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue);
         if (gulpVersion) {

package/dist/utils/stringUtil.js

@@ -0,0 +1,4 @@
+export const stringUtil = {
+    normalizeLineEndings: (str) => str?.replace(/\r\n/g, '\n')
+};
+//# sourceMappingURL=stringUtil.js.map