Merge branch 'main' into post-stringify

Author: mstange

bin/output-fixing-commands.js

@@ -16,12 +16,20 @@ const fixingCommands = {
 };
 
 const command = process.argv.slice(2);
+const currentScriptName = process.env.npm_lifecycle_event;
+
+// Redirect the main lint command, but not individual commands.
+if (currentScriptName === 'lint' && command.includes('--fix')) {
+  console.log(`🔧 Detected --fix flag, running: yarn lint-fix`);
+  const result = cp.spawnSync('yarn', ['lint-fix'], { stdio: 'inherit' });
+  process.exitCode = result.status;
+  process.exit();
+}
 
 const result = cp.spawnSync(command[0], command.slice(1), { stdio: 'inherit' });
 
 if (result.status !== 0) {
   process.exitCode = result.status;
-  const currentScriptName = process.env.npm_lifecycle_event;
   if (currentScriptName && currentScriptName in fixingCommands) {
     console.log(
       '💡 You might be able to fix the error by running `yarn ' +

src/profile-logic/profile-data.ts

@@ -85,7 +85,7 @@ import type {
   CallTreeSummaryStrategy,
   EventDelayInfo,
   ThreadsKey,
-  resourceTypeEnum,
+  ResourceTypeEnum,
   MarkerPayload,
   Address,
   AddressProof,
@@ -2822,7 +2822,7 @@ export function getThreadProcessDetails(
 function _shouldShowBothOriginAndFileName(
   fileName: string,
   origin: string,
-  resourceType: resourceTypeEnum | null
+  resourceType: ResourceTypeEnum | null
 ): boolean {
   // If the origin string is just a URL prefix that's part of the
   // filename, it doesn't add any useful information, so only show

src/types/profile.ts

@@ -17,7 +17,7 @@ export type IndexIntoLibs = number;
 export type IndexIntoNativeSymbolTable = number;
 export type IndexIntoCategoryList = number;
 export type IndexIntoSubcategoryListForCategory = number;
-export type resourceTypeEnum = number;
+export type ResourceTypeEnum = number;
 export type ThreadIndex = number;
 // The Tid is most often a number. However in some cases such as merged profiles
 // we could generate a string.
@@ -370,7 +370,7 @@ export type ResourceTable = {
   lib: Array<IndexIntoLibs | null>;
   name: Array<IndexIntoStringTable>;
   host: Array<IndexIntoStringTable | null>;
-  type: resourceTypeEnum[];
+  type: ResourceTypeEnum[];
 };
 
 /**