@pnp/cli-microsoft365 11.7.0-beta.bd906c5 → 11.8.0-beta.50a1b64

package/dist/m365/context/commands/option/option-list.js

@@ -1,7 +1,9 @@
 import fs from 'fs';
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import ContextCommand from '../../../base/ContextCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class ContextOptionListCommand extends ContextCommand {
     get name() {
         return commands.OPTION_LIST;
@@ -9,6 +11,9 @@ class ContextOptionListCommand extends ContextCommand {
     get description() {
         return 'List all options added to the context';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving context options...`);

package/dist/m365/entra/commands/resourcenamespace/resourcenamespace-list.js

@@ -1,6 +1,9 @@
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class EntraResourcenamespaceListCommand extends GraphCommand {
     get name() {
         return commands.RESOURCENAMESPACE_LIST;
@@ -8,6 +11,9 @@ class EntraResourcenamespaceListCommand extends GraphCommand {
     get description() {
         return 'Get a list of the RBAC resource namespaces and their properties';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['id', 'name'];
     }

package/dist/m365/external/commands/connection/connection-list.js

@@ -1,6 +1,9 @@
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class ExternalConnectionListCommand extends GraphCommand {
     get name() {
         return commands.CONNECTION_LIST;
@@ -11,6 +14,9 @@ class ExternalConnectionListCommand extends GraphCommand {
     alias() {
         return [commands.EXTERNALCONNECTION_LIST];
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['id', 'name', 'state'];
     }

package/dist/m365/outlook/commands/calendar/calendar-set.js

@@ -0,0 +1,132 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+import { calendarGroup } from '../../../../utils/calendarGroup.js';
+const calendarColors = ['auto', 'lightBlue', 'lightGreen', 'lightOrange', 'lightGray', 'lightYellow', 'lightTeal', 'lightPink', 'lightBrown', 'lightRed', 'maxColor'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i'),
+    name: z.string().optional().alias('n'),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional(),
+    calendarGroupId: z.string().optional(),
+    calendarGroupName: z.string().optional(),
+    color: z.enum(calendarColors).optional(),
+    isDefault: z.boolean().optional()
+});
+class OutlookCalendarSetCommand extends GraphCommand {
+    get name() {
+        return commands.CALENDAR_SET;
+    }
+    get description() {
+        return 'Updates a calendar for a user';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.userId && options.userName), {
+            error: 'Specify either userId or userName, but not both.'
+        })
+            .refine(options => !(options.calendarGroupId && options.calendarGroupName), {
+            error: 'Specify either calendarGroupId or calendarGroupName, but not both.'
+        })
+            .refine(options => [options.name, options.color, options.isDefault].filter(o => o !== undefined).length > 0, {
+            error: 'Specify at least one of the following options: name, color, or isDefault.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(token);
+            let requestUrl;
+            if (isAppOnlyAccessToken) {
+                if (!args.options.userId && !args.options.userName) {
+                    throw 'When running with application permissions either userId or userName is required.';
+                }
+                const userIdentifier = args.options.userId ?? args.options.userName;
+                requestUrl = this.buildRequestUrl(userIdentifier);
+            }
+            else {
+                if (args.options.userId || args.options.userName) {
+                    const currentUserId = accessToken.getUserIdFromAccessToken(token);
+                    const currentUserName = accessToken.getUserNameFromAccessToken(token);
+                    const isOtherUser = (args.options.userId && args.options.userId !== currentUserId) ||
+                        (args.options.userName && args.options.userName.toLowerCase() !== currentUserName?.toLowerCase());
+                    if (isOtherUser) {
+                        const scopes = accessToken.getScopesFromAccessToken(token);
+                        const hasSharedScope = scopes.some(s => s === 'Calendars.ReadWrite.Shared');
+                        if (!hasSharedScope) {
+                            throw 'To update calendars of other users, the Entra ID application used for authentication must have the Calendars.ReadWrite.Shared delegated permission assigned.';
+                        }
+                    }
+                    const userIdentifier = args.options.userId ?? args.options.userName;
+                    requestUrl = this.buildRequestUrl(userIdentifier);
+                }
+                else {
+                    requestUrl = this.buildRequestUrl(undefined);
+                }
+            }
+            if (this.verbose) {
+                await logger.logToStderr(`Updating calendar '${args.options.id}'...`);
+            }
+            let calendarGroupId = args.options.calendarGroupId;
+            if (args.options.calendarGroupName) {
+                const userIdForGroup = args.options.userId ?? args.options.userName ?? accessToken.getUserIdFromAccessToken(token);
+                const calendarGroupResult = await calendarGroup.getUserCalendarGroupByName(userIdForGroup, args.options.calendarGroupName, 'id');
+                calendarGroupId = calendarGroupResult.id;
+            }
+            const url = this.buildCalendarUrl(requestUrl, args.options.id, calendarGroupId);
+            const requestOptions = {
+                url,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: this.createRequestBody(args)
+            };
+            const result = await request.patch(requestOptions);
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    buildRequestUrl(userIdentifier) {
+        if (userIdentifier) {
+            return `${this.resource}/v1.0/users('${userIdentifier}')`;
+        }
+        return `${this.resource}/v1.0/me`;
+    }
+    buildCalendarUrl(baseUrl, calendarId, calendarGroupId) {
+        if (calendarGroupId) {
+            return `${baseUrl}/calendarGroups/${calendarGroupId}/calendars/${calendarId}`;
+        }
+        return `${baseUrl}/calendars/${calendarId}`;
+    }
+    createRequestBody(args) {
+        const data = {};
+        if (args.options.name !== undefined) {
+            data.name = args.options.name;
+        }
+        if (args.options.color !== undefined) {
+            data.color = args.options.color;
+        }
+        if (args.options.isDefault !== undefined) {
+            data.isDefaultCalendar = args.options.isDefault;
+        }
+        return data;
+    }
+}
+export default new OutlookCalendarSetCommand();
+//# sourceMappingURL=calendar-set.js.map

package/dist/m365/outlook/commands/calendargroup/calendargroup-get.js

@@ -0,0 +1,114 @@
+import { z } from 'zod';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
+import request from '../../../../request.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional(),
+    name: z.string().optional(),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional()
+});
+class OutlookCalendarGroupGetCommand extends GraphCommand {
+    get name() {
+        return commands.CALENDARGROUP_GET;
+    }
+    get description() {
+        return 'Retrieve information about a calendar group for a user';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => !(o.id && o.name), {
+            error: 'Specify either id or name, but not both.'
+        })
+            .refine(o => Boolean(o.id || o.name), {
+            error: 'Specify either id or name.'
+        })
+            .refine(o => !(o.userId && o.userName), {
+            error: 'Specify either userId or userName, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(token);
+            let userIdentifier = undefined;
+            if (args.options.userId || args.options.userName) {
+                userIdentifier = args.options.userId ?? args.options.userName;
+            }
+            const encodedUserIdentifier = userIdentifier
+                ? formatting.encodeQueryParameter(userIdentifier)
+                : undefined;
+            if (isAppOnlyAccessToken) {
+                if (!args.options.userId && !args.options.userName) {
+                    throw 'When running with application permissions either userId or userName is required.';
+                }
+            }
+            else {
+                if (args.options.userId || args.options.userName) {
+                    const currentUserId = accessToken.getUserIdFromAccessToken(token);
+                    const currentUserName = accessToken.getUserNameFromAccessToken(token);
+                    const isOtherUser = (args.options.userId && args.options.userId !== currentUserId) ||
+                        (args.options.userName && args.options.userName.toLowerCase() !== currentUserName?.toLowerCase());
+                    if (isOtherUser) {
+                        const scopes = accessToken.getScopesFromAccessToken(token);
+                        const hasSharedScope = scopes.some(s => s === 'Calendars.Read.Shared' || s === 'Calendars.ReadWrite.Shared');
+                        if (!hasSharedScope) {
+                            throw `To retrieve calendar groups of other users, the Entra ID application used for authentication must have either the Calendars.Read.Shared or Calendars.ReadWrite.Shared delegated permission assigned.`;
+                        }
+                    }
+                }
+            }
+            const getCalendarGroupByName = async (calendarGroupName) => {
+                const userPath = encodedUserIdentifier ? `users('${encodedUserIdentifier}')` : 'me';
+                const calendarGroups = await odata.getAllItems(`${this.resource}/v1.0/${userPath}/calendarGroups?$filter=name eq '${formatting.encodeQueryParameter(calendarGroupName)}'`);
+                if (calendarGroups.length === 0) {
+                    throw `The specified calendar group '${calendarGroupName}' does not exist.`;
+                }
+                return calendarGroups[0];
+            };
+            if (args.options.name) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving calendar group '${args.options.name}'...`);
+                }
+                const result = await getCalendarGroupByName(args.options.name);
+                await logger.log(result);
+            }
+            else {
+                const calendarGroupId = args.options.id;
+                const userPath = encodedUserIdentifier ? `users('${encodedUserIdentifier}')` : 'me';
+                const requestUrl = `${this.resource}/v1.0/${userPath}/calendarGroups/${calendarGroupId}`;
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving calendar group '${calendarGroupId}'...`);
+                }
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const result = await request.get(requestOptions);
+                await logger.log(result);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new OutlookCalendarGroupGetCommand();
+//# sourceMappingURL=calendargroup-get.js.map

package/dist/m365/outlook/commands/calendargroup/calendargroup-remove.js

@@ -0,0 +1,98 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { cli } from '../../../../cli/cli.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { calendarGroup } from '../../../../utils/calendarGroup.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional(),
+    name: z.string().optional(),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional(),
+    force: z.boolean().optional().alias('f')
+});
+class OutlookCalendarGroupRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.CALENDARGROUP_REMOVE;
+    }
+    get description() {
+        return 'Removes a calendar group';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.id || options.name, {
+            error: 'Specify either id or name.'
+        })
+            .refine(options => !(options.id && options.name), {
+            error: 'Specify either id or name, but not both.'
+        })
+            .refine(options => !(options.userId && options.userName), {
+            error: 'Specify either userId or userName, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        const removeCalendarGroup = async () => {
+            try {
+                const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+                const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(token);
+                if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
+                    throw 'When running with application permissions either userId or userName is required.';
+                }
+                let endpoint;
+                let graphUserId;
+                if (args.options.userId || args.options.userName) {
+                    graphUserId = (args.options.userId ?? args.options.userName);
+                }
+                else {
+                    graphUserId = accessToken.getUserIdFromAccessToken(token);
+                }
+                endpoint = `${this.resource}/v1.0/users('${formatting.encodeQueryParameter(graphUserId)}')`;
+                let calendarGroupId = args.options.id;
+                if (args.options.name) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving calendar group by name '${args.options.name}'...`);
+                    }
+                    const calendarGroupResult = await calendarGroup.getUserCalendarGroupByName(graphUserId, args.options.name);
+                    calendarGroupId = calendarGroupResult.id;
+                }
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing calendar group '${calendarGroupId}'...`);
+                }
+                const requestOptions = {
+                    url: `${endpoint}/calendarGroups/${calendarGroupId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeCalendarGroup();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove calendar group '${args.options.id || args.options.name}'?` });
+            if (result) {
+                await removeCalendarGroup();
+            }
+        }
+    }
+}
+export default new OutlookCalendarGroupRemoveCommand();
+//# sourceMappingURL=calendargroup-remove.js.map

package/dist/m365/outlook/commands.js

@@ -3,7 +3,10 @@ export default {
     CALENDAR_ADD: `${prefix} calendar add`,
     CALENDAR_GET: `${prefix} calendar get`,
     CALENDAR_REMOVE: `${prefix} calendar remove`,
+    CALENDAR_SET: `${prefix} calendar set`,
+    CALENDARGROUP_GET: `${prefix} calendargroup get`,
     CALENDARGROUP_LIST: `${prefix} calendargroup list`,
+    CALENDARGROUP_REMOVE: `${prefix} calendargroup remove`,
     CALENDARGROUP_SET: `${prefix} calendargroup set`,
     EVENT_CANCEL: `${prefix} event cancel`,
     EVENT_LIST: `${prefix} event list`,

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

@@ -16,11 +16,11 @@ export const workflow = {
             steps: [
                 {
                     name: "Checkout",
-                    uses: "actions/checkout@v4"
+                    uses: "actions/checkout@v6"
                 },
                 {
                     name: "Use Node.js",
-                    uses: "actions/setup-node@v4",
+                    uses: "actions/setup-node@v6",
                     with: {
                         "node-version": "${{ env.NodeVersion }}"
                     }
@@ -35,7 +35,7 @@ export const workflow = {
                 },
                 {
                     name: "CLI for Microsoft 365 Login",
-                    uses: "pnp/action-cli-login@v2.2.4",
+                    uses: "pnp/action-cli-login@v4",
                     with: {
                         "CERTIFICATE_ENCODED": "${{ secrets.CERTIFICATE_ENCODED }}",
                         "CERTIFICATE_PASSWORD": "${{ secrets.CERTIFICATE_PASSWORD }}",
@@ -45,9 +45,9 @@ export const workflow = {
                 },
                 {
                     name: "CLI for Microsoft 365 Deploy App",
-                    uses: "pnp/action-cli-deploy@v4.0.0",
+                    uses: "pnp/action-cli-deploy@v6",
                     with: {
-                        "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
+                        "APP_FILE_PATH": "sharepoint/{{ sppkgPath }}",
                         "SKIP_FEATURE_DEPLOYMENT": false,
                         "OVERWRITE": true
                     }
@@ -105,6 +105,10 @@ export const pipeline = {
             name: "PackageName",
             value: ""
         },
+        {
+            name: "SppkgPath",
+            value: ""
+        },
         {
             name: "SiteAppCatalogUrl",
             value: ""

package/dist/m365/spfx/commands/project/project-azuredevops-pipeline-add.js

@@ -34,14 +34,14 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         if (this.projectRootPath === null) {
             throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
-        const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
-        const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
-        const solutionName = JSON.parse(packageJson).name;
         if (this.debug) {
             await logger.logToStderr(`Adding Azure DevOps pipeline in the current SPFx project`);
         }
         try {
-            this.updatePipeline(solutionName, pipeline, args.options);
+            const project = { path: this.projectRootPath };
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
+            const sppkgPath = project.packageSolutionJson?.paths?.zippedPackage;
+            this.updatePipeline(sppkgPath, pipeline, args.options);
             this.savePipeline(pipeline);
         }
         catch (error) {
@@ -56,7 +56,7 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         const pipelineFile = path.join(pipelinesPath, 'deploy-spfx-solution.yml');
         fs.writeFileSync(path.resolve(pipelineFile), yaml.stringify(pipeline), 'utf-8');
     }
-    updatePipeline(solutionName, pipeline, options) {
+    updatePipeline(sppkgPath, pipeline, options) {
         if (options.name) {
             pipeline.name = options.name;
         }
@@ -93,16 +93,17 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
             }
             if (options.scope === 'sitecollection') {
                 script.script = script.script.replace(`{{deploy}}`, `m365 spo app deploy --name '$(PackageName)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)'`);
-                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/solution/$(PackageName)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)' --overwrite`);
+                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/$(SppkgPath)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)' --overwrite`);
                 this.assignPipelineVariables(pipeline, 'SiteAppCatalogUrl', options.siteUrl);
             }
             else {
                 script.script = script.script.replace(`{{deploy}}`, `m365 spo app deploy --name '$(PackageName)' --appCatalogScope 'tenant'`);
-                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/solution/$(PackageName)' --overwrite`);
+                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/$(SppkgPath)' --overwrite`);
                 pipeline.variables = pipeline.variables.filter(v => v.name !== 'SiteAppCatalogUrl');
             }
