From d3a828f1b352fc9ca0cfa4546edbed074a8e37b8 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Wed, 22 Jan 2025 18:43:17 -0600 Subject: [PATCH] Use @electron/symbolicate-mac Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> --- package-lock.json | 74 ++++++++++++++------------ package.json | 2 +- ts/scripts/symbolicate-crash-report.ts | 2 +- ts/scripts/symbolicate-mac.d.ts | 2 +- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 488af5ab7b4..2b82685b655 100644 --- a/package-lock.json +++ b/package-lock.json @@ -121,10 +121,10 @@ "@electron/asar": "3.2.17", "@electron/fuses": "1.5.0", "@electron/notarize": "2.1.0", + "@electron/symbolicate-mac": "2.3.1", "@formatjs/intl": "2.10.14", "@indutny/parallel-prettier": "3.0.0", "@indutny/rezip-electron": "2.0.1", - "@indutny/symbolicate-mac": "2.3.0", "@napi-rs/canvas": "0.1.61", "@signalapp/mock-server": "10.4.0", "@storybook/addon-a11y": "8.4.4", @@ -1951,6 +1951,38 @@ "node": ">=10" } }, + "node_modules/@electron/symbolicate-mac": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@electron/symbolicate-mac/-/symbolicate-mac-2.3.1.tgz", + "integrity": "sha512-V/1RN7QI+dD3cquravwSg9Z9vEuSgOm4G50dJutQUlCUip6ECUMxsIqPnleTreA/27eboWs6Ev/jV/fN0Uklzw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@indutny/breakpad": "^1.2.0", + "got": "^11.8.2", + "mkdirp": "^1.0.4", + "yargs": "^17.0.1" + }, + "bin": { + "electron-symbolicate-mac": "index.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@electron/symbolicate-mac/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@electron/universal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.1.tgz", @@ -2718,15 +2750,17 @@ "resolved": "https://registry.npmjs.org/@indutny/breakpad/-/breakpad-1.2.3.tgz", "integrity": "sha512-64loyCp++8+nj4fVxiMeGe/J6yJJ4c1TYzH6OIOX9E5990Iw9cN5b0iGOc1IaFnu3wUWKP1OCbw38vDWVoIWcA==", "dev": true, + "license": "MIT", "dependencies": { "@indutny/breakpad-parser-wasm": "^1.0.3" } }, "node_modules/@indutny/breakpad-parser-wasm": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@indutny/breakpad-parser-wasm/-/breakpad-parser-wasm-1.0.3.tgz", - "integrity": "sha512-hpgEfz5mI5OSu0XgD+kn1n/EsB1/i3c3GD+4AodrCRRdXEdoVmZMS3vA+1Yb+PFcMp29iNZtLkpfyT/zxVykYQ==", - "dev": true + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@indutny/breakpad-parser-wasm/-/breakpad-parser-wasm-1.0.4.tgz", + "integrity": "sha512-93uPQTTsBPthHNIHVR3hgHlXbRSnq0mXcWyxvafR95I2XMUUeGrRK0JGR/FpeirwNDGfRiptq4BN5BmszSn90w==", + "dev": true, + "license": "MIT" }, "node_modules/@indutny/dicer": { "version": "0.3.2", @@ -2876,36 +2910,6 @@ "resolved": "https://registry.npmjs.org/@indutny/sneequals/-/sneequals-4.0.0.tgz", "integrity": "sha512-kQUBQtcm4aVqJil+KRfA7SycJqcWlFEa7MJTYyl4XAahHOPXnzgqvlzUPQOw1tRFlvnzxRpXNUpJxej2fdAPjg==" }, - "node_modules/@indutny/symbolicate-mac": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@indutny/symbolicate-mac/-/symbolicate-mac-2.3.0.tgz", - "integrity": "sha512-DhRqZVF5HiN5Gke7cEofMgzb44DZXX/MIrkb4MUyclt6Xb+Uq1yBXbIFMymi9iNafkFgT7jZr5q/+QyWlt2RTA==", - "dev": true, - "dependencies": { - "@indutny/breakpad": "^1.2.0", - "got": "^11.8.2", - "mkdirp": "^1.0.4", - "yargs": "^17.0.1" - }, - "bin": { - "electron-symbolicate-mac": "index.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@indutny/symbolicate-mac/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@indutny/yazl": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/@indutny/yazl/-/yazl-2.7.0.tgz", diff --git a/package.json b/package.json index e8489d5ef0a..3dc497fb084 100644 --- a/package.json +++ b/package.json @@ -212,10 +212,10 @@ "@electron/asar": "3.2.17", "@electron/fuses": "1.5.0", "@electron/notarize": "2.1.0", + "@electron/symbolicate-mac": "2.3.1", "@formatjs/intl": "2.10.14", "@indutny/parallel-prettier": "3.0.0", "@indutny/rezip-electron": "2.0.1", - "@indutny/symbolicate-mac": "2.3.0", "@napi-rs/canvas": "0.1.61", "@signalapp/mock-server": "10.4.0", "@storybook/addon-a11y": "8.4.4", diff --git a/ts/scripts/symbolicate-crash-report.ts b/ts/scripts/symbolicate-crash-report.ts index dbed12cf527..1aa91258f11 100644 --- a/ts/scripts/symbolicate-crash-report.ts +++ b/ts/scripts/symbolicate-crash-report.ts @@ -6,7 +6,7 @@ import { readFile, writeFile, mkdtemp } from 'fs/promises'; import { gunzip as gunzipCb } from 'zlib'; import { join, basename } from 'path'; import { promisify } from 'util'; -import { symbolicate } from '@indutny/symbolicate-mac'; +import { symbolicate } from '@electron/symbolicate-mac'; import pMap from 'p-map'; const gunzip = promisify(gunzipCb); diff --git a/ts/scripts/symbolicate-mac.d.ts b/ts/scripts/symbolicate-mac.d.ts index 726e6873d87..3e9a953aa45 100644 --- a/ts/scripts/symbolicate-mac.d.ts +++ b/ts/scripts/symbolicate-mac.d.ts @@ -1,7 +1,7 @@ // Copyright 2024 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -declare module '@indutny/symbolicate-mac' { +declare module '@electron/symbolicate-mac' { export function symbolicate(options: { file: string; force?: boolean;