@pnp/cli-microsoft365 11.1.0-beta.d3fc85d → 11.1.0-beta.dce6352

package/dist/Auth.js

@@ -122,6 +122,7 @@ export class Auth {
             this._connection = Object.assign(this._connection, connection);
         }
         catch {
+            // Do nothing
         }
     }
     async ensureAccessToken(resource, logger, debug = false, fetchNew = false) {
@@ -296,15 +297,17 @@ export class Auth {
         return new ConfidentialClientApplication(await this.getAuthClientConfiguration(logger, debug, certificateThumbprint, certificatePrivateKey, clientSecret));
     }
     retrieveAuthCodeWithBrowser(resource, logger, debug) {
-        return new Promise(async (resolve, reject) => {
+        return new Promise((resolve, reject) => {
             // _authServer is never set before hitting this line, but this check
             // is implemented so that we can support lazy loading
             // but also stub it for testing
-            /* c8 ignore next 3 */
-            if (!this._authServer) {
-                this._authServer = (await import('./AuthServer.js')).default;
-            }
-            this._authServer.initializeServer(this.connection, resource, resolve, reject, logger, debug);
+            (async () => {
+                /* c8 ignore next 3 */
+                if (!this._authServer) {
+                    this._authServer = (await import('./AuthServer.js')).default;
+                }
+                this._authServer.initializeServer(this.connection, resource, resolve, reject, logger, debug);
+            })().catch(reject);
         });
     }
     async ensureAccessTokenWithBrowser(resource, logger, debug) {
@@ -404,7 +407,7 @@ export class Auth {
                     this.connection.thumbprint = await this.calculateThumbprint(pemCert);
                 }
             }
-            catch (e) {
+            catch {
                 this.connection.certificateType = CertificateType.Binary;
             }
         }

package/dist/Command.js

@@ -243,7 +243,7 @@ class Command {
         /* c8 ignore next 4 */
         if (this.debug && typeof global.it === 'undefined') {
             const error = new Error();
-            cli.error(error.stack).then(() => { }).catch(() => { });
+            cli.error(error.stack).catch(() => undefined);
         }
         if (res.error) {
             try {
@@ -284,7 +284,7 @@ class Command {
         /* c8 ignore next 4 */
         if (this.debug && typeof global.it === 'undefined') {
             const error = new Error();
-            cli.error(error.stack).then(() => { }).catch(() => { });
+            cli.error(error.stack).catch(() => undefined);
         }
         if (response.error &&
             response.error['odata.error'] &&

package/dist/auth/msalCachePlugin.js

@@ -8,7 +8,9 @@ class MsalCachePlugin {
             const data = await this.fileTokenStorage.get();
             tokenCacheContext.tokenCache.deserialize(data);
         }
-        catch { }
+        catch {
+            // Do nothing
+        }
     }
     async afterCacheAccess(tokenCacheContext) {
         if (!tokenCacheContext.cacheHasChanged) {
@@ -17,7 +19,9 @@ class MsalCachePlugin {
         try {
             await this.fileTokenStorage.set(tokenCacheContext.tokenCache.serialize());
         }
-        catch { }
+        catch {
+            // Do nothing
+        }
     }
 }
 const msalCachePlugin = new MsalCachePlugin();

package/dist/autocomplete.js

@@ -17,7 +17,9 @@ class Autocomplete {
                 const data = fs.readFileSync(Autocomplete.autocompleteFilePath, 'utf-8');
                 this.commands = JSON.parse(data);
             }
-            catch { }
+            catch {
+                // Do nothing
+            }
         }
         this.omelette = omelette('m365_comp|m365|microsoft365');
         this.omelette.on('complete', this.handleAutocomplete.bind(this));
@@ -58,7 +60,9 @@ class Autocomplete {
                     replies = Object.keys(replies);
                 }
             }
-            catch { }
+            catch {
+                // Do nothing
+            }
         }
         if (!replies) {
             replies = [];

package/dist/chili/chili.js

@@ -97,10 +97,11 @@ async function runConversationTurn(conversationId, question) {
     ];
     const result = await prompt.forSelection({ message: 'What would you like to do next?', choices });
     switch (result) {
-        case 'ask':
+        case 'ask': {
             const prompt = await promptForPrompt();
             await runConversationTurn(conversationId, prompt);
             break;
+        }
         case 'end':
             await endConversation(conversationId);
             console.log('');

package/dist/cli/cli.js

@@ -360,7 +360,7 @@ async function loadOptionsFromContext(commandOptions, debug) {
             m365rc = JSON.parse(fileContents);
         }
     }
-    catch (e) {
+    catch {
         await cli.closeWithError(`Error parsing ${filePath}`, { options: {} });
         /* c8 ignore next */
     }
@@ -403,7 +403,9 @@ async function loadCommandFromFile(commandFileUrl) {
             cli.commandToExecute = cli.getCommandInfo(command.default, commandFileUrl, commandInfo?.help);
         }
     }
-    catch { }
+    catch {
+        // Do nothing
+    }
 }
 function getCommandInfo(command, filePath = '', helpFilePath = '') {
     const options = command.schema ? zod.schemaToOptionInfo(command.schema) : getCommandOptions(command);

package/dist/config.js

@@ -64,7 +64,6 @@ export default {
         'https://microsoft.sharepoint-df.com/User.ReadWrite.All'
     ],
     applicationName: `CLI for Microsoft 365 v${app.packageJson().version}`,
-    delimiter: 'm365\$',
     configstoreName: 'cli-m365-config',
     minimalScopes: [
         'https://graph.microsoft.com/User.Read'

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -38,7 +38,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
                     JSON.parse(options.card);
                     return true;
                 }
-                catch (e) {
+                catch {
                     return false;
                 }
             }
@@ -53,7 +53,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
                     JSON.parse(options.cardData);
                     return true;
                 }
-                catch (e) {
+                catch {
                     return false;
                 }
             }

package/dist/m365/app/commands/permission/permission-list.js

@@ -60,7 +60,7 @@ class AppPermissionListCommand extends AppCommand {
         }
         const permissionsPromises = [];
         switch (mode) {
-            case GetServicePrincipal.withPermissions:
+            case GetServicePrincipal.withPermissions: {
                 const appRoleAssignmentsRequestOptions = {
                     url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/appRoleAssignments`,
                     headers: {
@@ -80,7 +80,8 @@ class AppPermissionListCommand extends AppCommand {
                     request.get(oauth2PermissionGrantsRequestOptions)
                 ]);
                 break;
-            case GetServicePrincipal.withPermissionDefinitions:
+            }
+            case GetServicePrincipal.withPermissionDefinitions: {
                 const oauth2PermissionScopesRequestOptions = {
                     url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/oauth2PermissionScopes`,
                     headers: {
@@ -100,6 +101,7 @@ class AppPermissionListCommand extends AppCommand {
                     request.get(appRolesRequestOptions)
                 ]);
                 break;
+            }
         }
         const permissions = await Promise.all(permissionsPromises);
         switch (mode) {

package/dist/m365/booking/commands/business/business-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod.strict();
 class BookingBusinessListCommand extends GraphCommand {
     get name() {
         return commands.BUSINESS_LIST;
@@ -8,6 +10,9 @@ class BookingBusinessListCommand extends GraphCommand {
     get description() {
         return 'Lists all Microsoft Bookings businesses that are created for the tenant.';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['id', 'displayName'];
     }

package/dist/m365/commands/setup.js

@@ -90,7 +90,7 @@ class SetupCommand extends AnonymousCommand {
             };
             preferences.entraApp = await cli.promptForSelection(entraAppConfig);
             switch (preferences.entraApp) {
-                case EntraAppConfig.Create:
+                case EntraAppConfig.Create: {
                     const newEntraAppScopesConfig = {
                         message: 'What scopes should the new app registration have?',
                         choices: [
@@ -100,10 +100,12 @@ class SetupCommand extends AnonymousCommand {
                     };
                     preferences.newEntraAppScopes = await cli.promptForSelection(newEntraAppScopesConfig);
                     break;
-                case EntraAppConfig.UseExisting:
+                }
+                case EntraAppConfig.UseExisting: {
                     const existingApp = await this.configureExistingEntraApp(logger);
                     Object.assign(preferences, existingApp);
                     break;
+                }
             }
         }
         else {
@@ -318,7 +320,7 @@ class SetupCommand extends AnonymousCommand {
     }
     async configureSettings({ preferences, settings, silent, logger }) {
         switch (preferences.entraApp) {
-            case EntraAppConfig.Create:
+            case EntraAppConfig.Create: {
                 if (this.verbose) {
                     await logger.logToStderr('Creating a new Entra app...');
                 }
@@ -332,6 +334,7 @@ class SetupCommand extends AnonymousCommand {
                 cli.getConfig().delete(settingsNames.clientCertificateBase64Encoded);
                 cli.getConfig().delete(settingsNames.clientCertificatePassword);
                 break;
+            }
             case EntraAppConfig.UseExisting:
                 Object.assign(settings, {
                     clientId: preferences.clientId,

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

@@ -1,7 +1,8 @@
 import assert from 'assert';
 import auth from '../../../Auth.js';
-import Command, { CommandError } from '../../../Command.js';
+import Command, { CommandError, globalOptionsZod } from '../../../Command.js';
 import commands from '../commands.js';
+const options = globalOptionsZod.strict();
 class ConnectionListCommand extends Command {
     get name() {
         return commands.LIST;
@@ -9,6 +10,9 @@ class ConnectionListCommand extends Command {
     get description() {
         return 'Show the list of available connections';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['name', 'connectedAs', 'authType', 'active'];
     }

package/dist/m365/entra/commands/app/app-role-add.js

@@ -104,7 +104,7 @@ _a = EntraAppRoleAddCommand, _EntraAppRoleAddCommand_instances = new WeakSet(),
         if (claim.startsWith('.')) {
             return 'Claim must not begin with .';
         }
-        if (!/^[\w:!#$%&'()*+,-.\/:;<=>?@\[\]^+_`{|}~]+$/.test(claim)) {
+        if (!/^[\w:!#$%&'()*+,-./:;<=>?@[\]^+_`{|}~]+$/.test(claim)) {
             return `Claim can contain only the following characters a-z, A-Z, 0-9, :!#$%&'()*+,-./:;<=>?@[]^+_\`{|}~]+`;
         }
         return true;

package/dist/m365/entra/commands/group/group-add.js

@@ -158,7 +158,7 @@ _EntraGroupAddCommand_instances = new WeakSet(), _EntraGroupAddCommand_initOptio
         }
         if (args.options.mailNickname) {
             if (!validation.isValidMailNickname(args.options.mailNickname)) {
-                return `Value for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \ [] " ; : <> , SPACE.`;
+                return `Value for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \\ [] " ; : <> , SPACE.`;
             }
             if (args.options.mailNickname.length > 64) {
                 return `The maximum amount of characters for 'mailNickname' is 64.`;

package/dist/m365/entra/commands/group/group-set.js

@@ -207,7 +207,7 @@ _EntraGroupSetCommand_instances = new WeakSet(), _EntraGroupSetCommand_initTelem
         }
         if (args.options.mailNickname) {
             if (!validation.isValidMailNickname(args.options.mailNickname)) {
-                return `Value '${args.options.mailNickname}' for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \ [] " ; : <> , SPACE.`;
+                return `Value '${args.options.mailNickname}' for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \\ [] " ; : <> , SPACE.`;
             }
             if (args.options.mailNickname.length > 64) {
                 return `The maximum amount of characters for 'mailNickname' is 64.`;

package/dist/m365/entra/commands/m365group/m365group-add.js

@@ -134,7 +134,6 @@ class EntraM365GroupAddCommand extends GraphCommand {
         const userArr = users.split(',').map(o => o.trim());
         let promises = [];
         let userIds = [];
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         promises = userArr.map(user => {
             const requestOptions = {
                 url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,

package/dist/m365/file/commands/convert/convert-pdf.js

@@ -69,12 +69,7 @@ class FileConvertPdfCommand extends GraphCommand {
                 if (this.verbose) {
                     await logger.logToStderr(`Deleting the temporary PDF file at ${localTargetFilePath}...`);
                 }
-                try {
-                    fs.unlinkSync(localTargetFilePath);
-                }
-                catch (e) {
-                    throw e;
-                }
+                fs.unlinkSync(localTargetFilePath);
             }
             else {
                 if (this.debug) {

package/dist/m365/flow/commands/flow-export.js

@@ -73,9 +73,12 @@ class FlowExportCommand extends PowerPlatformCommand {
                 // adds suggestedCreationType property to all resources
                 // see https://github.com/pnp/cli-microsoft365/issues/1845
                 Object.keys(res.resources).forEach((key) => {
-                    res.resources[key].type === 'Microsoft.Flow/flows'
-                        ? res.resources[key].suggestedCreationType = 'Update'
-                        : res.resources[key].suggestedCreationType = 'Existing';
+                    if (res.resources[key].type === 'Microsoft.Flow/flows') {
+                        res.resources[key].suggestedCreationType = 'Update';
+                    }
+                    else {
+                        res.resources[key].suggestedCreationType = 'Existing';
+                    }
                 });
                 requestOptions.data = {
                     includedResourceIds: [
@@ -95,10 +98,10 @@ class FlowExportCommand extends PowerPlatformCommand {
                 await logger.logToStderr(`Getting file for Microsoft Flow ${args.options.name}...`);
             }
             const downloadFileUrl = formatArgument === 'json' ? '' : res.packageLink.value;
-            const filenameRegEx = /([^\/]+\.zip)/i;
+            const filenameRegEx = /([^/]+\.zip)/i;
             filenameFromApi = formatArgument === 'json' ? `${res.properties.displayName}.json` : (filenameRegEx.exec(downloadFileUrl) || ['output.zip'])[0];
             // Replace all illegal characters from the file name
-            const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+            const illegalCharsRegEx = /[\\/:*?"<>|]/g;
             filenameFromApi = filenameFromApi.replace(illegalCharsRegEx, '_');
             if (this.verbose) {
                 await logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}.`);

package/dist/m365/flow/commands/run/run-get.js

@@ -44,7 +44,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             if (args.options.withTrigger && res.properties.trigger.outputsLink) {
                 res.triggerInformation = await this.getTriggerInformation(res);
             }
-            if (!!args.options.withActions) {
+            if (args.options.withActions) {
                 res.actions = await this.getActionsInformation(res, args.options.withActions);
             }
             await logger.log(res);
@@ -64,10 +64,10 @@ class FlowRunGetCommand extends PowerAutomateCommand {
                 continue;
             }
             actionsResult[action] = res.properties.actions[action];
-            if (!!res.properties.actions[action].inputsLink?.uri) {
+            if (res.properties.actions[action].inputsLink?.uri) {
                 actionsResult[action].input = await this.requestAdditionalInformation(res.properties.actions[action].inputsLink?.uri);
             }
-            if (!!res.properties.actions[action].outputsLink?.uri) {
+            if (res.properties.actions[action].outputsLink?.uri) {
                 actionsResult[action].output = await this.requestAdditionalInformation(res.properties.actions[action].outputsLink?.uri);
             }
         }

package/dist/m365/graph/commands/schemaextension/schemaextension-set.js

@@ -88,7 +88,7 @@ class GraphSchemaExtensionSetCommand extends GraphCommand {
         try {
             properties = JSON.parse(propertiesString);
         }
-        catch (e) {
+        catch {
             return 'The specified properties is not a valid JSON string';
         }
         // If the properties object is not an array

package/dist/m365/onedrive/commands/onedrive-list.js

@@ -1,8 +1,10 @@
+import { globalOptionsZod } from '../../../Command.js';
 import config from "../../../config.js";
 import request from "../../../request.js";
 import { spo } from "../../../utils/spo.js";
 import SpoCommand from "../../base/SpoCommand.js";
 import commands from "../commands.js";
+const options = globalOptionsZod.strict();
 class OneDriveListCommand extends SpoCommand {
     get name() {
         return commands.LIST;
@@ -10,6 +12,9 @@ class OneDriveListCommand extends SpoCommand {
     get description() {
         return "Retrieves a list of OneDrive sites";
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['Title', 'Url'];
     }

package/dist/m365/outlook/commands/roomlist/roomlist-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod.strict();
 class OutlookRoomListListCommand extends GraphCommand {
     get name() {
         return commands.ROOMLIST_LIST;
@@ -8,6 +10,9 @@ class OutlookRoomListListCommand extends GraphCommand {
     get description() {
         return 'Get a collection of available roomlists';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['id', 'displayName', 'phone', 'emailAddress'];
     }

package/dist/m365/pa/commands/app/app-export.js

@@ -35,7 +35,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
             let filename = args.options.name;
             if (args.options.packageDisplayName) {
                 //Replace all illegal characters from the file name
-                const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+                const illegalCharsRegEx = /[\\/:*?"<>|]/g;
                 filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
             }
             const requestOptions = {

package/dist/m365/pa/commands/app/app-get.js

@@ -57,7 +57,7 @@ class PaAppGetCommand extends PowerAppsCommand {
                     const app = allApps.find((a) => {
                         return a.properties.displayName.toLowerCase() === `${args.options.displayName}`.toLowerCase();
                     });
-                    if (!!app) {
+                    if (app) {
                         await logger.log(this.setProperties(app));
                     }
                     else {

package/dist/m365/pa/commands/environment/environment-list.js

@@ -1,6 +1,8 @@
 import request from '../../../../request.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+const options = globalOptionsZod.strict();
 class PaEnvironmentListCommand extends PowerAppsCommand {
     get name() {
         return commands.ENVIRONMENT_LIST;
@@ -8,6 +10,9 @@ class PaEnvironmentListCommand extends PowerAppsCommand {
     get description() {
         return 'Lists Microsoft Power Apps environments in the current tenant';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['name', 'displayName'];
     }

package/dist/m365/planner/commands/tenant/tenant-settings-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import PlannerCommand from '../../../base/PlannerCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod.strict();
 class PlannerTenantSettingsListCommand extends PlannerCommand {
     get name() {
         return commands.TENANT_SETTINGS_LIST;
@@ -8,6 +10,9 @@ class PlannerTenantSettingsListCommand extends PlannerCommand {
     get description() {
         return 'Lists the Microsoft Planner configuration of the tenant';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         const requestOptions = {
             url: `${this.resource}/taskAPI/tenantAdminSettings/Settings`,

package/dist/m365/pp/commands/solution/solution-publisher-get.js

@@ -45,7 +45,7 @@ class PpSolutionPublisherGetCommand extends PowerPlatformCommand {
                 const result = await request.get(requestOptions);
                 return result;
             }
-            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/publishers?$filter=friendlyname eq \'${args.options.name}\'&$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix&api-version=9.1`;
+            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/publishers?$filter=friendlyname eq '${args.options.name}'&$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix&api-version=9.1`;
             const result = await request.get(requestOptions);
             if (result.value.length === 0) {
                 throw `The specified publisher '${args.options.name}' does not exist.`;

package/dist/m365/purview/commands/retentionevent/retentionevent-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod.strict();
 class PurviewRetentionEventListCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONEVENT_LIST;
@@ -8,6 +10,9 @@ class PurviewRetentionEventListCommand extends GraphCommand {
     get description() {
         return 'Get a list of retention events';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['id', 'displayName', 'eventTriggerDateTime'];
     }

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod.strict();
 class PurviewRetentionEventTypeListCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONEVENTTYPE_LIST;
@@ -8,6 +10,9 @@ class PurviewRetentionEventTypeListCommand extends GraphCommand {
     get description() {
         return 'Get a list of retention event types';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['id', 'displayName', 'createdDateTime'];
     }

package/dist/m365/purview/commands/retentionlabel/retentionlabel-list.js

@@ -1,6 +1,8 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod.strict();
 class PurviewRetentionLabelListCommand extends GraphCommand {
     get name() {
         return commands.RETENTIONLABEL_LIST;
@@ -8,6 +10,9 @@ class PurviewRetentionLabelListCommand extends GraphCommand {
     get description() {
         return 'Get a list of retention labels';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['id', 'displayName', 'isInUse'];
     }

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

@@ -128,6 +128,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
             error = err.message;
         }
         finally {
+            /* eslint-disable no-unsafe-finally */
             try {
                 if (tmpDir) {
                     if (this.verbose) {
@@ -145,10 +146,11 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                 }
                 throw `An error has occurred while removing the temp folder at ${tmpDir}. Please remove it manually.`;
             }
+            /* eslint-enable no-unsafe-finally */
         }
     }
     static replaceTokens(s, tokens) {
-        return s.replace(/\$([^\$]+)\$/g, (substring, token) => {
+        return s.replace(/\$([^$]+)\$/g, (substring, token) => {
             if (tokens[token]) {
                 return tokens[token];
             }

package/dist/m365/spfx/commands/project/base-project-command.js

@@ -21,7 +21,9 @@ export class BaseProjectCommand extends AnonymousCommand {
                     source: fs.readFileSync(gitignorePath, 'utf-8')
                 };
             }
-            catch { }
+            catch {
+                // Do nothing
+            }
         }
         const npmignorePath = path.join(projectRootPath, '.npmignore');
         if (fs.existsSync(npmignorePath)) {
@@ -30,7 +32,9 @@ export class BaseProjectCommand extends AnonymousCommand {
                     source: fs.readFileSync(npmignorePath, 'utf-8')
                 };
             }
-            catch { }
+            catch {
+                // Do nothing
+            }
         }
         this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'config.json'), project, 'configJson');
         this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'copy-assets.json'), project, 'copyAssetsJson');
@@ -108,7 +112,9 @@ export class BaseProjectCommand extends AnonymousCommand {
                     }
                 }
             }
-            catch { }
+            catch {
+                // Do nothing
+            }
         }
         const packageJsonPath = path.resolve(this.projectRootPath, 'package.json');
         try {
@@ -117,10 +123,12 @@ export class BaseProjectCommand extends AnonymousCommand {
                 packageJson.dependencies &&
                 packageJson.dependencies['@microsoft/sp-core-library']) {
                 const coreLibVersion = packageJson.dependencies['@microsoft/sp-core-library'];
-                return coreLibVersion.replace(/[^0-9\.]/g, '');
+                return coreLibVersion.replace(/[^0-9.]/g, '');
             }
         }
-        catch { }
+        catch {
+            // Do nothing
+        }
         return undefined;
     }
     readAndParseJsonFile(filePath, project, keyPath) {

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

@@ -54,7 +54,7 @@ export class FN021007_PKG_only_one_rush_stack_compiler_installed extends JsonRul
         if (!tsConfigExtends) {
             return;
         }
-        const match = /@microsoft\/rush-stack-compiler[^\/]+/.exec(tsConfigExtends);
+        const match = /@microsoft\/rush-stack-compiler[^/]+/.exec(tsConfigExtends);
         if (!match) {
             return;
         }