-            if (solutionName) {
-                this.assignPipelineVariables(pipeline, 'PackageName', `${solutionName}.sppkg`);
+            if (sppkgPath) {
+                this.assignPipelineVariables(pipeline, 'SppkgPath', sppkgPath);
+                this.assignPipelineVariables(pipeline, 'PackageName', path.basename(sppkgPath));
             }
             if (options.skipFeatureDeployment) {
                 script.script = script.script.replace(`m365 spo app deploy `, `m365 spo app deploy --skipFeatureDeployment `);

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

@@ -308,6 +308,8 @@ ${f.resolution}
         const packagesDepExact = [];
         const packagesDepUn = [];
         const packagesDevUn = [];
+        const packagesOverride = [];
+        const packagesOverrideRemove = [];
         findings.forEach(f => {
             packageManager.mapPackageManagerCommand({
                 command: f.resolution,
@@ -315,6 +317,8 @@ ${f.resolution}
                 packagesDepExact,
                 packagesDepUn,
                 packagesDevUn,
+                packagesOverride,
+                packagesOverrideRemove,
                 packageMgr: this.packageManager
             });
         });
@@ -323,6 +327,8 @@ ${f.resolution}
             packagesDevExact,
             packagesDepUn,
             packagesDevUn,
+            packagesOverride,
+            packagesOverrideRemove,
             packageMgr: this.packageManager
         });
         if (this.packageManager === 'npm') {

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -34,14 +34,16 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (this.projectRootPath === null) {
             throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
-        const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
-        const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
-        const solutionName = JSON.parse(packageJson).name;
-        if (this.debug) {
-            await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
-        }
         try {
-            this.updateWorkflow(solutionName, workflow, args.options);
+            const project = { path: this.projectRootPath };
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'package.json'), project, 'packageJson');
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
+            const solutionName = project.packageJson.name;
+            const sppkgPath = project.packageSolutionJson?.paths?.zippedPackage;
+            if (this.debug) {
+                await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
+            }
+            this.updateWorkflow(solutionName, sppkgPath, workflow, args.options);
             this.saveWorkflow(workflow);
         }
         catch (error) {
@@ -56,7 +58,7 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         const workflowFile = path.join(workflowPath, 'deploy-spfx-solution.yml');
         fs.writeFileSync(path.resolve(workflowFile), yaml.stringify(workflow), 'utf-8');
     }
