From 1d3fb85a853591151bfad70bcd436afe352c6bbd Mon Sep 17 00:00:00 2001 From: kirillzyusko Date: Fri, 28 Jun 2024 18:51:41 +0300 Subject: [PATCH 1/2] chore: remove patches and bump @perf-profiler/* --- package-lock.json | 44 +++++++-------- package.json | 4 +- ...-profiler+android+0.12.0+001+initial.patch | 54 ------------------- patches/@perf-profiler+reporter+0.8.1.patch | 25 --------- 4 files changed, 24 insertions(+), 103 deletions(-) delete mode 100644 patches/@perf-profiler+android+0.12.0+001+initial.patch delete mode 100644 patches/@perf-profiler+reporter+0.8.1.patch diff --git a/package-lock.json b/package-lock.json index ff202a2fda59..b617d6a2590c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -155,8 +155,8 @@ "@octokit/core": "4.0.4", "@octokit/plugin-paginate-rest": "3.1.0", "@octokit/plugin-throttling": "4.1.0", - "@perf-profiler/profiler": "^0.10.9", - "@perf-profiler/reporter": "^0.8.1", + "@perf-profiler/profiler": "^0.10.10", + "@perf-profiler/reporter": "^0.9.0", "@perf-profiler/types": "^0.8.0", "@react-native-community/eslint-config": "3.2.0", "@react-native/babel-preset": "^0.73.21", @@ -7877,13 +7877,13 @@ } }, "node_modules/@perf-profiler/android": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@perf-profiler/android/-/android-0.12.0.tgz", - "integrity": "sha512-wLI3D63drtqw3p7aKci+LCtN/ZipLJQvcw8cfmhwxqqRxTraFa8lDz5CNvNsqtCI7Zl0N9VRtnDMOj4e1W1yMQ==", + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@perf-profiler/android/-/android-0.12.1.tgz", + "integrity": "sha512-t4E2tfj9UdJw5JjhFPLMzrsu3NkKSyiZyeIyd70HX9d3anWqNK47XuQV+qkDPMjWaoU+CTlj1SuNnIOqEkCpSA==", "dev": true, "dependencies": { "@perf-profiler/logger": "^0.3.3", - "@perf-profiler/profiler": "^0.10.9", + "@perf-profiler/profiler": "^0.10.10", "@perf-profiler/types": "^0.8.0", "commander": "^12.0.0", "lodash": "^4.17.21" @@ -7902,24 +7902,24 @@ } }, "node_modules/@perf-profiler/ios": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@perf-profiler/ios/-/ios-0.3.1.tgz", - "integrity": "sha512-zRAgxLuCHzo47SYynljf+Aplh2K4DMwJ4dqIU30P8uPHiV5yHjE83eH+sTD6I7jUnUvZ8qAO1dhvp6ATJEpP/Q==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@perf-profiler/ios/-/ios-0.3.2.tgz", + "integrity": "sha512-2jYyHXFO3xe5BdvU1Ttt+Uw2nAf10B3/mcx4FauJwSdJ+nlOAKIvxmZDvMcipCZZ63uc+HWsYndhziJZVQ7VUw==", "dev": true, "dependencies": { - "@perf-profiler/ios-instruments": "^0.3.1", + "@perf-profiler/ios-instruments": "^0.3.2", "@perf-profiler/logger": "^0.3.3", "@perf-profiler/types": "^0.8.0" } }, "node_modules/@perf-profiler/ios-instruments": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@perf-profiler/ios-instruments/-/ios-instruments-0.3.1.tgz", - "integrity": "sha512-6ZiN9QTmIT8N37SslzjYNk+4+FX0X4IVuM/KiJF/DVgs056CT3MRDF8FFKF17BHsDJBi2a25QkegU8+AQdh+Qg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@perf-profiler/ios-instruments/-/ios-instruments-0.3.2.tgz", + "integrity": "sha512-uox5arQscpRuGWfzBrTpsn6eJq0ErdjPlU0FMbN4Cv5akQC11ejKWmgV6y4FR/0YIET9uiiXMtnwyEBgUunYGQ==", "dev": true, "dependencies": { "@perf-profiler/logger": "^0.3.3", - "@perf-profiler/profiler": "^0.10.9", + "@perf-profiler/profiler": "^0.10.10", "@perf-profiler/types": "^0.8.0", "commander": "^12.0.0", "fast-xml-parser": "^4.2.7" @@ -7960,20 +7960,20 @@ } }, "node_modules/@perf-profiler/profiler": { - "version": "0.10.9", - "resolved": "https://registry.npmjs.org/@perf-profiler/profiler/-/profiler-0.10.9.tgz", - "integrity": "sha512-jhkFyqsrmkI9gCYmK7+R1e+vjWGw2a2YnqruRAUk71saOkLLvRSWKnT0MiGMqzi0aQj//ojeW9viDJgxQB86zg==", + "version": "0.10.10", + "resolved": "https://registry.npmjs.org/@perf-profiler/profiler/-/profiler-0.10.10.tgz", + "integrity": "sha512-kvVC6VQ7pBdthcWEcLTua+iDj0ZkcmYYL9gXHa9Dl7jYkZI4cOeslJZ1vuGfIcC168JwAVrB8UYhgoSgss/MWQ==", "dev": true, "dependencies": { - "@perf-profiler/android": "^0.12.0", - "@perf-profiler/ios": "^0.3.1", + "@perf-profiler/android": "^0.12.1", + "@perf-profiler/ios": "^0.3.2", "@perf-profiler/types": "^0.8.0" } }, "node_modules/@perf-profiler/reporter": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@perf-profiler/reporter/-/reporter-0.8.1.tgz", - "integrity": "sha512-lZp17uMMLAV4nuDO0JbajbPCyOoD4/ugnZVxsOEEueRo8mxB26TS3R7ANtMZYjHrpQbJry0CgfTIPxflBgtq4A==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@perf-profiler/reporter/-/reporter-0.9.0.tgz", + "integrity": "sha512-wJt6ZRVM/cL+8rv9gFYgl8ZIra0uKdesfcfvsvhmrPXtxgC0O4ZdHF9hJDMtcCiHuHb8ptVq/BmEEW84CnvRIw==", "dev": true, "dependencies": { "@perf-profiler/types": "^0.8.0", diff --git a/package.json b/package.json index 39e6cefa775c..16e420e26c14 100644 --- a/package.json +++ b/package.json @@ -208,8 +208,8 @@ "@octokit/core": "4.0.4", "@octokit/plugin-paginate-rest": "3.1.0", "@octokit/plugin-throttling": "4.1.0", - "@perf-profiler/profiler": "^0.10.9", - "@perf-profiler/reporter": "^0.8.1", + "@perf-profiler/profiler": "^0.10.10", + "@perf-profiler/reporter": "^0.9.0", "@perf-profiler/types": "^0.8.0", "@react-native-community/eslint-config": "3.2.0", "@react-native/babel-preset": "^0.73.21", diff --git a/patches/@perf-profiler+android+0.12.0+001+initial.patch b/patches/@perf-profiler+android+0.12.0+001+initial.patch deleted file mode 100644 index f6ecbce9b481..000000000000 --- a/patches/@perf-profiler+android+0.12.0+001+initial.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/node_modules/@perf-profiler/android/dist/src/commands.js b/node_modules/@perf-profiler/android/dist/src/commands.js -old mode 100755 -new mode 100644 -diff --git a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js -index 77b9ee0..59aeed9 100644 ---- a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js -+++ b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js -@@ -134,7 +134,20 @@ class UnixProfiler { - } - const subProcessesStats = (0, getCpuStatsByProcess_1.processOutput)(cpu, pid); - const ram = (0, pollRamUsage_1.processOutput)(ramStr, this.getRAMPageSize()); -- const { frameTimes, interval: atraceInterval } = frameTimeParser.getFrameTimes(atrace, pid); -+ -+ let output; -+ try { -+ output = frameTimeParser.getFrameTimes(atrace, pid); -+ } catch (e) { -+ console.error(e); -+ } -+ -+ if (!output) { -+ return; -+ } -+ -+ const { frameTimes, interval: atraceInterval } = output; -+ - if (!initialTime) { - initialTime = timestamp; - } -diff --git a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts -index d6983c1..ccacf09 100644 ---- a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts -+++ b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts -@@ -136,7 +136,19 @@ export abstract class UnixProfiler implements Profiler { - const subProcessesStats = processOutput(cpu, pid); - - const ram = processRamOutput(ramStr, this.getRAMPageSize()); -- const { frameTimes, interval: atraceInterval } = frameTimeParser.getFrameTimes(atrace, pid); -+ -+ let output; -+ try { -+ output = frameTimeParser.getFrameTimes(atrace, pid); -+ } catch (e) { -+ console.error(e); -+ } -+ -+ if (!output) { -+ return; -+ } -+ -+ const { frameTimes, interval: atraceInterval } = output; - - if (!initialTime) { - initialTime = timestamp; diff --git a/patches/@perf-profiler+reporter+0.8.1.patch b/patches/@perf-profiler+reporter+0.8.1.patch deleted file mode 100644 index 2c918b4049c2..000000000000 --- a/patches/@perf-profiler+reporter+0.8.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/node_modules/@perf-profiler/reporter/dist/src/index.d.ts b/node_modules/@perf-profiler/reporter/dist/src/index.d.ts -index 2f84d84..14ae688 100644 ---- a/node_modules/@perf-profiler/reporter/dist/src/index.d.ts -+++ b/node_modules/@perf-profiler/reporter/dist/src/index.d.ts -@@ -4,4 +4,6 @@ export * from "./reporting/Report"; - export * from "./utils/sanitizeProcessName"; - export * from "./utils/round"; - export * from "./reporting/cpu"; -+export * from "./reporting/ram"; -+export * from "./reporting/fps"; - export { canComputeHighCpuUsage } from "./reporting/highCpu"; -diff --git a/node_modules/@perf-profiler/reporter/dist/src/index.js b/node_modules/@perf-profiler/reporter/dist/src/index.js -index 4b50e3a..780963a 100644 ---- a/node_modules/@perf-profiler/reporter/dist/src/index.js -+++ b/node_modules/@perf-profiler/reporter/dist/src/index.js -@@ -21,6 +21,8 @@ __exportStar(require("./reporting/Report"), exports); - __exportStar(require("./utils/sanitizeProcessName"), exports); - __exportStar(require("./utils/round"), exports); - __exportStar(require("./reporting/cpu"), exports); -+__exportStar(require("./reporting/fps"), exports); -+__exportStar(require("./reporting/ram"), exports); - var highCpu_1 = require("./reporting/highCpu"); - Object.defineProperty(exports, "canComputeHighCpuUsage", { enumerable: true, get: function () { return highCpu_1.canComputeHighCpuUsage; } }); - //# sourceMappingURL=index.js.map -\ No newline at end of file From f5c0136fba7c6ab1641dd812ecb4d96405fd2b81 Mon Sep 17 00:00:00 2001 From: kirillzyusko Date: Fri, 28 Jun 2024 18:52:59 +0300 Subject: [PATCH 2/2] chore: rename patch --- ...002+aws-binaries.patch => @perf-profiler+android+0.12.1.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename patches/{@perf-profiler+android+0.12.0+002+aws-binaries.patch => @perf-profiler+android+0.12.1.patch} (100%) diff --git a/patches/@perf-profiler+android+0.12.0+002+aws-binaries.patch b/patches/@perf-profiler+android+0.12.1.patch similarity index 100% rename from patches/@perf-profiler+android+0.12.0+002+aws-binaries.patch rename to patches/@perf-profiler+android+0.12.1.patch