-    updateWorkflow(solutionName, workflow, options) {
+    updateWorkflow(solutionName, sppkgPath, workflow, options) {
         workflow.name = options.name ? options.name : workflow.name.replace('{{ name }}', solutionName);
         if (options.branchName) {
             workflow.on.push.branches[0] = options.branchName;
@@ -90,9 +92,9 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             deployAction.with.SCOPE = 'sitecollection';
             deployAction.with.SITE_COLLECTION_URL = options.siteUrl;
         }
-        if (solutionName) {
+        if (sppkgPath) {
             const deployAction = this.getDeployAction(workflow);
-            deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ solutionName }}', solutionName);
+            deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ sppkgPath }}', sppkgPath);
         }
     }
     assignNodeVersion(workflow, nodeVersion) {

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

@@ -7,7 +7,7 @@ var _DependencyRule_instances, _DependencyRule_needsUpdate, _DependencyRule_getM
 import semver from 'semver';
 import { JsonRule } from '../../JsonRule.js';
 export class DependencyRule extends JsonRule {
-    constructor(packageName, packageVersion, isDevDep = false, isOptional = false, add = true) {
+    constructor(packageName, packageVersion, isDevDep = false, isOptional = false, add = true, isOverride = false) {
         super();
         _DependencyRule_instances.add(this);
         this.packageName = packageName;
@@ -15,14 +15,20 @@ export class DependencyRule extends JsonRule {
         this.isDevDep = isDevDep;
         this.isOptional = isOptional;
         this.add = add;
+        this.isOverride = isOverride;
     }
     get title() {
         return this.packageName;
     }
     get description() {
-        return `${(this.add ? 'Upgrade' : 'Remove')} SharePoint Framework ${(this.isDevDep ? 'dev ' : '')}dependency package ${this.packageName}`;
+        return `${(this.add ? 'Upgrade' : 'Remove')} SharePoint Framework ${(this.isOverride ? 'override ' : this.isDevDep ? 'dev ' : '')}dependency package ${this.packageName}`;
     }
     get resolution() {
+        if (this.isOverride) {
+            return this.add ?
+                `override overrides.${this.packageName}=${this.packageVersion}` :
+                `removeOverride overrides.${this.packageName}`;
+        }
         return this.add ?
             `${(this.isDevDep ? 'installDev' : 'install')} ${this.packageName}@${this.packageVersion}` :
             `${(this.isDevDep ? 'uninstallDev' : 'uninstall')} ${this.packageName}`;
@@ -44,10 +50,10 @@ export class DependencyRule extends JsonRule {
         if (!project.packageJson) {
             return;
         }
-        const projectDependencies = this.isDevDep ? project.packageJson.devDependencies : project.packageJson.dependencies;
+        const projectDependencies = this.isOverride ? project.packageJson.overrides : this.isDevDep ? project.packageJson.devDependencies : project.packageJson.dependencies;
         const versionEntry = projectDependencies ? projectDependencies[this.packageName] : '';
         if (this.add) {
-            let jsonProperty = this.isDevDep ? 'devDependencies' : 'dependencies';
+            let jsonProperty = this.isOverride ? 'overrides' : this.isDevDep ? 'devDependencies' : 'dependencies';
             if (versionEntry) {
                 jsonProperty += `.${this.packageName}`;
                 if (__classPrivateFieldGet(this, _DependencyRule_instances, "m", _DependencyRule_needsUpdate).call(this, this.packageVersion, versionEntry)) {
@@ -67,7 +73,7 @@ export class DependencyRule extends JsonRule {
             }
         }
         else {
-            const jsonProperty = `${(this.isDevDep ? 'devDependencies' : 'dependencies')}.${this.packageName}`;
+            const jsonProperty = `${(this.isOverride ? 'overrides' : this.isDevDep ? 'devDependencies' : 'dependencies')}.${this.packageName}`;
             if (versionEntry) {
                 const node = this.getAstNodeFromFile(project.packageJson, jsonProperty);
                 this.addFindingWithPosition(findings, node);

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

@@ -0,0 +1,10 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN027001_OVERRIDES_rushstack_heft extends DependencyRule {
+    constructor(version) {
+        super('@rushstack/heft', version, false, false, true, true);
+    }
+    get id() {
+        return 'FN027001';
+    }
+}
+//# sourceMappingURL=FN027001_OVERRIDES_rushstack_heft.js.map