From a46985d91e0cf832bb7d0cc32d787f892213fd22 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 28 Feb 2025 10:23:49 +0000 Subject: [PATCH 01/38] Specify node version to avoid NAPI keytar bug (#2168) --- .github/workflows/build_and_test.yaml | 2 +- .github/workflows/build_linux.yaml | 4 ++-- .github/workflows/build_macos.yaml | 2 +- .github/workflows/build_prepare.yaml | 2 +- .github/workflows/build_windows.yaml | 4 +--- .github/workflows/dockerbuild.yaml | 4 ++-- .node-version | 1 + dockerbuild/Dockerfile | 3 +-- dockerbuild/setup.sh | 3 ++- package.json | 4 ++-- 10 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 .node-version diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 6eef1ca9..ea480bdb 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -97,7 +97,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: package.json + node-version-file: .node-version cache: "yarn" - name: Install Deps diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index 45ca5379..7f434dd3 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -76,7 +76,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: package.json + node-version-file: .node-version cache: "yarn" env: # Workaround for https://github.com/actions/setup-node/issues/317 @@ -98,7 +98,7 @@ jobs: uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6 if: steps.changed_files.outputs.any_modified == 'true' with: - context: dockerbuild + file: dockerbuild/Dockerfile load: true platforms: linux/${{ inputs.arch }} tags: ${{ env.HAK_DOCKER_IMAGE }} diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml index 344a1a90..4438dc48 100644 --- a/.github/workflows/build_macos.yaml +++ b/.github/workflows/build_macos.yaml @@ -62,7 +62,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: package.json + node-version-file: .node-version cache: "yarn" - name: Install Deps diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml index bd00f306..4a28f26a 100644 --- a/.github/workflows/build_prepare.yaml +++ b/.github/workflows/build_prepare.yaml @@ -56,7 +56,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version-file: package.json + node-version-file: .node-version cache: "yarn" - name: Install Deps diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 09b5ed69..cb7c318a 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -99,9 +99,7 @@ jobs: - uses: actions/setup-node@v4 with: - # node-version-file: package.json - # For https://github.com/element-hq/element-desktop/issues/2161 - node-version: 22.13.1 + node-version-file: .node-version cache: "yarn" - name: Install Deps diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index 029ae64e..d2af9801 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -32,7 +32,7 @@ jobs: - name: Build test image uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6 with: - context: dockerbuild + file: dockerbuild/Dockerfile push: false load: true tags: element-desktop-dockerbuild @@ -63,7 +63,7 @@ jobs: if: github.event_name != 'pull_request' uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6 with: - context: dockerbuild + file: dockerbuild/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.node-version b/.node-version new file mode 100644 index 00000000..43779377 --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +v22.13.1 \ No newline at end of file diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile index 89754a65..0c4c0b3c 100644 --- a/dockerbuild/Dockerfile +++ b/dockerbuild/Dockerfile @@ -21,8 +21,7 @@ ENV FORCE_COLOR true WORKDIR /project -ENV NODE_VERSION 20.18.2 ARG TARGETOS ARG TARGETARCH -COPY setup.sh /setup.sh +COPY .node-version dockerbuild/setup.sh / RUN /setup.sh diff --git a/dockerbuild/setup.sh b/dockerbuild/setup.sh index 96161210..efb43108 100755 --- a/dockerbuild/setup.sh +++ b/dockerbuild/setup.sh @@ -3,5 +3,6 @@ set -x declare -A archMap=(["amd64"]="x64" ["arm64"]="arm64") ARCH="${archMap["$TARGETARCH"]}" -curl --proto "=https" -L "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-$TARGETOS-$ARCH.tar.gz" | tar xz -C /usr/local --strip-components=1 && \ +NODE_VERSION=$(cat /.node-version) +curl --proto "=https" -L "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$TARGETOS-$ARCH.tar.gz" | tar xz -C /usr/local --strip-components=1 && \ unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md diff --git a/package.json b/package.json index 83cd04b3..c40c2a74 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "type": "module", "files": [], "engines": { - "node": ">=18.0.0" + "node": ">=18.0.0 <=22.13.1 || >22" }, "scripts": { "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", @@ -44,7 +44,7 @@ "build": "yarn run build:ts && yarn run build:res && electron-builder", "build:ts": "tsc", "build:res": "tsx scripts/copy-res.ts", - "docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild dockerbuild", + "docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild -f dockerbuild/Dockerfile .", "docker:build:native": "scripts/in-docker.sh yarn run hak", "docker:build": "scripts/in-docker.sh yarn run build", "docker:install": "scripts/in-docker.sh yarn install", From bce251b35b3d6cecf0c6d409eb9060dccd8d1c35 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 28 Feb 2025 11:17:07 +0000 Subject: [PATCH 02/38] Update node engines, 23.x is broken too --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c40c2a74..b071c094 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "type": "module", "files": [], "engines": { - "node": ">=18.0.0 <=22.13.1 || >22" + "node": ">=18.0.0 <=22.13.1" }, "scripts": { "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", From ff7f53fb35675694b3961a77c97557765d4cedd4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 28 Feb 2025 11:39:31 +0000 Subject: [PATCH 03/38] Use modern Dockerfile env format to silence warnings (#2171) --- dockerbuild/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile index 0c4c0b3c..ecd61fc5 100644 --- a/dockerbuild/Dockerfile +++ b/dockerbuild/Dockerfile @@ -2,7 +2,7 @@ # with broader compatibility, down to Debian bullseye & Ubuntu focal. FROM rust:bullseye -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN curl --proto "=https" -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv yarn-* /yarn && ln -s /yarn/bin/yarn /usr/bin/yarn RUN apt-get -qq update && apt-get -y -qq dist-upgrade && \ @@ -16,8 +16,8 @@ RUN apt-get -qq update && apt-get -y -qq dist-upgrade && \ apt-get purge -y --auto-remove && rm -rf /var/lib/apt/lists/* RUN ln -s /usr/bin/python3 /usr/bin/python & ln -s /usr/bin/pip3 /usr/bin/pip -ENV DEBUG_COLORS true -ENV FORCE_COLOR true +ENV DEBUG_COLORS=true +ENV FORCE_COLOR=true WORKDIR /project From 9a1d2291c1e0a984faa4fbe8fdacda09198c30cb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 28 Feb 2025 15:13:35 +0000 Subject: [PATCH 04/38] Make keytar mandatory and build it without hak (#2173) --- electron-builder.ts | 3 + hak/keytar/build.ts | 26 -------- hak/keytar/check.ts | 15 ----- hak/keytar/hak.json | 10 --- package.json | 7 +- src/@types/keytar.d.ts | 54 --------------- src/electron-main.ts | 1 - src/ipc.ts | 13 ++-- src/keytar.ts | 21 ------ src/seshat.ts | 2 +- yarn.lock | 148 ++++++++++++++++++++++++++++++++++++++--- 11 files changed, 153 insertions(+), 147 deletions(-) delete mode 100644 hak/keytar/build.ts delete mode 100644 hak/keytar/check.ts delete mode 100644 hak/keytar/hak.json delete mode 100644 src/@types/keytar.d.ts delete mode 100644 src/keytar.ts diff --git a/electron-builder.ts b/electron-builder.ts index abf0ca63..660721d1 100644 --- a/electron-builder.ts +++ b/electron-builder.ts @@ -174,6 +174,9 @@ const config: Omit, "electronFuses"> & { schemes: ["io.element.desktop", "element"], }, ], + nativeRebuilder: "sequential", + nodeGypRebuild: false, + npmRebuild: true, }; /** diff --git a/hak/keytar/build.ts b/hak/keytar/build.ts deleted file mode 100644 index b3495969..00000000 --- a/hak/keytar/build.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2024 New Vector Ltd. -Copyright 2020 The Matrix.org Foundation C.I.C. - -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial -Please see LICENSE files in the repository root for full details. -*/ - -import path from "node:path"; - -import type HakEnv from "../../scripts/hak/hakEnv.js"; -import type { DependencyInfo } from "../../scripts/hak/dep.js"; - -export default async function buildKeytar(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise { - const env = hakEnv.makeGypEnv(); - - console.log("Running yarn with env", env); - await hakEnv.spawn( - path.join(moduleInfo.nodeModuleBinDir, "node-gyp"), - ["rebuild", "--arch", hakEnv.getTargetArch()], - { - cwd: moduleInfo.moduleBuildDir, - env, - }, - ); -} diff --git a/hak/keytar/check.ts b/hak/keytar/check.ts deleted file mode 100644 index 3ced7f8a..00000000 --- a/hak/keytar/check.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2024 New Vector Ltd. -Copyright 2020 The Matrix.org Foundation C.I.C. - -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial -Please see LICENSE files in the repository root for full details. -*/ - -import type HakEnv from "../../scripts/hak/hakEnv.js"; -import type { DependencyInfo } from "../../scripts/hak/dep.js"; - -export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise { - // node-gyp uses python for reasons beyond comprehension - await hakEnv.checkTools([["python", "--version"]]); -} diff --git a/hak/keytar/hak.json b/hak/keytar/hak.json deleted file mode 100644 index 792d85d4..00000000 --- a/hak/keytar/hak.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "scripts": { - "check": "check.ts", - "build": "build.ts" - }, - "copy": "build/Release/keytar.node", - "dependencies": { - "libsecret": "0.20.3" - } -} diff --git a/package.json b/package.json index b071c094..026bc093 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,8 @@ "test": "playwright test", "test:open": "yarn test --ui", "test:screenshots:build": "docker build playwright -t element-desktop-playwright --platform linux/amd64", - "test:screenshots:run": "docker run --rm --network host -v $(pwd):/work/element-desktop -v /var/run/docker.sock:/var/run/docker.sock --platform linux/amd64 -it element-desktop-playwright" + "test:screenshots:run": "docker run --rm --network host -v $(pwd):/work/element-desktop -v /var/run/docker.sock:/var/run/docker.sock --platform linux/amd64 -it element-desktop-playwright", + "postinstall": "electron-builder install-app-deps" }, "dependencies": { "@sentry/electron": "^5.0.0", @@ -62,6 +63,7 @@ "counterpart": "^0.18.6", "electron-store": "^10.0.0", "electron-window-state": "^5.0.3", + "keytar": "^7.9.0", "minimist": "^1.2.6", "png-to-ico": "^2.1.1", "uuid": "^11.0.0" @@ -111,8 +113,7 @@ "typescript": "5.7.3" }, "hakDependencies": { - "matrix-seshat": "^4.0.1", - "keytar": "^7.9.0" + "matrix-seshat": "^4.0.1" }, "resolutions": { "@types/node": "18.19.76", diff --git a/src/@types/keytar.d.ts b/src/@types/keytar.d.ts deleted file mode 100644 index ba396b51..00000000 --- a/src/@types/keytar.d.ts +++ /dev/null @@ -1,54 +0,0 @@ -// Based on https://github.com/atom/node-keytar/blob/master/keytar.d.ts because keytar is a hak-dependency and not a normal one -// Definitions by: Milan Burda , Brendan Forster , Hari Juturu -// Adapted from DefinitelyTyped: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/keytar/index.d.ts - -declare module "keytar" { - /** - * Get the stored password for the service and account. - * - * @param service The string service name. - * @param account The string account name. - * - * @returns A promise for the password string. - */ - export function getPassword(service: string, account: string): Promise; - - /** - * Add the password for the service and account to the keychain. - * - * @param service The string service name. - * @param account The string account name. - * @param password The string password. - * - * @returns A promise for the set password completion. - */ - export function setPassword(service: string, account: string, password: string): Promise; - - /** - * Delete the stored password for the service and account. - * - * @param service The string service name. - * @param account The string account name. - * - * @returns A promise for the deletion status. True on success. - */ - export function deletePassword(service: string, account: string): Promise; - - /** - * Find a password for the service in the keychain. - * - * @param service The string service name. - * - * @returns A promise for the password string. - */ - export function findPassword(service: string): Promise; - - /** - * Find all accounts and passwords for `service` in the keychain. - * - * @param service The string service name. - * - * @returns A promise for the array of found credentials. - */ - export function findCredentials(service: string): Promise>; -} diff --git a/src/electron-main.ts b/src/electron-main.ts index 470effbc..16134924 100644 --- a/src/electron-main.ts +++ b/src/electron-main.ts @@ -22,7 +22,6 @@ import { URL, fileURLToPath } from "node:url"; import minimist from "minimist"; import "./ipc.js"; -import "./keytar.js"; import "./seshat.js"; import "./settings.js"; import * as tray from "./tray.js"; diff --git a/src/ipc.ts b/src/ipc.ts index 66dbf975..9bbeb4e9 100644 --- a/src/ipc.ts +++ b/src/ipc.ts @@ -7,12 +7,12 @@ Please see LICENSE files in the repository root for full details. import { app, autoUpdater, desktopCapturer, ipcMain, powerSaveBlocker, TouchBar, nativeImage } from "electron"; import { relaunchApp } from "@standardnotes/electron-clear-data"; +import keytar from "keytar"; import IpcMainEvent = Electron.IpcMainEvent; import { recordSSOSession } from "./protocol.js"; import { randomArray } from "./utils.js"; import { Settings } from "./settings.js"; -import { keytar } from "./keytar.js"; import { getDisplayMediaCallback, setDisplayMediaCallback } from "./displayMediaCallback.js"; ipcMain.on("setBadgeCount", function (_ev: IpcMainEvent, count: number): void { @@ -141,11 +141,11 @@ ipcMain.on("ipcCall", async function (_ev: IpcMainEvent, payload) { case "getPickleKey": try { - ret = await keytar?.getPassword("element.io", `${args[0]}|${args[1]}`); + ret = await keytar.getPassword("element.io", `${args[0]}|${args[1]}`); // migrate from riot.im (remove once we think there will no longer be // logins from the time of riot.im) if (ret === null) { - ret = await keytar?.getPassword("riot.im", `${args[0]}|${args[1]}`); + ret = await keytar.getPassword("riot.im", `${args[0]}|${args[1]}`); } } catch { // if an error is thrown (e.g. keytar can't connect to the keychain), @@ -161,17 +161,18 @@ ipcMain.on("ipcCall", async function (_ev: IpcMainEvent, payload) { // rather than sending them a pickle key we did not store on their behalf. await keytar!.setPassword("element.io", `${args[0]}|${args[1]}`, pickleKey); ret = pickleKey; - } catch { + } catch (e) { + console.error("Failed to create pickle key", e); ret = null; } break; case "destroyPickleKey": try { - await keytar?.deletePassword("element.io", `${args[0]}|${args[1]}`); + await keytar.deletePassword("element.io", `${args[0]}|${args[1]}`); // migrate from riot.im (remove once we think there will no longer be // logins from the time of riot.im) - await keytar?.deletePassword("riot.im", `${args[0]}|${args[1]}`); + await keytar.deletePassword("riot.im", `${args[0]}|${args[1]}`); } catch {} break; case "getDesktopCapturerSources": diff --git a/src/keytar.ts b/src/keytar.ts deleted file mode 100644 index fdcddfde..00000000 --- a/src/keytar.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2022-2024 New Vector Ltd. - -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial -Please see LICENSE files in the repository root for full details. -*/ - -import type * as Keytar from "keytar"; // Hak dependency type - -let keytar: typeof Keytar | undefined; -try { - ({ default: keytar } = await import("keytar")); -} catch (e) { - if ((e).code === "MODULE_NOT_FOUND") { - console.log("Keytar isn't installed; secure key storage is disabled."); - } else { - console.warn("Keytar unexpected error:", e); - } -} - -export { keytar }; diff --git a/src/seshat.ts b/src/seshat.ts index cea557c7..ac467cd6 100644 --- a/src/seshat.ts +++ b/src/seshat.ts @@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details. import { app, ipcMain } from "electron"; import { promises as afs } from "node:fs"; import path from "node:path"; +import keytar from "keytar"; import type { Seshat as SeshatType, @@ -16,7 +17,6 @@ import type { } from "matrix-seshat"; // Hak dependency type import IpcMainEvent = Electron.IpcMainEvent; import { randomArray } from "./utils.js"; -import { keytar } from "./keytar.js"; let seshatSupported = false; let Seshat: typeof SeshatType; diff --git a/yarn.lock b/yarn.lock index 9186868c..0f154711 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2726,7 +2726,7 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -bl@^4.1.0: +bl@^4.0.3, bl@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -2977,6 +2977,11 @@ chokidar@^4.0.0: dependencies: readdirp "^4.0.1" +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -3285,6 +3290,11 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -3550,7 +3560,7 @@ encoding@^0.1.13: dependencies: iconv-lite "^0.6.2" -end-of-stream@^1.1.0: +end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== @@ -3984,6 +3994,11 @@ execa@^8.0.1: signal-exit "^4.1.0" strip-final-newline "^3.0.0" +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + exponential-backoff@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.2.tgz#a8f26adb96bf78e8cd8ad1037928d5e5c0679d91" @@ -4140,6 +4155,11 @@ forwarded-parse@2.1.2: resolved "https://registry.yarnpkg.com/forwarded-parse/-/forwarded-parse-2.1.2.tgz#08511eddaaa2ddfd56ba11138eee7df117a09325" integrity sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw== +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + fs-extra@^10.0.0, fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -4313,6 +4333,11 @@ get-tsconfig@^4.7.5, get-tsconfig@^4.8.1: dependencies: resolve-pkg-maps "^1.0.0" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== + glob-parent@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -4701,6 +4726,11 @@ ini@^5.0.0: resolved "https://registry.yarnpkg.com/ini/-/ini-5.0.0.tgz#a7a4615339843d9a8ccc2d85c9d81cf93ffbc638" integrity sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw== +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + internal-slot@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" @@ -5093,6 +5123,14 @@ jszip@^3.1.0: readable-stream "~2.3.6" setimmediate "^1.0.5" +keytar@^7.9.0: + version "7.9.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" + integrity sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ== + dependencies: + node-addon-api "^4.3.0" + prebuild-install "^7.0.1" + keyv@^4.0.0, keyv@^4.5.3: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" @@ -5435,7 +5473,7 @@ minimatch@^9.0.0, minimatch@^9.0.3, minimatch@^9.0.4, minimatch@^9.0.5: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -5541,6 +5579,11 @@ minizlib@^3.0.1: minipass "^7.0.4" rimraf "^5.0.5" +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + mkdirp@^0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -5568,6 +5611,11 @@ ms@^2.0.0, ms@^2.1.1, ms@^2.1.3: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +napi-build-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-2.0.0.tgz#13c22c0187fcfccce1461844136372a47ddc027e" + integrity sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -5583,7 +5631,7 @@ negotiator@^1.0.0: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a" integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg== -node-abi@^3.45.0: +node-abi@^3.3.0, node-abi@^3.45.0: version "3.74.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.74.0.tgz#5bfb4424264eaeb91432d2adb9da23c63a301ed0" integrity sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w== @@ -5595,6 +5643,11 @@ node-addon-api@^1.6.3: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== +node-addon-api@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== + node-api-version@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d" @@ -6200,6 +6253,24 @@ postject@^1.0.0-alpha.6: dependencies: commander "^9.4.0" +prebuild-install@^7.0.1: + version "7.1.3" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.3.tgz#d630abad2b147443f20a212917beae68b8092eec" + integrity sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^2.0.0" + node-abi "^3.3.0" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -6278,6 +6349,16 @@ quick-lru@^5.1.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + read-binary-file-arch@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz#959c4637daa932280a9b911b1a6766a7e44288fc" @@ -6304,7 +6385,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@^3.4.0: +readable-stream@^3.1.1, readable-stream@^3.4.0: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -6556,16 +6637,16 @@ safe-array-concat@^1.1.2: has-symbols "^1.0.3" isarray "^2.0.5" +safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - safe-regex-test@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" @@ -6700,6 +6781,20 @@ sigstore@^3.0.0: "@sigstore/tuf" "^3.0.0" "@sigstore/verify" "^2.0.0" +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + simple-update-notifier@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb" @@ -6969,6 +7064,11 @@ strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== + stubborn-fs@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/stubborn-fs/-/stubborn-fs-1.2.5.tgz#e5e244223166921ddf66ed5e062b6b3bf285bfd2" @@ -7010,6 +7110,27 @@ tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== +tar-fs@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5" + integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" @@ -7127,6 +7248,13 @@ tuf-js@^3.0.1: debug "^4.3.6" make-fetch-happen "^14.0.1" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== + dependencies: + safe-buffer "^5.0.1" + type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" From 7847e53adc6cbb349f9e3dfb8bf76019eac72dc5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 28 Feb 2025 15:15:19 +0000 Subject: [PATCH 05/38] Update build to always install setuptools Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/build_macos.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml index 4438dc48..b107ad52 100644 --- a/.github/workflows/build_macos.yaml +++ b/.github/workflows/build_macos.yaml @@ -68,12 +68,13 @@ jobs: - name: Install Deps run: "yarn install --frozen-lockfile" + # Python 3.12 drops distutils which keytar relies on + - name: Install setuptools + run: pip3 install setuptools + - name: Build Natives if: steps.cache.outputs.cache-hit != 'true' - run: | - # Python 3.12 drops distutils which keytar relies on - pip3 install setuptools - yarn build:native:universal + run: yarn build:native:universal # We split these because electron-builder gets upset if we set CSC_LINK even to an empty string - name: "[Signed] Build App" From 1496f3d64c5b6c62271a65d09726a50600c8c18f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 28 Feb 2025 15:15:32 +0000 Subject: [PATCH 06/38] Remove unused parts of the hak build system (#2174) --- scripts/hak/README.md | 4 ++-- scripts/hak/check.ts | 4 +--- scripts/hak/copy.ts | 15 --------------- scripts/hak/fetchDeps.ts | 19 ------------------- scripts/hak/index.ts | 2 +- 5 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 scripts/hak/fetchDeps.ts diff --git a/scripts/hak/README.md b/scripts/hak/README.md index a5681d8b..bf254451 100644 --- a/scripts/hak/README.md +++ b/scripts/hak/README.md @@ -67,14 +67,14 @@ Hak is divided into lifecycle stages, in order: # hak.json -The scripts section contains scripts used for lifecycle stages that need them (fetch, fetchDeps, build). +The scripts section contains scripts used for lifecycle stages that need them (fetch, build). It also contains 'prune' and 'copy' which are globs of files to delete from the output module directory and copy over from the module build directory to the output module directory, respectively. # Shortcomings Hak doesn't know about dependencies between lifecycle stages, ie. it doesn't know that you need to -'fetch' and 'fetchDeps' before you can 'build', etc. You get to run each individually, and remember +'fetch' before you can 'build', etc. You get to run each individually, and remember the right order. There is also a _lot_ of duplication in the command execution: we should abstract away diff --git a/scripts/hak/check.ts b/scripts/hak/check.ts index 2936091a..2a7ce6e4 100644 --- a/scripts/hak/check.ts +++ b/scripts/hak/check.ts @@ -10,7 +10,5 @@ import type { DependencyInfo } from "./dep.js"; import type HakEnv from "./hakEnv.js"; export default async function check(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise { - if (moduleInfo.scripts.check) { - await moduleInfo.scripts.check(hakEnv, moduleInfo); - } + await moduleInfo.scripts.check?.(hakEnv, moduleInfo); } diff --git a/scripts/hak/copy.ts b/scripts/hak/copy.ts index 6fda80f9..607792e6 100644 --- a/scripts/hak/copy.ts +++ b/scripts/hak/copy.ts @@ -9,7 +9,6 @@ Please see LICENSE files in the repository root for full details. import path from "node:path"; import fsProm from "node:fs/promises"; import childProcess from "node:child_process"; -import { rimraf } from "rimraf"; import { glob } from "glob"; import { mkdirp } from "mkdirp"; @@ -17,20 +16,6 @@ import type HakEnv from "./hakEnv.js"; import type { DependencyInfo } from "./dep.js"; export default async function copy(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise { - if (moduleInfo.cfg.prune) { - console.log("Removing " + moduleInfo.cfg.prune + " from " + moduleInfo.moduleOutDir); - // rimraf doesn't have a 'cwd' option: it always uses process.cwd() - // (and if you set glob.cwd it just breaks because it can't find the files) - const oldCwd = process.cwd(); - try { - await mkdirp(moduleInfo.moduleOutDir); - process.chdir(moduleInfo.moduleOutDir); - await rimraf(moduleInfo.cfg.prune); - } finally { - process.chdir(oldCwd); - } - } - if (moduleInfo.cfg.copy) { // If there are multiple moduleBuildDirs, singular moduleBuildDir // is the same as moduleBuildDirs[0], so we're just listing the contents diff --git a/scripts/hak/fetchDeps.ts b/scripts/hak/fetchDeps.ts deleted file mode 100644 index 22dbfd5c..00000000 --- a/scripts/hak/fetchDeps.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2024 New Vector Ltd. -Copyright 2020 The Matrix.org Foundation C.I.C. - -SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial -Please see LICENSE files in the repository root for full details. -*/ - -import { mkdirp } from "mkdirp"; - -import type { DependencyInfo } from "./dep.js"; -import type HakEnv from "./hakEnv.js"; - -export default async function fetchDeps(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise { - await mkdirp(moduleInfo.moduleDotHakDir); - if (moduleInfo.scripts.fetchDeps) { - await moduleInfo.scripts.fetchDeps(hakEnv, moduleInfo); - } -} diff --git a/scripts/hak/index.ts b/scripts/hak/index.ts index 22d35731..b78d6474 100644 --- a/scripts/hak/index.ts +++ b/scripts/hak/index.ts @@ -19,7 +19,7 @@ import packageJson from "../../package.json"; const MODULECOMMANDS = ["check", "fetch", "link", "build", "copy", "clean"]; // Shortcuts for multiple commands at once (useful for building universal binaries -// because you can run the fetch/fetchDeps/build for each arch and then copy/link once) +// because you can run the fetch/build for each arch and then copy/link once) const METACOMMANDS: Record = { fetchandbuild: ["check", "fetch", "build"], copyandlink: ["copy", "link"], From 46e81cd8f88e964259fe89a5ab13bfe2dd0c8a6a Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:03:01 +0000 Subject: [PATCH 07/38] Add ability to insert extra config for windows builds. --- .github/workflows/build_and_deploy.yaml | 8 ++++++++ .github/workflows/build_windows.yaml | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index 7c45433a..11d1d85e 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -63,10 +63,18 @@ jobs: strategy: matrix: arch: [ia32, x64, arm64] + include: + - arch: ia32 + extra_config: |- + "user_notice": { + "title": "Element will no longer be available for this platform soon", + "description": "Support for 32-bit Windows installations will be removed in the next release." + } uses: ./.github/workflows/build_windows.yaml secrets: inherit with: sign: true + extra_config: ${{ matrix.extra_config }} arch: ${{ matrix.arch }} version: ${{ needs.prepare.outputs.nightly-version }} diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index cb7c318a..c21b0bcf 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -22,6 +22,10 @@ on: type: string required: true description: "The architecture to build for, one of 'x64' | 'ia32' | 'arm64'" + extra_config: + type: string + required: false + description: "Additional configuration for config.json to be inserted for this build." version: type: string required: false @@ -105,6 +109,20 @@ jobs: - name: Install Deps run: "yarn install --frozen-lockfile" + - name: Insert config snippet + if: inputs.extra_config != '' + shell: bash + run: | + mkdir config-edit + yarn asar extract webapp.asar config-edit + cd config-edit + mv config.json old-config.json + echo ${{ inputs.extra_config }} | jq -s '.[0] * .[1]' old-config.json - > config.json + rm old-config.json + rm webapp.asar + cd .. + yarn asar pack config-edit/ webpack.asar + - name: Set up sqlcipher macros if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm') shell: pwsh From 7c17bdcafe2b95710ba63810b8e7aa7955425ec3 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:04:10 +0000 Subject: [PATCH 08/38] switch order --- .github/workflows/build_windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index c21b0bcf..6baf3478 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -119,8 +119,8 @@ jobs: mv config.json old-config.json echo ${{ inputs.extra_config }} | jq -s '.[0] * .[1]' old-config.json - > config.json rm old-config.json - rm webapp.asar cd .. + rm webapp.asar yarn asar pack config-edit/ webpack.asar - name: Set up sqlcipher macros From 782ba453cfb6f4260ca8222058722565f3ce5b30 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:08:20 +0000 Subject: [PATCH 09/38] drop build_and_deploy.yaml changes --- .github/workflows/build_and_deploy.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index 11d1d85e..7c45433a 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -63,18 +63,10 @@ jobs: strategy: matrix: arch: [ia32, x64, arm64] - include: - - arch: ia32 - extra_config: |- - "user_notice": { - "title": "Element will no longer be available for this platform soon", - "description": "Support for 32-bit Windows installations will be removed in the next release." - } uses: ./.github/workflows/build_windows.yaml secrets: inherit with: sign: true - extra_config: ${{ matrix.extra_config }} arch: ${{ matrix.arch }} version: ${{ needs.prepare.outputs.nightly-version }} From 3c4791f7ce76aebfa33aba00afc91ac7036a0467 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:08:22 +0000 Subject: [PATCH 10/38] use var mapper --- .github/workflows/build_windows.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 6baf3478..f44abca0 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -60,7 +60,11 @@ jobs: "ia32": { "target": "i686-pc-windows-msvc", "build-args": "--ia32", - "arch": "x86" + "arch": "x86", + "extra_config": { + "title": "Element will no longer be available for this platform soon", + "description": "Support for 32-bit Windows installations will be removed in the next release." + } } } @@ -110,14 +114,14 @@ jobs: run: "yarn install --frozen-lockfile" - name: Insert config snippet - if: inputs.extra_config != '' + if: steps.config.outputs.extra_config != '' shell: bash run: | mkdir config-edit yarn asar extract webapp.asar config-edit cd config-edit mv config.json old-config.json - echo ${{ inputs.extra_config }} | jq -s '.[0] * .[1]' old-config.json - > config.json + echo ${{ steps.config.outputs.extra_config }} | jq -s '.[0] * .[1]' old-config.json - > config.json rm old-config.json cd .. rm webapp.asar From 0bb7ccb0541a6782917375aea67f578f2b7d8647 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:09:19 +0000 Subject: [PATCH 11/38] that's actually a config now --- .github/workflows/build_windows.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index f44abca0..06ad34a9 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -22,10 +22,6 @@ on: type: string required: true description: "The architecture to build for, one of 'x64' | 'ia32' | 'arm64'" - extra_config: - type: string - required: false - description: "Additional configuration for config.json to be inserted for this build." version: type: string required: false @@ -62,8 +58,10 @@ jobs: "build-args": "--ia32", "arch": "x86", "extra_config": { - "title": "Element will no longer be available for this platform soon", - "description": "Support for 32-bit Windows installations will be removed in the next release." + "user_notice": { + "title": "Element will no longer be available for this platform soon", + "description": "Support for 32-bit Windows installations will be removed in the next release." + } } } } From 63f29006fc3fe8e443c72516d3eb4de3b0855f6a Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:13:43 +0000 Subject: [PATCH 12/38] escaped --- .github/workflows/build_windows.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 06ad34a9..0468ab48 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -57,11 +57,11 @@ jobs: "target": "i686-pc-windows-msvc", "build-args": "--ia32", "arch": "x86", - "extra_config": { - "user_notice": { - "title": "Element will no longer be available for this platform soon", - "description": "Support for 32-bit Windows installations will be removed in the next release." - } + "extra_config": "{ + \"user_notice\": { + \"title\": \"Element will no longer be available for this platform soon\", + \"description\": \"Support for 32-bit Windows installations will be removed in the next release.\" + }" } } } From ae17facfe0b0b8cfd6358d018ab9660c2c07186d Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:17:24 +0000 Subject: [PATCH 13/38] off by one brackets --- .github/workflows/build_windows.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 0468ab48..d9b291f3 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -58,9 +58,10 @@ jobs: "build-args": "--ia32", "arch": "x86", "extra_config": "{ - \"user_notice\": { - \"title\": \"Element will no longer be available for this platform soon\", - \"description\": \"Support for 32-bit Windows installations will be removed in the next release.\" + \"user_notice\": { + \"title\": \"Element will no longer be available for this platform soon\", + \"description\": \"Support for 32-bit Windows installations will be removed in the next release.\" + } }" } } From d61c284d8e14343a8fecd84c66d07566f83b2d1a Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:20:13 +0000 Subject: [PATCH 14/38] drop newlines --- .github/workflows/build_windows.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index d9b291f3..a1aaa6a7 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -57,12 +57,7 @@ jobs: "target": "i686-pc-windows-msvc", "build-args": "--ia32", "arch": "x86", - "extra_config": "{ - \"user_notice\": { - \"title\": \"Element will no longer be available for this platform soon\", - \"description\": \"Support for 32-bit Windows installations will be removed in the next release.\" - } - }" + "extra_config": "{\"user_notice\": {\"title\": \"Element will no longer be available for this platform soon\",\"description\": \"Support for 32-bit Windows installations will be removed in the next release.\"}}" } } } From 50836358dcd622cfb9546d4b3e9a41ecb5ef452b Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:22:26 +0000 Subject: [PATCH 15/38] another bracket -_- --- .github/workflows/build_windows.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index a1aaa6a7..014c8075 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -58,7 +58,6 @@ jobs: "build-args": "--ia32", "arch": "x86", "extra_config": "{\"user_notice\": {\"title\": \"Element will no longer be available for this platform soon\",\"description\": \"Support for 32-bit Windows installations will be removed in the next release.\"}}" - } } } From f2319fc1733fd6e9304b8d9cc874c9e427b7b207 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:29:19 +0000 Subject: [PATCH 16/38] quote --- .github/workflows/build_windows.yaml | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 014c8075..10a36835 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -67,6 +67,21 @@ jobs: with: name: webapp + - name: Insert config snippet + if: steps.config.outputs.extra_config != '' + shell: bash + run: | + mkdir config-edit + yarn asar extract webapp.asar config-edit + cd config-edit + mv config.json old-config.json + echo '${{ steps.config.outputs.extra_config }}' | jq -s '.[0] * .[1]' old-config.json - > config.json + rm old-config.json + cd .. + rm webapp.asar + yarn asar pack config-edit/ webpack.asar + + - name: Cache .hak id: cache uses: actions/cache@v4 @@ -106,20 +121,6 @@ jobs: - name: Install Deps run: "yarn install --frozen-lockfile" - - name: Insert config snippet - if: steps.config.outputs.extra_config != '' - shell: bash - run: | - mkdir config-edit - yarn asar extract webapp.asar config-edit - cd config-edit - mv config.json old-config.json - echo ${{ steps.config.outputs.extra_config }} | jq -s '.[0] * .[1]' old-config.json - > config.json - rm old-config.json - cd .. - rm webapp.asar - yarn asar pack config-edit/ webpack.asar - - name: Set up sqlcipher macros if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm') shell: pwsh From 0fc37c929a4ad8bf3deb586d4e8721a199a34e9f Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:31:42 +0000 Subject: [PATCH 17/38] wait til after deps install --- .github/workflows/build_windows.yaml | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 10a36835..7a25817d 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -67,21 +67,6 @@ jobs: with: name: webapp - - name: Insert config snippet - if: steps.config.outputs.extra_config != '' - shell: bash - run: | - mkdir config-edit - yarn asar extract webapp.asar config-edit - cd config-edit - mv config.json old-config.json - echo '${{ steps.config.outputs.extra_config }}' | jq -s '.[0] * .[1]' old-config.json - > config.json - rm old-config.json - cd .. - rm webapp.asar - yarn asar pack config-edit/ webpack.asar - - - name: Cache .hak id: cache uses: actions/cache@v4 @@ -121,6 +106,21 @@ jobs: - name: Install Deps run: "yarn install --frozen-lockfile" + - name: Insert config snippet + if: steps.config.outputs.extra_config != '' + shell: bash + run: | + mkdir config-edit + yarn asar extract webapp.asar config-edit + cd config-edit + mv config.json old-config.json + echo '${{ steps.config.outputs.extra_config }}' | jq -s '.[0] * .[1]' old-config.json - > config.json + rm old-config.json + cd .. + rm webapp.asar + yarn asar pack config-edit/ webpack.asar + + - name: Set up sqlcipher macros if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm') shell: pwsh From 783d0f15b88246e9eca27ea428bc2c04b83c28c6 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 10:32:27 +0000 Subject: [PATCH 18/38] lint --- .github/workflows/build_windows.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 7a25817d..349daf56 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -110,16 +110,15 @@ jobs: if: steps.config.outputs.extra_config != '' shell: bash run: | - mkdir config-edit - yarn asar extract webapp.asar config-edit - cd config-edit - mv config.json old-config.json - echo '${{ steps.config.outputs.extra_config }}' | jq -s '.[0] * .[1]' old-config.json - > config.json - rm old-config.json - cd .. - rm webapp.asar - yarn asar pack config-edit/ webpack.asar - + mkdir config-edit + yarn asar extract webapp.asar config-edit + cd config-edit + mv config.json old-config.json + echo '${{ steps.config.outputs.extra_config }}' | jq -s '.[0] * .[1]' old-config.json - > config.json + rm old-config.json + cd .. + rm webapp.asar + yarn asar pack config-edit/ webpack.asar - name: Set up sqlcipher macros if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm') From 5b0ab727457aeb07c9f5ce045f92ecb6ae046bc6 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 3 Mar 2025 11:00:48 +0000 Subject: [PATCH 19/38] s/webpack/webapp --- .github/workflows/build_windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 349daf56..2accbd5d 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -118,7 +118,7 @@ jobs: rm old-config.json cd .. rm webapp.asar - yarn asar pack config-edit/ webpack.asar + yarn asar pack config-edit/ webapp.asar - name: Set up sqlcipher macros if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.arch, 'arm') From f733c2e94217adeaee073d25ca41e6d2b727e0ab Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 3 Mar 2025 11:04:29 +0000 Subject: [PATCH 20/38] Switch to shiftkey/node-keytar as it has NAPI 10 updates (#2172) * Test keytar-forked Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Leverage electron-builder to build keytar rather than hak Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Add logging Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update imports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update knip.ts --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .node-version | 2 +- knip.ts | 1 - package.json | 4 ++-- src/ipc.ts | 2 +- src/seshat.ts | 2 +- yarn.lock | 22 +++++++++++----------- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.node-version b/.node-version index 43779377..c5ddcef4 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v22.13.1 \ No newline at end of file +v22.14.0 \ No newline at end of file diff --git a/knip.ts b/knip.ts index a2b79549..e6ddebdf 100644 --- a/knip.ts +++ b/knip.ts @@ -5,7 +5,6 @@ export default { project: ["**/*.{js,ts}"], ignoreDependencies: [ // Brought in via hak scripts - "keytar", "matrix-seshat", // Required for `action-validator` "@action-validator/*", diff --git a/package.json b/package.json index 026bc093..ba4ef9bd 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "type": "module", "files": [], "engines": { - "node": ">=18.0.0 <=22.13.1" + "node": ">=18.0.0" }, "scripts": { "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", @@ -63,7 +63,7 @@ "counterpart": "^0.18.6", "electron-store": "^10.0.0", "electron-window-state": "^5.0.3", - "keytar": "^7.9.0", + "keytar-forked": "7.10.0", "minimist": "^1.2.6", "png-to-ico": "^2.1.1", "uuid": "^11.0.0" diff --git a/src/ipc.ts b/src/ipc.ts index 9bbeb4e9..c2f6371d 100644 --- a/src/ipc.ts +++ b/src/ipc.ts @@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details. import { app, autoUpdater, desktopCapturer, ipcMain, powerSaveBlocker, TouchBar, nativeImage } from "electron"; import { relaunchApp } from "@standardnotes/electron-clear-data"; -import keytar from "keytar"; +import keytar from "keytar-forked"; import IpcMainEvent = Electron.IpcMainEvent; import { recordSSOSession } from "./protocol.js"; diff --git a/src/seshat.ts b/src/seshat.ts index ac467cd6..93f2e0b1 100644 --- a/src/seshat.ts +++ b/src/seshat.ts @@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details. import { app, ipcMain } from "electron"; import { promises as afs } from "node:fs"; import path from "node:path"; -import keytar from "keytar"; +import keytar from "keytar-forked"; import type { Seshat as SeshatType, diff --git a/yarn.lock b/yarn.lock index 0f154711..5febb57d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5123,13 +5123,13 @@ jszip@^3.1.0: readable-stream "~2.3.6" setimmediate "^1.0.5" -keytar@^7.9.0: - version "7.9.0" - resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" - integrity sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ== +keytar-forked@7.10.0: + version "7.10.0" + resolved "https://registry.yarnpkg.com/keytar-forked/-/keytar-forked-7.10.0.tgz#dbb78e16b18a40fc61df58124228855a7e8c912d" + integrity sha512-MrH3Id3Bjf4av3zGihBK62NucgBOVbTzchnSRPtA14sWRj9xu7roFa9NddlxC6Nt98EdrQpu04MZXnuusV+b5w== dependencies: - node-addon-api "^4.3.0" - prebuild-install "^7.0.1" + node-addon-api "^8.3.0" + prebuild-install "^7.1.3" keyv@^4.0.0, keyv@^4.5.3: version "4.5.4" @@ -5643,10 +5643,10 @@ node-addon-api@^1.6.3: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== -node-addon-api@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" - integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== +node-addon-api@^8.3.0: + version "8.3.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.3.1.tgz#53bc8a4f8dbde3de787b9828059da94ba9fd4eed" + integrity sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA== node-api-version@^0.2.0: version "0.2.0" @@ -6253,7 +6253,7 @@ postject@^1.0.0-alpha.6: dependencies: commander "^9.4.0" -prebuild-install@^7.0.1: +prebuild-install@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.3.tgz#d630abad2b147443f20a212917beae68b8092eec" integrity sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug== From e6ab8743d1d3dc68870b811138cb2ae4ea9ef7f7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 4 Mar 2025 09:18:37 +0000 Subject: [PATCH 21/38] Simplify workflows remove unused parameters (#2182) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/build_and_deploy.yaml | 1 - .github/workflows/build_and_test.yaml | 1 - .github/workflows/build_linux.yaml | 4 ---- .github/workflows/build_prepare.yaml | 7 ++----- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index 7c45433a..a033aa04 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -92,7 +92,6 @@ jobs: uses: ./.github/workflows/build_linux.yaml with: arch: ${{ matrix.arch }} - config: ${{ needs.prepare.outputs.config }} sqlcipher: ${{ matrix.sqlcipher }} version: ${{ needs.prepare.outputs.nightly-version }} diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index ea480bdb..2d677d7f 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -35,7 +35,6 @@ jobs: sqlcipher: [system, static] arch: [amd64, arm64] with: - config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }} sqlcipher: ${{ matrix.sqlcipher }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index 7f434dd3..207fcf74 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -8,10 +8,6 @@ on: type: string required: true description: "The architecture to build for, one of 'amd64' | 'arm64'" - config: - type: string - required: true - description: "The config directory to use" version: type: string required: false diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml index 4a28f26a..30c0b7cb 100644 --- a/.github/workflows/build_prepare.yaml +++ b/.github/workflows/build_prepare.yaml @@ -34,12 +34,9 @@ on: packages-dir: description: "The directory non-deb packages for this run should live in within packages.element.io" value: ${{ inputs.nightly && 'nightly' || 'desktop' }} - # These are just simple pass-throughs of the input to simplify reuse of complex inline conditions - config: - description: "The relative path to the config file for this run" - value: ${{ inputs.config }} + # This is just a simple pass-through of the input to simplify reuse of complex inline conditions deploy: - description: "The relative path to the config file for this run" + description: "Whether the build should be deployed to production" value: ${{ inputs.deploy }} permissions: {} jobs: From 2669b2adebab9d3d7476f615a07c280de26e542e Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Tue, 4 Mar 2025 09:57:29 +0000 Subject: [PATCH 22/38] Update notice --- .github/workflows/build_windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 2accbd5d..be95f9b7 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -57,7 +57,7 @@ jobs: "target": "i686-pc-windows-msvc", "build-args": "--ia32", "arch": "x86", - "extra_config": "{\"user_notice\": {\"title\": \"Element will no longer be available for this platform soon\",\"description\": \"Support for 32-bit Windows installations will be removed in the next release.\"}}" + "extra_config": "{\"user_notice\": {\"title\": \"Your desktop support ends soon\",\"description\": \"Support for 32-bit Windows installations will end soon, this impacts you. Transition to the web or mobile app for continued access.\"}}" } } From 2fdd591e09bb2f778993651c129670385ca23d65 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 4 Mar 2025 12:55:52 +0000 Subject: [PATCH 23/38] v1.11.95-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba4ef9bd..a49c8cfc 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Element", "main": "lib/electron-main.js", "exports": "./lib/electron-main.js", - "version": "1.11.94", + "version": "1.11.95-rc.0", "description": "Element: the future of secure communication", "author": "Element", "homepage": "https://element.io", From 76a5dcf5c8a639452fa1ca32ffef13b08a26283e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:35:40 +0000 Subject: [PATCH 24/38] Update all non-major dependencies (#2185) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5febb57d..625f2924 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3768,9 +3768,9 @@ eslint-config-google@^0.14.0: integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw== eslint-config-prettier@^10.0.0: - version "10.0.1" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz#fbb03bfc8db0651df9ce4e8b7150d11c5fe3addf" - integrity sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw== + version "10.0.2" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.0.2.tgz#47444de8aa104ce82c2f91ad2a5e96b62c01e20d" + integrity sha512-1105/17ZIMjmCOJOPNfVdbXafLCLj3hPmkmB7dLgt7XsQ/zkxSuDerE/xgO3RxoHysR1N1whmquY0lSn2O0VLg== eslint-import-resolver-node@^0.3.9: version "0.3.9" @@ -4057,9 +4057,9 @@ fast-uri@^3.0.1: integrity sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw== fastq@^1.15.0, fastq@^1.6.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.0.tgz#a82c6b7c2bb4e44766d865f07997785fecfdcb89" - integrity sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA== + version "1.19.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5" + integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ== dependencies: reusify "^1.0.4" @@ -5139,9 +5139,9 @@ keyv@^4.0.0, keyv@^4.5.3: json-buffer "3.0.1" knip@^5.0.0: - version "5.44.4" - resolved "https://registry.yarnpkg.com/knip/-/knip-5.44.4.tgz#7305dceeb934eb0eecc3e7244b5840524d3c8ec3" - integrity sha512-Ryn8LwWHLId8jSK1DgtT0hmg5DbzkqAtH+Gg3vZJpmSMgGHMspej9Ag+qKTm8wsPLDjVetuEz/lIsobo0XCMvQ== + version "5.45.0" + resolved "https://registry.yarnpkg.com/knip/-/knip-5.45.0.tgz#18eda62ffca7ec9cbee7732470b8415ae29e2d8f" + integrity sha512-OUyO9FUEVCM6/j0gl+PP/LDeJEs4hIdE8n4vK4xrtjN1g3Qu4Ws1oexbWTCJ+8xt8Tgse4Yvhx96OqF/UVl3Ug== dependencies: "@nodelib/fs.walk" "3.0.1" "@snyk/github-codeowners" "1.1.0" @@ -6277,9 +6277,9 @@ prelude-ls@^1.2.1: integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== prettier@^3.0.0: - version "3.5.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.1.tgz#22fac9d0b18c0b92055ac8fb619ac1c7bef02fb7" - integrity sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw== + version "3.5.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5" + integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw== pretty-ms@^9.0.0: version "9.2.0" @@ -6570,9 +6570,9 @@ retry@^0.12.0: integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f" + integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw== rfdc@^1.4.1: version "1.4.1" From d57ac6f016bc2311abd5489c7c4fcd479bec2821 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:35:48 +0000 Subject: [PATCH 25/38] Update docker (#2184) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/build_linux.yaml | 2 +- .github/workflows/dockerbuild.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index 207fcf74..d2ff9d57 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -91,7 +91,7 @@ jobs: # This allows contributors to test changes to the dockerbuild image within a pull request - name: Build docker image - uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6 + uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6 if: steps.changed_files.outputs.any_modified == 'true' with: file: dockerbuild/Dockerfile diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index d2af9801..644c005d 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -22,15 +22,15 @@ jobs: - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3 + uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3 + uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3 with: install: true - name: Build test image - uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6 + uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6 with: file: dockerbuild/Dockerfile push: false @@ -52,7 +52,7 @@ jobs: - name: Extract metadata for Docker id: meta if: github.event_name != 'pull_request' - uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5 + uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | @@ -61,7 +61,7 @@ jobs: - name: Build and push Docker image if: github.event_name != 'pull_request' - uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6 + uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6 with: file: dockerbuild/Dockerfile push: true From 566b32041dc3368f7292a5b58450b7d5f2da68ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:43:52 +0000 Subject: [PATCH 26/38] Update dependency @types/node to v18.19.78 (#2186) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ba4ef9bd..49f49d19 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@types/auto-launch": "^5.0.1", "@types/counterpart": "^0.18.1", "@types/minimist": "^1.2.1", - "@types/node": "18.19.76", + "@types/node": "18.19.78", "@types/pacote": "^11.1.1", "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", @@ -116,7 +116,7 @@ "matrix-seshat": "^4.0.1" }, "resolutions": { - "@types/node": "18.19.76", + "@types/node": "18.19.78", "config-file-ts": "0.2.8-rc1" } } diff --git a/yarn.lock b/yarn.lock index 625f2924..63109ac5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2178,10 +2178,10 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node@*", "@types/node@18.19.76", "@types/node@^17.0.36", "@types/node@^20.9.0": - version "18.19.76" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.76.tgz#7991658e0ba41ad30cc8be01c9bbe580d58f2112" - integrity sha512-yvR7Q9LdPz2vGpmpJX5LolrgRdWvB67MJKDPSgIIzpFbaf9a1j/f5DnLp5VDyHGMR0QZHlTr1afsD87QCXFHKw== +"@types/node@*", "@types/node@18.19.78", "@types/node@^17.0.36", "@types/node@^20.9.0": + version "18.19.78" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.78.tgz#29f5e7b947840c7aa9050ecac920fe6b1c7646a0" + integrity sha512-m1ilZCTwKLkk9rruBJXFeYN0Bc5SbjirwYX/Td3MqPfioYbgun3IvK/m8dQxMCnrPGZPg1kvXjp3SIekCN/ynw== dependencies: undici-types "~5.26.4" From e36b3b3ce1c5d46a7a298489e192d782d4d43077 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:46:58 +0000 Subject: [PATCH 27/38] Update dependency electron to v34.3.0 (#2188) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 49f49d19..6c72a685 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "app-builder-lib": "26.0.8", "chokidar": "^4.0.0", "detect-libc": "^2.0.0", - "electron": "34.2.0", + "electron": "34.3.0", "electron-builder": "26.0.8", "electron-builder-squirrel-windows": "26.0.8", "electron-devtools-installer": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 63109ac5..5198bbc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3529,10 +3529,10 @@ electron-winstaller@5.4.0: optionalDependencies: "@electron/windows-sign" "^1.1.2" -electron@34.2.0: - version "34.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-34.2.0.tgz#3cec06c34f47f0e86956be71629b485b290bafd1" - integrity sha512-SYwBJNeXBTm1q/ErybQMUBZAYqEreBUqBwTrNkw1rV4YatDZk5Aittpcus3PPeC4UoI/tqmJ946uG8AKHTd6CA== +electron@34.3.0: + version "34.3.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.0.tgz#d52a5bd14c72a5811a0c0e233db5c20ad70ba078" + integrity sha512-I238qRnYTAsuwJ/rS7HGaFNY4NNKAcjX8nlj7mnNmj1TK3z4HvNoD1r7Zud81DYDFx8AITuLd76EPrEnnfF9Bg== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0" From bbcb7c04384c31b1e1bb2a4fa7cc217f68f3c088 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:47:13 +0000 Subject: [PATCH 28/38] Update dependency typescript to v5.8.2 (#2189) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6c72a685..95ef9641 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "rimraf": "^6.0.0", "tar": "^7.0.0", "tsx": "^4.19.2", - "typescript": "5.7.3" + "typescript": "5.8.2" }, "hakDependencies": { "matrix-seshat": "^4.0.1" diff --git a/yarn.lock b/yarn.lock index 5198bbc3..6dd1207b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7331,10 +7331,10 @@ typed-array-length@^1.0.6: is-typed-array "^1.1.13" possible-typed-array-names "^1.0.0" -typescript@5.7.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e" - integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw== +typescript@5.8.2: + version "5.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4" + integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ== typescript@^5.4.3: version "5.5.4" From 960ff865fb841a5258f05d9e0482ec1c5632d358 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:47:39 +0000 Subject: [PATCH 29/38] Update dependency @sentry/electron to v6 (#2191) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 550 ++++++++++++++++++++++++++------------------------- 2 files changed, 279 insertions(+), 273 deletions(-) diff --git a/package.json b/package.json index 95ef9641..8bdc7084 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "postinstall": "electron-builder install-app-deps" }, "dependencies": { - "@sentry/electron": "^5.0.0", + "@sentry/electron": "^6.0.0", "@standardnotes/electron-clear-data": "^1.0.5", "auto-launch": "^5.0.5", "counterpart": "^0.18.6", diff --git a/yarn.lock b/yarn.lock index 6dd1207b..e06f87ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1555,13 +1555,6 @@ proc-log "^5.0.0" which "^4.0.0" -"@opentelemetry/api-logs@0.53.0": - version "0.53.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.53.0.tgz#c478cbd8120ec2547b64edfa03a552cfe42170be" - integrity sha512-8HArjKx+RaAI8uEIgcORbZIPklyh1YLjPSBus8hjRmvLi6DeFzgOcdZ7KwPabKj8mXF8dX0hyfAyGfycz0DbFw== - dependencies: - "@opentelemetry/api" "^1.0.0" - "@opentelemetry/api-logs@0.56.0": version "0.56.0" resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.56.0.tgz#68f8c51ca905c260b610c8a3c67d3f9fa3d59a45" @@ -1569,239 +1562,250 @@ dependencies: "@opentelemetry/api" "^1.3.0" -"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.3.0", "@opentelemetry/api@^1.8", "@opentelemetry/api@^1.9.0": +"@opentelemetry/api-logs@0.57.1": + version "0.57.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.57.1.tgz#97ebd714f0b1fcdf896e85c465ae5c5b22747425" + integrity sha512-I4PHczeujhQAQv6ZBzqHYEUiggZL4IdSMixtVD3EYqbdrjujE7kRfI5QohjlPoJm8BvenoW5YaTMWRrbpot6tg== + dependencies: + "@opentelemetry/api" "^1.3.0" + +"@opentelemetry/api-logs@0.57.2": + version "0.57.2" + resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.57.2.tgz#d4001b9aa3580367b40fe889f3540014f766cc87" + integrity sha512-uIX52NnTM0iBh84MShlpouI7UKqkZ7MrUszTmaypHBu4r7NofznSnQRfJ+uUeDtQDj6w8eFGg5KBLDAwAPz1+A== + dependencies: + "@opentelemetry/api" "^1.3.0" + +"@opentelemetry/api@^1.3.0", "@opentelemetry/api@^1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe" integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg== -"@opentelemetry/context-async-hooks@^1.29.0": +"@opentelemetry/context-async-hooks@^1.30.1": version "1.30.1" resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-1.30.1.tgz#4f76280691a742597fd0bf682982126857622948" integrity sha512-s5vvxXPVdjqS3kTLKMeBMvop9hbWkwzBpu+mUO2M7sZtlkyDJGwFe33wRKnbaYDo8ExRVBIIdwIGrqpxHuKttA== -"@opentelemetry/core@1.29.0": - version "1.29.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.29.0.tgz#a9397dfd9a8b37b2435b5e44be16d39ec1c82bd9" - integrity sha512-gmT7vAreXl0DTHD2rVZcw3+l2g84+5XiHIqdBUxXbExymPCvSsGOpiwMmn8nkiJur28STV31wnhIDrzWDPzjfA== - dependencies: - "@opentelemetry/semantic-conventions" "1.28.0" - -"@opentelemetry/core@1.30.1", "@opentelemetry/core@^1.1.0", "@opentelemetry/core@^1.26.0", "@opentelemetry/core@^1.29.0", "@opentelemetry/core@^1.8.0": +"@opentelemetry/core@1.30.1", "@opentelemetry/core@^1.1.0", "@opentelemetry/core@^1.26.0", "@opentelemetry/core@^1.30.1", "@opentelemetry/core@^1.8.0": version "1.30.1" resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.30.1.tgz#a0b468bb396358df801881709ea38299fc30ab27" integrity sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ== dependencies: "@opentelemetry/semantic-conventions" "1.28.0" -"@opentelemetry/instrumentation-amqplib@^0.45.0": - version "0.45.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.45.0.tgz#747d72e38ff89266670e730ead90b85b6edc62d3" - integrity sha512-SlKLsOS65NGMIBG1Lh/hLrMDU9WzTUF25apnV6ZmWZB1bBmUwan7qrwwrTu1cL5LzJWCXOdZPuTaxP7pC9qxnQ== +"@opentelemetry/instrumentation-amqplib@^0.46.0": + version "0.46.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.46.1.tgz#7101678488d0e942162ca85c9ac6e93e1f3e0008" + integrity sha512-AyXVnlCf/xV3K/rNumzKxZqsULyITJH6OVLiW6730JPRqWA7Zc9bvYoVNpN6iOpTU8CasH34SU/ksVJmObFibQ== dependencies: "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.1" "@opentelemetry/semantic-conventions" "^1.27.0" -"@opentelemetry/instrumentation-connect@0.42.0": - version "0.42.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.42.0.tgz#daebedbe65068746c9db0eee6e3a636a0912d251" - integrity sha512-bOoYHBmbnq/jFaLHmXJ55VQ6jrH5fHDMAPjFM0d3JvR0dvIqW7anEoNC33QqYGFYUfVJ50S0d/eoyF61ALqQuA== +"@opentelemetry/instrumentation-connect@0.43.0": + version "0.43.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.43.0.tgz#411035f4a8f2e498dbfa7300e545c58586a062e2" + integrity sha512-Q57JGpH6T4dkYHo9tKXONgLtxzsh1ZEW5M9A/OwKrZFyEpLqWgjhcZ3hIuVvDlhb426iDF1f9FPToV/mi5rpeA== dependencies: "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/semantic-conventions" "^1.27.0" "@types/connect" "3.4.36" -"@opentelemetry/instrumentation-dataloader@0.15.0": - version "0.15.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.15.0.tgz#c3ac6f41672961a489080edd2c59aceebe412798" - integrity sha512-5fP35A2jUPk4SerVcduEkpbRAIoqa2PaP5rWumn01T1uSbavXNccAr3Xvx1N6xFtZxXpLJq4FYqGFnMgDWgVng== +"@opentelemetry/instrumentation-dataloader@0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.16.0.tgz#913345c335f67bf8e17a9b38c227dba741fe488b" + integrity sha512-88+qCHZC02up8PwKHk0UQKLLqGGURzS3hFQBZC7PnGwReuoKjHXS1o29H58S+QkXJpkTr2GACbx8j6mUoGjNPA== dependencies: - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" -"@opentelemetry/instrumentation-express@0.46.0": - version "0.46.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.46.0.tgz#8dfbc9dc567e2e864a00a6a7edfbec2dd8482056" - integrity sha512-BCEClDj/HPq/1xYRAlOr6z+OUnbp2eFp18DSrgyQz4IT9pkdYk8eWHnMi9oZSqlC6J5mQzkFmaW5RrKb1GLQhg== +"@opentelemetry/instrumentation-express@0.47.0": + version "0.47.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.47.0.tgz#f0477db3b1f4b342beb9ecd08edc26c470566724" + integrity sha512-XFWVx6k0XlU8lu6cBlCa29ONtVt6ADEjmxtyAyeF2+rifk8uBJbk1La0yIVfI0DoKURGbaEDTNelaXG9l/lNNQ== dependencies: "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/semantic-conventions" "^1.27.0" -"@opentelemetry/instrumentation-fastify@0.43.0": +"@opentelemetry/instrumentation-fastify@0.44.1": + version "0.44.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.44.1.tgz#c8080f24a6fbdd14689c619ad7b14fe189b10f28" + integrity sha512-RoVeMGKcNttNfXMSl6W4fsYoCAYP1vi6ZAWIGhBY+o7R9Y0afA7f9JJL0j8LHbyb0P0QhSYk+6O56OwI2k4iRQ== + dependencies: + "@opentelemetry/core" "^1.8.0" + "@opentelemetry/instrumentation" "^0.57.0" + "@opentelemetry/semantic-conventions" "^1.27.0" + +"@opentelemetry/instrumentation-fs@0.19.0": + version "0.19.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.19.0.tgz#a44807aea97edc64c597d6a5b5b8637b7ab45057" + integrity sha512-JGwmHhBkRT2G/BYNV1aGI+bBjJu4fJUD/5/Jat0EWZa2ftrLV3YE8z84Fiij/wK32oMZ88eS8DI4ecLGZhpqsQ== + dependencies: + "@opentelemetry/core" "^1.8.0" + "@opentelemetry/instrumentation" "^0.57.0" + +"@opentelemetry/instrumentation-generic-pool@0.43.0": version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.43.0.tgz#855e259733bd75e21cb54cc110a7910861b200a4" - integrity sha512-Lmdsg7tYiV+K3/NKVAQfnnLNGmakUOFdB0PhoTh2aXuSyCmyNnnDvhn2MsArAPTZ68wnD5Llh5HtmiuTkf+DyQ== + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.43.0.tgz#b1769eb0e30f2abb764a9cbc811aa3d4560ecc24" + integrity sha512-at8GceTtNxD1NfFKGAuwtqM41ot/TpcLh+YsGe4dhf7gvv1HW/ZWdq6nfRtS6UjIvZJOokViqLPJ3GVtZItAnQ== + dependencies: + "@opentelemetry/instrumentation" "^0.57.0" + +"@opentelemetry/instrumentation-graphql@0.47.0": + version "0.47.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.47.0.tgz#271807e21a6224bd1986a3e9887650f1858ee733" + integrity sha512-Cc8SMf+nLqp0fi8oAnooNEfwZWFnzMiBHCGmDFYqmgjPylyLmi83b+NiTns/rKGwlErpW0AGPt0sMpkbNlzn8w== + dependencies: + "@opentelemetry/instrumentation" "^0.57.0" + +"@opentelemetry/instrumentation-hapi@0.45.1": + version "0.45.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.45.1.tgz#5edf982549070d95e20152d568279548ad44d662" + integrity sha512-VH6mU3YqAKTePPfUPwfq4/xr049774qWtfTuJqVHoVspCLiT3bW+fCQ1toZxt6cxRPYASoYaBsMA3CWo8B8rcw== dependencies: "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/semantic-conventions" "^1.27.0" -"@opentelemetry/instrumentation-fs@0.18.0": - version "0.18.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.18.0.tgz#6ef0e58cda3212ce2cd17bddc4dd74f768fd74c0" - integrity sha512-kC40y6CEMONm8/MWwoF5GHWIC7gOdF+g3sgsjfwJaUkgD6bdWV+FgG0XApqSbTQndICKzw3RonVk8i7s6mHqhA== +"@opentelemetry/instrumentation-http@0.57.1": + version "0.57.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.57.1.tgz#2d8b395df62191475e76fa0eb7bf60079ea886b9" + integrity sha512-ThLmzAQDs7b/tdKI3BV2+yawuF09jF111OFsovqT1Qj3D8vjwKBwhi/rDE5xethwn4tSXtZcJ9hBsVAlWFQZ7g== dependencies: - "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" - -"@opentelemetry/instrumentation-generic-pool@0.42.0": - version "0.42.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.42.0.tgz#6c6c6dcf2300e803acb22b2b914c6053acb80bf3" - integrity sha512-J4QxqiQ1imtB9ogzsOnHra0g3dmmLAx4JCeoK3o0rFes1OirljNHnO8Hsj4s1jAir8WmWvnEEQO1y8yk6j2tog== - dependencies: - "@opentelemetry/instrumentation" "^0.56.0" - -"@opentelemetry/instrumentation-graphql@0.46.0": - version "0.46.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.46.0.tgz#fbcf0844656c759294c03c30c471fc4862209a01" - integrity sha512-tplk0YWINSECcK89PGM7IVtOYenXyoOuhOQlN0X0YrcDUfMS4tZMKkVc0vyhNWYYrexnUHwNry2YNBNugSpjlQ== - dependencies: - "@opentelemetry/instrumentation" "^0.56.0" - -"@opentelemetry/instrumentation-hapi@0.44.0": - version "0.44.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.44.0.tgz#5b4524bef636209ba6cc95cfbb976b605c2946cd" - integrity sha512-4HdNIMNXWK1O6nsaQOrACo83QWEVoyNODTdVDbUqtqXiv2peDfD0RAPhSQlSGWLPw3S4d9UoOmrV7s2HYj6T2A== - dependencies: - "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" - "@opentelemetry/semantic-conventions" "^1.27.0" - -"@opentelemetry/instrumentation-http@0.56.0": - version "0.56.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.56.0.tgz#f7a9e1bb4126c0d918775c1368a42b8afd5a48a2" - integrity sha512-/bWHBUAq8VoATnH9iLk5w8CE9+gj+RgYSUphe7hry472n6fYl7+4PvuScoQMdmSUTprKq/gyr2kOWL6zrC7FkQ== - dependencies: - "@opentelemetry/core" "1.29.0" - "@opentelemetry/instrumentation" "0.56.0" + "@opentelemetry/core" "1.30.1" + "@opentelemetry/instrumentation" "0.57.1" "@opentelemetry/semantic-conventions" "1.28.0" forwarded-parse "2.1.2" semver "^7.5.2" -"@opentelemetry/instrumentation-ioredis@0.46.0": - version "0.46.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.46.0.tgz#ec230466813f8ce82eb9ca9b23308ccfa460ce2b" - integrity sha512-sOdsq8oGi29V58p1AkefHvuB3l2ymP1IbxRIX3y4lZesQWKL8fLhBmy8xYjINSQ5gHzWul2yoz7pe7boxhZcqQ== +"@opentelemetry/instrumentation-ioredis@0.47.0": + version "0.47.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.47.0.tgz#f83bd133d36d137d2d0b58bfbdfe12ed6fe5ab2f" + integrity sha512-4HqP9IBC8e7pW9p90P3q4ox0XlbLGme65YTrA3UTLvqvo4Z6b0puqZQP203YFu8m9rE/luLfaG7/xrwwqMUpJw== dependencies: - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/redis-common" "^0.36.2" "@opentelemetry/semantic-conventions" "^1.27.0" -"@opentelemetry/instrumentation-kafkajs@0.6.0": - version "0.6.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.6.0.tgz#5d1c6738da8e270acde9259521a9c6e0f421490c" - integrity sha512-MGQrzqEUAl0tacKJUFpuNHJesyTi51oUzSVizn7FdvJplkRIdS11FukyZBZJEscofSEdk7Ycmg+kNMLi5QHUFg== +"@opentelemetry/instrumentation-kafkajs@0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.7.0.tgz#079b949ec814b42e49d23bb4d4f73735fe460d52" + integrity sha512-LB+3xiNzc034zHfCtgs4ITWhq6Xvdo8bsq7amR058jZlf2aXXDrN9SV4si4z2ya9QX4tz6r4eZJwDkXOp14/AQ== dependencies: - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/semantic-conventions" "^1.27.0" -"@opentelemetry/instrumentation-knex@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.43.0.tgz#1f45cfea69212bd579e4fa95c6d5cccdd9626b8e" - integrity sha512-mOp0TRQNFFSBj5am0WF67fRO7UZMUmsF3/7HSDja9g3H4pnj+4YNvWWyZn4+q0rGrPtywminAXe0rxtgaGYIqg== - dependencies: - "@opentelemetry/instrumentation" "^0.56.0" - "@opentelemetry/semantic-conventions" "^1.27.0" - -"@opentelemetry/instrumentation-koa@0.46.0": - version "0.46.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.46.0.tgz#bcdfb29f3b41be45355a9aa278fb231e19eb02e5" - integrity sha512-RcWXMQdJQANnPUaXbHY5G0Fg6gmleZ/ZtZeSsekWPaZmQq12FGk0L1UwodIgs31OlYfviAZ4yTeytoSUkgo5vQ== - dependencies: - "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" - "@opentelemetry/semantic-conventions" "^1.27.0" - -"@opentelemetry/instrumentation-lru-memoizer@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.43.0.tgz#7d3f524a10715d9f681e8d4ee6bfe91be80c82cf" - integrity sha512-fZc+1eJUV+tFxaB3zkbupiA8SL3vhDUq89HbDNg1asweYrEb9OlHIB+Ot14ZiHUc1qCmmWmZHbPTwa56mVVwzg== - dependencies: - "@opentelemetry/instrumentation" "^0.56.0" - -"@opentelemetry/instrumentation-mongodb@0.50.0": - version "0.50.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.50.0.tgz#e5c60ad0bfbdd8ac3238c255a0662b7430083303" - integrity sha512-DtwJMjYFXFT5auAvv8aGrBj1h3ciA/dXQom11rxL7B1+Oy3FopSpanvwYxJ+z0qmBrQ1/iMuWELitYqU4LnlkQ== - dependencies: - "@opentelemetry/instrumentation" "^0.56.0" - "@opentelemetry/semantic-conventions" "^1.27.0" - -"@opentelemetry/instrumentation-mongoose@0.45.0": - version "0.45.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.45.0.tgz#c8179827769fac8528b681da5888ae1779bd844b" - integrity sha512-zHgNh+A01C5baI2mb5dAGyMC7DWmUpOfwpV8axtC0Hd5Uzqv+oqKgKbVDIVhOaDkPxjgVJwYF9YQZl2pw2qxIA== - dependencies: - "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" - "@opentelemetry/semantic-conventions" "^1.27.0" - -"@opentelemetry/instrumentation-mysql2@0.44.0": +"@opentelemetry/instrumentation-knex@0.44.0": version "0.44.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.44.0.tgz#309d3fa452d4fcb632c4facb68ed7ea74b6738f9" - integrity sha512-e9QY4AGsjGFwmfHd6kBa4yPaQZjAq2FuxMb0BbKlXCAjG+jwqw+sr9xWdJGR60jMsTq52hx3mAlE3dUJ9BipxQ== + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.44.0.tgz#af251ed38f06a2f248812c5addf0266697b6149a" + integrity sha512-SlT0+bLA0Lg3VthGje+bSZatlGHw/vwgQywx0R/5u9QC59FddTQSPJeWNw29M6f8ScORMeUOOTwihlQAn4GkJQ== dependencies: - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" + "@opentelemetry/semantic-conventions" "^1.27.0" + +"@opentelemetry/instrumentation-koa@0.47.0": + version "0.47.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.47.0.tgz#a74b35809ba95d0f9db49e8c3f214bde475b095a" + integrity sha512-HFdvqf2+w8sWOuwtEXayGzdZ2vWpCKEQv5F7+2DSA74Te/Cv4rvb2E5So5/lh+ok4/RAIPuvCbCb/SHQFzMmbw== + dependencies: + "@opentelemetry/core" "^1.8.0" + "@opentelemetry/instrumentation" "^0.57.0" + "@opentelemetry/semantic-conventions" "^1.27.0" + +"@opentelemetry/instrumentation-lru-memoizer@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.44.0.tgz#c22e770d950c165f80c657a9c790c9843baaa65b" + integrity sha512-Tn7emHAlvYDFik3vGU0mdwvWJDwtITtkJ+5eT2cUquct6nIs+H8M47sqMJkCpyPe5QIBJoTOHxmc6mj9lz6zDw== + dependencies: + "@opentelemetry/instrumentation" "^0.57.0" + +"@opentelemetry/instrumentation-mongodb@0.51.0": + version "0.51.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.51.0.tgz#8a323c2fb4cb2c93bf95f1b1c0fcb30952d12a08" + integrity sha512-cMKASxCX4aFxesoj3WK8uoQ0YUrRvnfxaO72QWI2xLu5ZtgX/QvdGBlU3Ehdond5eb74c2s1cqRQUIptBnKz1g== + dependencies: + "@opentelemetry/instrumentation" "^0.57.0" + "@opentelemetry/semantic-conventions" "^1.27.0" + +"@opentelemetry/instrumentation-mongoose@0.46.0": + version "0.46.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.46.0.tgz#c3a5f69e1a5b950b542cf84650fbbd3e31bd681e" + integrity sha512-mtVv6UeaaSaWTeZtLo4cx4P5/ING2obSqfWGItIFSunQBrYROfhuVe7wdIrFUs2RH1tn2YYpAJyMaRe/bnTTIQ== + dependencies: + "@opentelemetry/core" "^1.8.0" + "@opentelemetry/instrumentation" "^0.57.0" + "@opentelemetry/semantic-conventions" "^1.27.0" + +"@opentelemetry/instrumentation-mysql2@0.45.0": + version "0.45.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.45.0.tgz#95501759d470dbc7038670e91205e8ed601ec402" + integrity sha512-qLslv/EPuLj0IXFvcE3b0EqhWI8LKmrgRPIa4gUd8DllbBpqJAvLNJSv3cC6vWwovpbSI3bagNO/3Q2SuXv2xA== + dependencies: + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/semantic-conventions" "^1.27.0" "@opentelemetry/sql-common" "^0.40.1" -"@opentelemetry/instrumentation-mysql@0.44.0": - version "0.44.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.44.0.tgz#a29af4432d4289ed9d147d9c30038c57031d950c" - integrity sha512-al7jbXvT/uT1KV8gdNDzaWd5/WXf+mrjrsF0/NtbnqLa0UUFGgQnoK3cyborgny7I+KxWhL8h7YPTf6Zq4nKsg== +"@opentelemetry/instrumentation-mysql@0.45.0": + version "0.45.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.45.0.tgz#e4df8bc709c0c8b0ff90bbef92fb36e92ebe0d19" + integrity sha512-tWWyymgwYcTwZ4t8/rLDfPYbOTF3oYB8SxnYMtIQ1zEf5uDm90Ku3i6U/vhaMyfHNlIHvDhvJh+qx5Nc4Z3Acg== dependencies: - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/semantic-conventions" "^1.27.0" "@types/mysql" "2.15.26" -"@opentelemetry/instrumentation-nestjs-core@0.43.0": - version "0.43.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.43.0.tgz#c176409ab5ebfac862298e31a6a149126e278700" - integrity sha512-NEo4RU7HTjiaXk3curqXUvCb9alRiFWxQY//+hvDXwWLlADX2vB6QEmVCeEZrKO+6I/tBrI4vNdAnbCY9ldZVg== - dependencies: - "@opentelemetry/instrumentation" "^0.56.0" - "@opentelemetry/semantic-conventions" "^1.27.0" - -"@opentelemetry/instrumentation-pg@0.49.0": - version "0.49.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.49.0.tgz#47a6a461099fae8e1ffbb97b715a0c34f0aec0b6" - integrity sha512-3alvNNjPXVdAPdY1G7nGRVINbDxRK02+KAugDiEpzw0jFQfU8IzFkSWA4jyU4/GbMxKvHD+XIOEfSjpieSodKw== +"@opentelemetry/instrumentation-pg@0.51.0": + version "0.51.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.51.0.tgz#7d20016a32554ef66c008212dee3ff33fb1a587c" + integrity sha512-/NStIcUWUofc11dL7tSgMk25NqvhtbHDCncgm+yc4iJF8Ste2Q/lwUitjfxqj4qWM280uFmBEtcmtMMjbjRU7Q== dependencies: "@opentelemetry/core" "^1.26.0" - "@opentelemetry/instrumentation" "^0.56.0" - "@opentelemetry/semantic-conventions" "1.27.0" + "@opentelemetry/instrumentation" "^0.57.0" + "@opentelemetry/semantic-conventions" "^1.27.0" "@opentelemetry/sql-common" "^0.40.1" "@types/pg" "8.6.1" "@types/pg-pool" "2.0.6" -"@opentelemetry/instrumentation-redis-4@0.45.0": - version "0.45.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.45.0.tgz#34115d39f7050b8576344d9e7f7cb8ceebf85067" - integrity sha512-Sjgym1xn3mdxPRH5CNZtoz+bFd3E3NlGIu7FoYr4YrQouCc9PbnmoBcmSkEdDy5LYgzNildPgsjx9l0EKNjKTQ== +"@opentelemetry/instrumentation-redis-4@0.46.0": + version "0.46.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.46.0.tgz#828704b8134f023730ac508bcf3a38ca4d5d697c" + integrity sha512-aTUWbzbFMFeRODn3720TZO0tsh/49T8H3h8vVnVKJ+yE36AeW38Uj/8zykQ/9nO8Vrtjr5yKuX3uMiG/W8FKNw== dependencies: - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/redis-common" "^0.36.2" "@opentelemetry/semantic-conventions" "^1.27.0" -"@opentelemetry/instrumentation-tedious@0.17.0": - version "0.17.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.17.0.tgz#689b7c87346f11b73488b3aa91661d15e8fa830c" - integrity sha512-yRBz2409an03uVd1Q2jWMt3SqwZqRFyKoWYYX3hBAtPDazJ4w5L+1VOij71TKwgZxZZNdDBXImTQjii+VeuzLg== +"@opentelemetry/instrumentation-tedious@0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.18.0.tgz#636745423db28e303b4e0289b8f69685cb36f807" + integrity sha512-9zhjDpUDOtD+coeADnYEJQ0IeLVCj7w/hqzIutdp5NqS1VqTAanaEfsEcSypyvYv5DX3YOsTUoF+nr2wDXPETA== dependencies: - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" "@opentelemetry/semantic-conventions" "^1.27.0" "@types/tedious" "^4.0.14" -"@opentelemetry/instrumentation-undici@0.9.0": - version "0.9.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.9.0.tgz#c0be1854a90a5002d2345f8bc939d659a9ad76b1" - integrity sha512-lxc3cpUZ28CqbrWcUHxGW/ObDpMOYbuxF/ZOzeFZq54P9uJ2Cpa8gcrC9F716mtuiMaekwk8D6n34vg/JtkkxQ== +"@opentelemetry/instrumentation-undici@0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.10.0.tgz#99cba213a6e9d47a82896b6c782c3f2d60e0edb5" + integrity sha512-vm+V255NGw9gaSsPD6CP0oGo8L55BffBc8KnxqsMuc6XiAD1L8SFNzsW0RHhxJFqy9CJaJh+YiJ5EHXuZ5rZBw== dependencies: "@opentelemetry/core" "^1.8.0" - "@opentelemetry/instrumentation" "^0.56.0" + "@opentelemetry/instrumentation" "^0.57.0" -"@opentelemetry/instrumentation@0.56.0", "@opentelemetry/instrumentation@^0.56.0": +"@opentelemetry/instrumentation@0.57.1": + version "0.57.1" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.57.1.tgz#5aea772be8783a35d69d643da46582f381ba1810" + integrity sha512-SgHEKXoVxOjc20ZYusPG3Fh+RLIZTSa4x8QtD3NfgAUDyqdFFS9W1F2ZVbZkqDCdyMcQG02Ok4duUGLHJXHgbA== + dependencies: + "@opentelemetry/api-logs" "0.57.1" + "@types/shimmer" "^1.2.0" + import-in-the-middle "^1.8.1" + require-in-the-middle "^7.1.1" + semver "^7.5.2" + shimmer "^1.2.1" + +"@opentelemetry/instrumentation@^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0": version "0.56.0" resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.56.0.tgz#3330ce16d9235a548efa1019a4a7f01414edd44a" integrity sha512-2KkGBKE+FPXU1F0zKww+stnlUxUTlBvLCiWdP63Z9sqXYeNI/ziNzsxAp4LAdUcTQmXjw1IWgvm5CAb/BHy99w== @@ -1813,12 +1817,12 @@ semver "^7.5.2" shimmer "^1.2.1" -"@opentelemetry/instrumentation@^0.49 || ^0.50 || ^0.51 || ^0.52.0 || ^0.53.0": - version "0.53.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.53.0.tgz#e6369e4015eb5112468a4d45d38dcada7dad892d" - integrity sha512-DMwg0hy4wzf7K73JJtl95m/e0boSoWhH07rfvHvYzQtBD3Bmv0Wc1x733vyZBqmFm8OjJD0/pfiUg1W3JjFX0A== +"@opentelemetry/instrumentation@^0.57.0", "@opentelemetry/instrumentation@^0.57.1": + version "0.57.2" + resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.57.2.tgz#8924549d7941ba1b5c6f04d5529cf48330456d1d" + integrity sha512-BdBGhQBh8IjZ2oIIX6F2/Q3LKm/FDDKi6ccYKcBTeilh6SNdNKveDOLk73BkSJjQLJk6qe4Yh+hHw1UPhCDdrg== dependencies: - "@opentelemetry/api-logs" "0.53.0" + "@opentelemetry/api-logs" "0.57.2" "@types/shimmer" "^1.2.0" import-in-the-middle "^1.8.1" require-in-the-middle "^7.1.1" @@ -1830,7 +1834,7 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz#906ac8e4d804d4109f3ebd5c224ac988276fdc47" integrity sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g== -"@opentelemetry/resources@1.30.1", "@opentelemetry/resources@^1.29.0": +"@opentelemetry/resources@1.30.1", "@opentelemetry/resources@^1.30.1": version "1.30.1" resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.30.1.tgz#a4eae17ebd96947fdc7a64f931ca4b71e18ce964" integrity sha512-5UxZqiAgLYGFjS4s9qm5mBVo433u+dSPUFWVWXmLAD4wB65oMCoXaJP1KJa9DIYYMeHu3z4BZcStG3LC593cWA== @@ -1838,7 +1842,7 @@ "@opentelemetry/core" "1.30.1" "@opentelemetry/semantic-conventions" "1.28.0" -"@opentelemetry/sdk-trace-base@^1.22", "@opentelemetry/sdk-trace-base@^1.29.0": +"@opentelemetry/sdk-trace-base@^1.30.1": version "1.30.1" resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.30.1.tgz#41a42234096dc98e8f454d24551fc80b816feb34" integrity sha512-jVPgBbH1gCy2Lb7X0AVQ8XAfgg0pJ4nvl8/IiQA6nxOsPvS+0zMJaFSs2ltXe0J6C8dqjcnpyqINDJmU30+uOg== @@ -1847,11 +1851,6 @@ "@opentelemetry/resources" "1.30.1" "@opentelemetry/semantic-conventions" "1.28.0" -"@opentelemetry/semantic-conventions@1.27.0": - version "1.27.0" - resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz#1a857dcc95a5ab30122e04417148211e6f945e6c" - integrity sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg== - "@opentelemetry/semantic-conventions@1.28.0", "@opentelemetry/semantic-conventions@^1.27.0", "@opentelemetry/semantic-conventions@^1.28.0": version "1.28.0" resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz#337fb2bca0453d0726696e745f50064411f646d6" @@ -1876,123 +1875,120 @@ dependencies: playwright "1.50.1" -"@prisma/instrumentation@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@prisma/instrumentation/-/instrumentation-5.22.0.tgz#c39941046e9886e17bdb47dbac45946c24d579aa" - integrity sha512-LxccF392NN37ISGxIurUljZSh1YWnphO34V5a0+T7FVQG2u9bhAXRTJpgmQ3483woVhkraQZFF7cbRrpbw/F4Q== +"@prisma/instrumentation@6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@prisma/instrumentation/-/instrumentation-6.2.1.tgz#261b885467d36759b7ca01d1b2ca4e1120bda886" + integrity sha512-QrcWRAwNHXX4nHXB+Q94nfm701gPQsR4zkaxYV6qCiENopRi8yYvXt6FNIvxbuwEiWW5Zid6DoWwIsBKJ/5r5w== dependencies: - "@opentelemetry/api" "^1.8" - "@opentelemetry/instrumentation" "^0.49 || ^0.50 || ^0.51 || ^0.52.0 || ^0.53.0" - "@opentelemetry/sdk-trace-base" "^1.22" + "@opentelemetry/instrumentation" "^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0" "@rtsao/scc@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g== -"@sentry-internal/browser-utils@8.51.0": - version "8.51.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.51.0.tgz#eaa245aefad8b3d893516ffe9535b1907f049094" - integrity sha512-r94yfRK17zNJER0hgQE4qOSy5pWzsnFcGTJQSqhSEKUcC4KK37qSfoPrPejFxtIqXhqlkd/dTWKvrMwXWcn0MQ== +"@sentry-internal/browser-utils@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-9.1.0.tgz#0f67de865d4e1b3a60cd618cdda8431d383e6b71" + integrity sha512-S1uT+kkFlstWpwnaBTIJSwwAID8PS3aA0fIidOjNezeoUE5gOvpsjDATo9q+sl6FbGWynxMz6EnYSrq/5tuaBQ== dependencies: - "@sentry/core" "8.51.0" + "@sentry/core" "9.1.0" -"@sentry-internal/feedback@8.51.0": - version "8.51.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.51.0.tgz#58e1de053b175e6fe5896e9b1282d754ea4e12d5" - integrity sha512-VgfxSZWLYUPKDnkt2zG+Oe5ccv8U3WPM6Mo4kfABIJT3Ai4VbZB7+vb2a4pm6lUCF9DeOPXHb5o9Tg17SHDAHw== +"@sentry-internal/feedback@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-9.1.0.tgz#e96edd4e46c8ab19f00855f60fa3bed01106bb5b" + integrity sha512-jTDCqkqH3QDC8m9WO4mB06hqnBRsl3p7ozoh0E774UvNB6blOEZjShhSGMMEy5jbbJajPWsOivCofUtFAwbfGw== dependencies: - "@sentry/core" "8.51.0" + "@sentry/core" "9.1.0" -"@sentry-internal/replay-canvas@8.51.0": - version "8.51.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.51.0.tgz#c896448d456290f8f4eb99df924d1bcc07908947" - integrity sha512-ERXIbwdULkdtIQnfkMLRVfpoGV2rClwySGRlTPepFKeLxlcXo9o09cPu+qbukiDnGK0cgEgRnrV961hMg21Bmw== +"@sentry-internal/replay-canvas@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-9.1.0.tgz#20be6ac4b722078ebdbc760aada02858ecbffe7e" + integrity sha512-gxredVe+mOgfNqDJ3dTLiRON3FK1rZ8d0LHp7TICK/umLkWFkuso0DbNeyKU+3XCEjCr9VM7ZRqTDMzmY6zyVg== dependencies: - "@sentry-internal/replay" "8.51.0" - "@sentry/core" "8.51.0" + "@sentry-internal/replay" "9.1.0" + "@sentry/core" "9.1.0" -"@sentry-internal/replay@8.51.0": - version "8.51.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.51.0.tgz#c121518ef493afcf38c900d37e12af68787351d5" - integrity sha512-lkm7id3a2n3yMZeF5socCVQUeEeShNOGr7Wtsmb5RORacEnld0z+NfbMTilo1mDwiWBzI5OYBjm62eglm1HFsQ== +"@sentry-internal/replay@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-9.1.0.tgz#b423edf4dabaea0b7ba689a87b19cf3ea87075f0" + integrity sha512-E2xrUoms90qvm0BVOuaZ8QfkMoTUEgoIW/35uOeaqNcL7uOIj8c5cSEQQKit2Dr7CL6W+Ci5c6Khdyd5C0NL5w== dependencies: - "@sentry-internal/browser-utils" "8.51.0" - "@sentry/core" "8.51.0" + "@sentry-internal/browser-utils" "9.1.0" + "@sentry/core" "9.1.0" -"@sentry/browser@8.51.0": - version "8.51.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.51.0.tgz#1d208785a432f4a4aee616da459e118994c8661f" - integrity sha512-1kbbyVfBBAx5Xyynp+lC5lLnAHo0qJ2r4mtmdT6koPjesvoOocEK0QQnouQBmdUbm3L0L/bPI1SgXjbeJyhzHQ== +"@sentry/browser@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-9.1.0.tgz#7798a930562b3b403611e1f201fb8e50e59da472" + integrity sha512-G55e5j77DqRW3LkalJLAjRRfuyKrjHaKTnwIYXa6ycO+Q1+l14pEUxu+eK5Abu2rtSdViwRSb5/G6a/miSUlYA== dependencies: - "@sentry-internal/browser-utils" "8.51.0" - "@sentry-internal/feedback" "8.51.0" - "@sentry-internal/replay" "8.51.0" - "@sentry-internal/replay-canvas" "8.51.0" - "@sentry/core" "8.51.0" + "@sentry-internal/browser-utils" "9.1.0" + "@sentry-internal/feedback" "9.1.0" + "@sentry-internal/replay" "9.1.0" + "@sentry-internal/replay-canvas" "9.1.0" + "@sentry/core" "9.1.0" -"@sentry/core@8.51.0": - version "8.51.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.51.0.tgz#d0c73dfe3489788911b7ce784d3ef8458344482c" - integrity sha512-Go0KxCYLw+OBIlLSv5YsYX+x9NW43fNVcyB6rhkSp2Q5Zme3tAE6KtZFvyu4SO7G/903wisW5Q6qV6UuK/ee4A== +"@sentry/core@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-9.1.0.tgz#db7438d144b7ea405260c33082971eedab48d7f3" + integrity sha512-djWEzSBpMgqdF3GQuxO+kXCUX+Mgq42G4Uah/HSUBvPDHKipMmyWlutGRoFyVPPOnCDgpHu3wCt83wbpEyVmDw== -"@sentry/electron@^5.0.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-5.11.0.tgz#2202ec8884754f5cb6676fc6495a548b6f92fd5f" - integrity sha512-LxwIZziAyXF3jk/CNItuCsGIcPunbj+Kr6up4OUoux75YxWepLnXgYtZmXSoKm4y1uq6InqUpIdDzt7AO5UgZw== +"@sentry/electron@^6.0.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-6.1.0.tgz#f43648849ae28ce2631c2d54bed763b22f1ad23f" + integrity sha512-3kOD3IldarwTueR32f9nM3wAYyBRJyuyyCp9vKxD1EglvGOXBJp58FNiRh3uacUBDNEanfOdC1QwChGBps5HFg== dependencies: - "@sentry/browser" "8.51.0" - "@sentry/core" "8.51.0" - "@sentry/node" "8.51.0" + "@sentry/browser" "9.1.0" + "@sentry/core" "9.1.0" + "@sentry/node" "9.1.0" deepmerge "4.3.1" -"@sentry/node@8.51.0": - version "8.51.0" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-8.51.0.tgz#c267b536ea6c3357e3c59de8d4b40dbfab3dff45" - integrity sha512-KfXk3QaeNXmJgUUCDAwZW7cdZ+1GvRXNdTPLpWbAKGaNulAeimck5fGGL8FRMSF0sMz6BT6Ku7u6DUaZTtbB7w== +"@sentry/node@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-9.1.0.tgz#a3cfa024bf9768b20ddb365539b1790ef49d21e2" + integrity sha512-Xf9N0rpZ+lf3kA/MBa0yA7/wBd+dW8QhBav2YmM2GpqrrZ+3HtP6sT0N9+D3qADUYTn0RE2MNo8yaiaM6/FfPw== dependencies: "@opentelemetry/api" "^1.9.0" - "@opentelemetry/context-async-hooks" "^1.29.0" - "@opentelemetry/core" "^1.29.0" - "@opentelemetry/instrumentation" "^0.56.0" - "@opentelemetry/instrumentation-amqplib" "^0.45.0" - "@opentelemetry/instrumentation-connect" "0.42.0" - "@opentelemetry/instrumentation-dataloader" "0.15.0" - "@opentelemetry/instrumentation-express" "0.46.0" - "@opentelemetry/instrumentation-fastify" "0.43.0" - "@opentelemetry/instrumentation-fs" "0.18.0" - "@opentelemetry/instrumentation-generic-pool" "0.42.0" - "@opentelemetry/instrumentation-graphql" "0.46.0" - "@opentelemetry/instrumentation-hapi" "0.44.0" - "@opentelemetry/instrumentation-http" "0.56.0" - "@opentelemetry/instrumentation-ioredis" "0.46.0" - "@opentelemetry/instrumentation-kafkajs" "0.6.0" - "@opentelemetry/instrumentation-knex" "0.43.0" - "@opentelemetry/instrumentation-koa" "0.46.0" - "@opentelemetry/instrumentation-lru-memoizer" "0.43.0" - "@opentelemetry/instrumentation-mongodb" "0.50.0" - "@opentelemetry/instrumentation-mongoose" "0.45.0" - "@opentelemetry/instrumentation-mysql" "0.44.0" - "@opentelemetry/instrumentation-mysql2" "0.44.0" - "@opentelemetry/instrumentation-nestjs-core" "0.43.0" - "@opentelemetry/instrumentation-pg" "0.49.0" - "@opentelemetry/instrumentation-redis-4" "0.45.0" - "@opentelemetry/instrumentation-tedious" "0.17.0" - "@opentelemetry/instrumentation-undici" "0.9.0" - "@opentelemetry/resources" "^1.29.0" - "@opentelemetry/sdk-trace-base" "^1.29.0" + "@opentelemetry/context-async-hooks" "^1.30.1" + "@opentelemetry/core" "^1.30.1" + "@opentelemetry/instrumentation" "^0.57.1" + "@opentelemetry/instrumentation-amqplib" "^0.46.0" + "@opentelemetry/instrumentation-connect" "0.43.0" + "@opentelemetry/instrumentation-dataloader" "0.16.0" + "@opentelemetry/instrumentation-express" "0.47.0" + "@opentelemetry/instrumentation-fastify" "0.44.1" + "@opentelemetry/instrumentation-fs" "0.19.0" + "@opentelemetry/instrumentation-generic-pool" "0.43.0" + "@opentelemetry/instrumentation-graphql" "0.47.0" + "@opentelemetry/instrumentation-hapi" "0.45.1" + "@opentelemetry/instrumentation-http" "0.57.1" + "@opentelemetry/instrumentation-ioredis" "0.47.0" + "@opentelemetry/instrumentation-kafkajs" "0.7.0" + "@opentelemetry/instrumentation-knex" "0.44.0" + "@opentelemetry/instrumentation-koa" "0.47.0" + "@opentelemetry/instrumentation-lru-memoizer" "0.44.0" + "@opentelemetry/instrumentation-mongodb" "0.51.0" + "@opentelemetry/instrumentation-mongoose" "0.46.0" + "@opentelemetry/instrumentation-mysql" "0.45.0" + "@opentelemetry/instrumentation-mysql2" "0.45.0" + "@opentelemetry/instrumentation-pg" "0.51.0" + "@opentelemetry/instrumentation-redis-4" "0.46.0" + "@opentelemetry/instrumentation-tedious" "0.18.0" + "@opentelemetry/instrumentation-undici" "0.10.0" + "@opentelemetry/resources" "^1.30.1" + "@opentelemetry/sdk-trace-base" "^1.30.1" "@opentelemetry/semantic-conventions" "^1.28.0" - "@prisma/instrumentation" "5.22.0" - "@sentry/core" "8.51.0" - "@sentry/opentelemetry" "8.51.0" - import-in-the-middle "^1.11.2" + "@prisma/instrumentation" "6.2.1" + "@sentry/core" "9.1.0" + "@sentry/opentelemetry" "9.1.0" + import-in-the-middle "^1.12.0" -"@sentry/opentelemetry@8.51.0": - version "8.51.0" - resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-8.51.0.tgz#376b1017da140372a904d712d80ed2ec4d361ee4" - integrity sha512-SvH/rl/P+S7EKXIZA6kq2HzFYfXKQx8Ytgx4WZJV+katsdaDay24QtycYE+PaqbotAkV6MOMECEb8a9XXttQcg== +"@sentry/opentelemetry@9.1.0": + version "9.1.0" + resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-9.1.0.tgz#7cdf8270c83b8525543214b9c54f91dc6e613599" + integrity sha512-sAsuzTYPS4iBxmzFmv6VmVfSphO4VPCpF6F+UbPJdp2ZGB9vxhDZmL1jcdbYZwNMK8RiOk/vNT8SMO+5ZghGOA== dependencies: - "@sentry/core" "8.51.0" + "@sentry/core" "9.1.0" "@sigstore/bundle@^3.0.0": version "3.0.0" @@ -4673,7 +4669,17 @@ import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-in-the-middle@^1.11.2, import-in-the-middle@^1.8.1: +import-in-the-middle@^1.12.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.13.1.tgz#789651f9e93dd902a5a306f499ab51eb72b03a12" + integrity sha512-k2V9wNm9B+ysuelDTHjI9d5KPc4l8zAZTGqj+pcynvWkypZd857ryzN8jNC7Pg2YZXNMJcHRPpaDyCBbNyVRpA== + dependencies: + acorn "^8.14.0" + acorn-import-attributes "^1.9.5" + cjs-module-lexer "^1.2.2" + module-details-from-path "^1.0.3" + +import-in-the-middle@^1.8.1: version "1.12.0" resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.12.0.tgz#80d6536a01d0708a6f119f30d22447d4eb9e5c63" integrity sha512-yAgSE7GmtRcu4ZUSFX/4v69UGXwugFFSdIQJ14LHPOPPQrWv8Y7O9PHsw8Ovk7bKCLe4sjXMbZFqGFcLHpZ89w== From f1d9b0a84755bec2c9a6f1e2af5fe9f36e740912 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:12:52 +0000 Subject: [PATCH 30/38] Update typescript-eslint monorepo to v8.25.0 (#2190) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 87 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 21 deletions(-) diff --git a/yarn.lock b/yarn.lock index e06f87ca..50c4d4bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2291,29 +2291,29 @@ "@types/node" "*" "@typescript-eslint/eslint-plugin@^8.0.0": - version "8.24.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz#d104c2a6212304c649105b18af2c110b4a1dd4ae" - integrity sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA== + version "8.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.0.tgz#7e880faf91f89471c30c141951e15f0eb3a0599e" + integrity sha512-cLr1J6pe56zjKYajK6SSSre6nl1Gj6xDp1TY0trpgPzjVbgDwd09v2Ws37LABxzkicmUjhEeg/fAUjPJJB1v5Q== dependencies: "@eslint-community/regexpp" "^4.10.0" - "@typescript-eslint/scope-manager" "8.24.1" - "@typescript-eslint/type-utils" "8.24.1" - "@typescript-eslint/utils" "8.24.1" - "@typescript-eslint/visitor-keys" "8.24.1" + "@typescript-eslint/scope-manager" "8.26.0" + "@typescript-eslint/type-utils" "8.26.0" + "@typescript-eslint/utils" "8.26.0" + "@typescript-eslint/visitor-keys" "8.26.0" graphemer "^1.4.0" ignore "^5.3.1" natural-compare "^1.4.0" ts-api-utils "^2.0.1" "@typescript-eslint/parser@^8.0.0": - version "8.24.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.24.1.tgz#67965c2d2ddd7eadb2f094c395695db8334ef9a2" - integrity sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ== + version "8.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.26.0.tgz#9b4d2198e89f64fb81e83167eedd89a827d843a9" + integrity sha512-mNtXP9LTVBy14ZF3o7JG69gRPBK/2QWtQd0j0oH26HcY/foyJJau6pNUez7QrM5UHnSvwlQcJXKsk0I99B9pOA== dependencies: - "@typescript-eslint/scope-manager" "8.24.1" - "@typescript-eslint/types" "8.24.1" - "@typescript-eslint/typescript-estree" "8.24.1" - "@typescript-eslint/visitor-keys" "8.24.1" + "@typescript-eslint/scope-manager" "8.26.0" + "@typescript-eslint/types" "8.26.0" + "@typescript-eslint/typescript-estree" "8.26.0" + "@typescript-eslint/visitor-keys" "8.26.0" debug "^4.3.4" "@typescript-eslint/scope-manager@8.24.1": @@ -2324,13 +2324,21 @@ "@typescript-eslint/types" "8.24.1" "@typescript-eslint/visitor-keys" "8.24.1" -"@typescript-eslint/type-utils@8.24.1": - version "8.24.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz#99113e1df63d1571309d87eef68967344c78dd65" - integrity sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw== +"@typescript-eslint/scope-manager@8.26.0": + version "8.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.26.0.tgz#b06623fad54a3a77fadab5f652ef75ed3780b545" + integrity sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA== dependencies: - "@typescript-eslint/typescript-estree" "8.24.1" - "@typescript-eslint/utils" "8.24.1" + "@typescript-eslint/types" "8.26.0" + "@typescript-eslint/visitor-keys" "8.26.0" + +"@typescript-eslint/type-utils@8.26.0": + version "8.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.26.0.tgz#9ee8cc98184b5f66326578de9c097edc89da6f68" + integrity sha512-ruk0RNChLKz3zKGn2LwXuVoeBcUMh+jaqzN461uMMdxy5H9epZqIBtYj7UiPXRuOpaALXGbmRuZQhmwHhaS04Q== + dependencies: + "@typescript-eslint/typescript-estree" "8.26.0" + "@typescript-eslint/utils" "8.26.0" debug "^4.3.4" ts-api-utils "^2.0.1" @@ -2339,6 +2347,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.24.1.tgz#8777a024f3afc4ace5e48f9a804309c6dd38f95a" integrity sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A== +"@typescript-eslint/types@8.26.0": + version "8.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.26.0.tgz#c4e93a8faf3a38a8d8adb007dc7834f1c89ee7bf" + integrity sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA== + "@typescript-eslint/typescript-estree@8.24.1": version "8.24.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz#3bb479401f8bd471b3c6dd3db89e7256977c54db" @@ -2353,7 +2366,31 @@ semver "^7.6.0" ts-api-utils "^2.0.1" -"@typescript-eslint/utils@8.24.1", "@typescript-eslint/utils@^8.13.0": +"@typescript-eslint/typescript-estree@8.26.0": + version "8.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.0.tgz#128972172005a7376e34ed2ecba4e29363b0cad1" + integrity sha512-tiJ1Hvy/V/oMVRTbEOIeemA2XoylimlDQ03CgPPNaHYZbpsc78Hmngnt+WXZfJX1pjQ711V7g0H7cSJThGYfPQ== + dependencies: + "@typescript-eslint/types" "8.26.0" + "@typescript-eslint/visitor-keys" "8.26.0" + debug "^4.3.4" + fast-glob "^3.3.2" + is-glob "^4.0.3" + minimatch "^9.0.4" + semver "^7.6.0" + ts-api-utils "^2.0.1" + +"@typescript-eslint/utils@8.26.0": + version "8.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.26.0.tgz#845d20ed8378a5594e6445f54e53b972aee7b3e6" + integrity sha512-2L2tU3FVwhvU14LndnQCA2frYC8JnPDVKyQtWFPf8IYFMt/ykEN1bPolNhNbCVgOmdzTlWdusCTKA/9nKrf8Ig== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@typescript-eslint/scope-manager" "8.26.0" + "@typescript-eslint/types" "8.26.0" + "@typescript-eslint/typescript-estree" "8.26.0" + +"@typescript-eslint/utils@^8.13.0": version "8.24.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.24.1.tgz#08d14eac33cfb3456feeee5a275b8ad3349e52ed" integrity sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ== @@ -2371,6 +2408,14 @@ "@typescript-eslint/types" "8.24.1" eslint-visitor-keys "^4.2.0" +"@typescript-eslint/visitor-keys@8.26.0": + version "8.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.0.tgz#a4876216756c69130ea958df3b77222c2ad95290" + integrity sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg== + dependencies: + "@typescript-eslint/types" "8.26.0" + eslint-visitor-keys "^4.2.0" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" From d8f4644ffcd54702f23b63e608af75f97dda77d5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 15:17:43 +0000 Subject: [PATCH 31/38] Update electron-builder to v26.0.9 (#2187) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 6 +++--- yarn.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 8bdc7084..9a0bc0de 100644 --- a/package.json +++ b/package.json @@ -84,12 +84,12 @@ "@types/pacote": "^11.1.1", "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", - "app-builder-lib": "26.0.8", + "app-builder-lib": "26.0.9", "chokidar": "^4.0.0", "detect-libc": "^2.0.0", "electron": "34.3.0", - "electron-builder": "26.0.8", - "electron-builder-squirrel-windows": "26.0.8", + "electron-builder": "26.0.9", + "electron-builder-squirrel-windows": "26.0.9", "electron-devtools-installer": "^4.0.0", "eslint": "^8.26.0", "eslint-config-google": "^0.14.0", diff --git a/yarn.lock b/yarn.lock index 50c4d4bf..09d1d248 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2563,10 +2563,10 @@ app-builder-bin@5.0.0-alpha.12: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80" integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w== -app-builder-lib@26.0.8: - version "26.0.8" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.8.tgz#a809f60fb6d371743214893e0feab89c598bed99" - integrity sha512-inISmbUzsWJcKUHEzANHvh4Z3Tqld3lcGa6TfDzEBzhAcku2JhOX4GXz7w/Yb+mjQIFcfUGD8NDAfu/hjv3AiA== +app-builder-lib@26.0.9: + version "26.0.9" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.9.tgz#b756d887dc2c9b9a57d412c9f976a0a1a83528ab" + integrity sha512-usROoLQLJDHEkLHF2nNQKWuT6Qbj1GnO+iNKVJQ7OvY7/K0/XTzr1i+gGgTmd02tQBCnBiBgNFSOw/NZZxomfg== dependencies: "@develar/schema-utils" "~2.6.5" "@electron/asar" "3.2.18" @@ -3399,12 +3399,12 @@ dir-compare@^4.2.0: minimatch "^3.0.5" p-limit "^3.1.0 " -dmg-builder@26.0.8: - version "26.0.8" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.8.tgz#53e5455b41b0c53dcac30eee58bb9d839699cad1" - integrity sha512-m2exxy1w/I5XuJ3+AKsInW+odHhXMuyPVFQ4feUnBX/dsyfKcA8f5TesmSWPD4+SoyB3Hgefz9FGLn7CI3+/NQ== +dmg-builder@26.0.9: + version "26.0.9" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.9.tgz#855f987d977e8f2599b3f07ab1bf34e53b9e1759" + integrity sha512-qDR9jFsJjFaaFZcvOBi2uMfDILnD6OsobW3akHg5IaxjG/15LuX5YkxcF1buqPhtTaPf1Oi+q155RsQmqe19qA== dependencies: - app-builder-lib "26.0.8" + app-builder-lib "26.0.9" builder-util "26.0.7" builder-util-runtime "9.3.1" fs-extra "^10.1.0" @@ -3490,25 +3490,25 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-builder-squirrel-windows@26.0.8: - version "26.0.8" - resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.8.tgz#0ed66c409dbaba864b1ab6feccbc3aa107d90382" - integrity sha512-rkhrZFeGr5XrILkhIlnfB4wepaY0o8Q26qLabB4+jqFqZxAdDT9lwclo6A5nZBze7Bbi8ZAk9Q50RgSfhBzrIA== +electron-builder-squirrel-windows@26.0.9: + version "26.0.9" + resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.9.tgz#b7eb4a6f926a6b365e9499e24129413beda34de8" + integrity sha512-LCFZL0ph+s/OMd9Ok5nOYJWXuAuiVV0cguAspYnZVW9OBz6ZjMJkovm+NiEWsf6xddo4NImO5JKejkQ79C3qRQ== dependencies: - app-builder-lib "26.0.8" + app-builder-lib "26.0.9" builder-util "26.0.7" electron-winstaller "5.4.0" -electron-builder@26.0.8: - version "26.0.8" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.8.tgz#bce826a878b194b5cfd17fcebda1e5e539d4ff3d" - integrity sha512-7Heomwy2C9OUJQOYN+zdPSVhIEmaw59v6cPYZWx/FvGX4UbcH5HT2AdjxAzLkcMTAbwVwt1TqmJr9LPs6SYvEA== +electron-builder@26.0.9: + version "26.0.9" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.9.tgz#3e10d85b2eda36a177d66eca0f74a965f09904bd" + integrity sha512-ea27aPZEw2x83XakzT+f1H+G1VOs8jIN++NVhy2srmdjX0pGpaaxYvHJSZgEcY+ev/20ArroJtOcSqvCo2Rwzg== dependencies: - app-builder-lib "26.0.8" + app-builder-lib "26.0.9" builder-util "26.0.7" builder-util-runtime "9.3.1" chalk "^4.1.2" - dmg-builder "26.0.8" + dmg-builder "26.0.9" fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" From 79abfcfddc0832d63f1a944593778bee911a9419 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:24:00 +0000 Subject: [PATCH 32/38] Update dependency @types/node to v18.19.79 (#2192) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9a0bc0de..9575059b 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@types/auto-launch": "^5.0.1", "@types/counterpart": "^0.18.1", "@types/minimist": "^1.2.1", - "@types/node": "18.19.78", + "@types/node": "18.19.79", "@types/pacote": "^11.1.1", "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", @@ -116,7 +116,7 @@ "matrix-seshat": "^4.0.1" }, "resolutions": { - "@types/node": "18.19.78", + "@types/node": "18.19.79", "config-file-ts": "0.2.8-rc1" } } diff --git a/yarn.lock b/yarn.lock index 09d1d248..9c4e955e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2174,10 +2174,10 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node@*", "@types/node@18.19.78", "@types/node@^17.0.36", "@types/node@^20.9.0": - version "18.19.78" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.78.tgz#29f5e7b947840c7aa9050ecac920fe6b1c7646a0" - integrity sha512-m1ilZCTwKLkk9rruBJXFeYN0Bc5SbjirwYX/Td3MqPfioYbgun3IvK/m8dQxMCnrPGZPg1kvXjp3SIekCN/ynw== +"@types/node@*", "@types/node@18.19.79", "@types/node@^17.0.36", "@types/node@^20.9.0": + version "18.19.79" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.79.tgz#82fde7ac17809f4738a494b22273f0f7e6754f6e" + integrity sha512-90K8Oayimbctc5zTPHPfZloc/lGVs7f3phUAAMcTgEPtg8kKquGZDERC8K4vkBYkQQh48msiYUslYtxTWvqcAg== dependencies: undici-types "~5.26.4" From a013504e17ed5ff6511039e22cb4d476debefd35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:25:27 +0000 Subject: [PATCH 33/38] Update electron-builder to v26.0.10 (#2193) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 6 +++--- yarn.lock | 43 ++++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 9575059b..3f324763 100644 --- a/package.json +++ b/package.json @@ -84,12 +84,12 @@ "@types/pacote": "^11.1.1", "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", - "app-builder-lib": "26.0.9", + "app-builder-lib": "26.0.10", "chokidar": "^4.0.0", "detect-libc": "^2.0.0", "electron": "34.3.0", - "electron-builder": "26.0.9", - "electron-builder-squirrel-windows": "26.0.9", + "electron-builder": "26.0.10", + "electron-builder-squirrel-windows": "26.0.10", "electron-devtools-installer": "^4.0.0", "eslint": "^8.26.0", "eslint-config-google": "^0.14.0", diff --git a/yarn.lock b/yarn.lock index 9c4e955e..316a4434 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2563,10 +2563,10 @@ app-builder-bin@5.0.0-alpha.12: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80" integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w== -app-builder-lib@26.0.9: - version "26.0.9" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.9.tgz#b756d887dc2c9b9a57d412c9f976a0a1a83528ab" - integrity sha512-usROoLQLJDHEkLHF2nNQKWuT6Qbj1GnO+iNKVJQ7OvY7/K0/XTzr1i+gGgTmd02tQBCnBiBgNFSOw/NZZxomfg== +app-builder-lib@26.0.10: + version "26.0.10" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.10.tgz#ddf16db7a554ab2c2ed0893ee96efd8ef3b3c3f3" + integrity sha512-RkvyWzlBkdOBIaEI6iClelSYc+yA8vwqgq4TL/ZpXLFyhybmzktngj+PcY1AJaX5CqAMFQ3p1KyDv7F1eMszKg== dependencies: "@develar/schema-utils" "~2.6.5" "@electron/asar" "3.2.18" @@ -2595,6 +2595,7 @@ app-builder-lib@26.0.9: json5 "^2.2.3" lazy-val "^1.0.5" minimatch "^10.0.0" + plist "3.1.0" resedit "^1.7.0" semver "^7.3.8" tar "^6.1.12" @@ -3399,12 +3400,12 @@ dir-compare@^4.2.0: minimatch "^3.0.5" p-limit "^3.1.0 " -dmg-builder@26.0.9: - version "26.0.9" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.9.tgz#855f987d977e8f2599b3f07ab1bf34e53b9e1759" - integrity sha512-qDR9jFsJjFaaFZcvOBi2uMfDILnD6OsobW3akHg5IaxjG/15LuX5YkxcF1buqPhtTaPf1Oi+q155RsQmqe19qA== +dmg-builder@26.0.10: + version "26.0.10" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.10.tgz#d64ffb387cd0c479df2966565abf68daabfee64a" + integrity sha512-wJxypzHqh79ZzZ2BCDjZPBlxQw0TaxLy3l75XvFSRjZkYxklV7/soy/7Ihzp/pmur19shpxLsFbBjwugIBMl4A== dependencies: - app-builder-lib "26.0.9" + app-builder-lib "26.0.10" builder-util "26.0.7" builder-util-runtime "9.3.1" fs-extra "^10.1.0" @@ -3490,25 +3491,25 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-builder-squirrel-windows@26.0.9: - version "26.0.9" - resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.9.tgz#b7eb4a6f926a6b365e9499e24129413beda34de8" - integrity sha512-LCFZL0ph+s/OMd9Ok5nOYJWXuAuiVV0cguAspYnZVW9OBz6ZjMJkovm+NiEWsf6xddo4NImO5JKejkQ79C3qRQ== +electron-builder-squirrel-windows@26.0.10: + version "26.0.10" + resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.10.tgz#d30cf02bdaae9900d9cc22ca9dd5b872b2dc4471" + integrity sha512-tjct3LAVC8npEspCTZc0iby6VnOqeNOYXk9J1qJES/Y2yJVFcQcZlArcWbcpfet7QUNTwt6qzERlfXYeHPEhng== dependencies: - app-builder-lib "26.0.9" + app-builder-lib "26.0.10" builder-util "26.0.7" electron-winstaller "5.4.0" -electron-builder@26.0.9: - version "26.0.9" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.9.tgz#3e10d85b2eda36a177d66eca0f74a965f09904bd" - integrity sha512-ea27aPZEw2x83XakzT+f1H+G1VOs8jIN++NVhy2srmdjX0pGpaaxYvHJSZgEcY+ev/20ArroJtOcSqvCo2Rwzg== +electron-builder@26.0.10: + version "26.0.10" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.10.tgz#b2191a7097fd5fc029858b74bd2d0aa9e10d38dd" + integrity sha512-skrpii/V3WLwEWrm8aiEQ4r0eFvKN/oVHdQonVg7xsP0dyqnpCLu9YEZ7nCjGtEJZYTKmfcU/6FIugsrQsbsAA== dependencies: - app-builder-lib "26.0.9" + app-builder-lib "26.0.10" builder-util "26.0.7" builder-util-runtime "9.3.1" chalk "^4.1.2" - dmg-builder "26.0.9" + dmg-builder "26.0.10" fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -6210,7 +6211,7 @@ playwright@1.50.1: optionalDependencies: fsevents "2.3.2" -plist@^3.0.4, plist@^3.0.5, plist@^3.1.0: +plist@3.1.0, plist@^3.0.4, plist@^3.0.5, plist@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== From 987ce7dde4670eac8573bc88119622cb5818decc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 17:26:08 +0000 Subject: [PATCH 34/38] Update dependency eslint-plugin-n to v17.16.1 (#2194) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/yarn.lock b/yarn.lock index 316a4434..aed5a0f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2380,7 +2380,7 @@ semver "^7.6.0" ts-api-utils "^2.0.1" -"@typescript-eslint/utils@8.26.0": +"@typescript-eslint/utils@8.26.0", "@typescript-eslint/utils@^8.21.0": version "8.26.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.26.0.tgz#845d20ed8378a5594e6445f54e53b972aee7b3e6" integrity sha512-2L2tU3FVwhvU14LndnQCA2frYC8JnPDVKyQtWFPf8IYFMt/ykEN1bPolNhNbCVgOmdzTlWdusCTKA/9nKrf8Ig== @@ -3609,15 +3609,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^5.17.1: - version "5.18.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz#91eb1db193896b9801251eeff1c6980278b1e404" - integrity sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -enhanced-resolve@^5.18.0: +enhanced-resolve@^5.17.1, enhanced-resolve@^5.18.0: version "5.18.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf" integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg== @@ -3870,11 +3862,12 @@ eslint-plugin-matrix-org@^2.0.1: integrity sha512-YjVQ0qunzVV34tpUchLWhOrOalGfRLm0tclS4dPYnXS8Ui+p12o/YtRHt+26Mg5tJ0QH76HsGC0LJKLVLNoqfg== eslint-plugin-n@^17.12.0: - version "17.15.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-17.15.1.tgz#2129bbc7b11466c3bfec57876a15aadfad3a83f2" - integrity sha512-KFw7x02hZZkBdbZEFQduRGH4VkIH4MW97ClsbAM4Y4E6KguBJWGfWG1P4HEIpZk2bkoWf0bojpnjNAhYQP8beA== + version "17.16.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-17.16.1.tgz#57b2805983db30624e4f1196da17b7baa2cdd217" + integrity sha512-/7FVAwjUrix9P5lycnsYRIQRwFo/DZROD+ZXWLpE+/EZWLyuLvyFaRdAPYJSz+nlAdZIZp+LAzlBerQSVYUNFg== dependencies: "@eslint-community/eslint-utils" "^4.4.1" + "@typescript-eslint/utils" "^8.21.0" enhanced-resolve "^5.17.1" eslint-plugin-es-x "^7.8.0" get-tsconfig "^4.8.1" @@ -3882,6 +3875,7 @@ eslint-plugin-n@^17.12.0: ignore "^5.3.2" minimatch "^9.0.5" semver "^7.6.3" + ts-declaration-location "^1.0.5" eslint-plugin-unicorn@^56.0.0: version "56.0.1" @@ -4466,9 +4460,9 @@ globals@^13.19.0: type-fest "^0.20.2" globals@^15.11.0: - version "15.14.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-15.14.0.tgz#b8fd3a8941ff3b4d38f3319d433b61bbb482e73f" - integrity sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig== + version "15.15.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-15.15.0.tgz#7c4761299d41c32b075715a4ce1ede7897ff72a8" + integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg== globals@^15.9.0: version "15.12.0" @@ -5497,7 +5491,7 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@^10.0.0: +minimatch@^10.0.0, minimatch@^10.0.1: version "10.0.1" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b" integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ== @@ -6740,12 +6734,12 @@ semver@^6.2.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.1.1, semver@^7.3.2, semver@^7.5.2, semver@^7.5.4, semver@^7.6.3: +semver@^7.1.1, semver@^7.3.2, semver@^7.5.2: version "7.6.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== -semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0: +semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3: version "7.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f" integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA== @@ -7271,6 +7265,13 @@ ts-api-utils@^2.0.1: resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.0.1.tgz#660729385b625b939aaa58054f45c058f33f10cd" integrity sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w== +ts-declaration-location@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/ts-declaration-location/-/ts-declaration-location-1.0.5.tgz#96433afbf90a77ecd2391949a2cc43ffa5340de2" + integrity sha512-WqmlO9IoeYwCqJ2E9kHMcY9GZhhfLYItC3VnHDlPOrg6nNdUWS4wn4hhDZUPt60m1EvtjPIZyprTjpI992Bgzw== + dependencies: + minimatch "^10.0.1" + tsconfig-paths@^3.15.0: version "3.15.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" From b83d666b4cf898176f863b671ac69fe4eb9a2524 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 11 Mar 2025 14:48:15 +0000 Subject: [PATCH 35/38] v1.11.95 --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 191bd316..fea8dc5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,31 @@ +Changes in [1.11.95](https://github.com/element-hq/element-desktop/releases/tag/v1.11.95) (2025-03-11) +====================================================================================================== +## ✨ Features + +* Switch to shiftkey/node-keytar as it has NAPI 10 updates ([#2172](https://github.com/element-hq/element-desktop/pull/2172)). Contributed by @t3chguy. +* Add support for Windows arm64 ([#624](https://github.com/element-hq/element-desktop/pull/624)). Contributed by @t3chguy. +* Room List Store: Filter rooms by active space ([#29399](https://github.com/element-hq/element-web/pull/29399)). Contributed by @MidhunSureshR. +* Room List - Update the room list store on actions from the dispatcher ([#29397](https://github.com/element-hq/element-web/pull/29397)). Contributed by @MidhunSureshR. +* Room List - Implement a minimal view model ([#29357](https://github.com/element-hq/element-web/pull/29357)). Contributed by @MidhunSureshR. +* New room list: add space menu in room header ([#29352](https://github.com/element-hq/element-web/pull/29352)). Contributed by @florianduros. +* Room List - Store sorted rooms in skip list ([#29345](https://github.com/element-hq/element-web/pull/29345)). Contributed by @MidhunSureshR. +* New room list: add dial to search section ([#29359](https://github.com/element-hq/element-web/pull/29359)). Contributed by @florianduros. +* New room list: add compose menu for spaces in header ([#29347](https://github.com/element-hq/element-web/pull/29347)). Contributed by @florianduros. +* Use EditInPlace control for Identity Server picker to improve a11y ([#29280](https://github.com/element-hq/element-web/pull/29280)). Contributed by @Half-Shot. +* First step to add header to new room list ([#29320](https://github.com/element-hq/element-web/pull/29320)). Contributed by @florianduros. +* Add Windows 64-bit arm link and remove 32-bit link on compatibility page ([#29312](https://github.com/element-hq/element-web/pull/29312)). Contributed by @t3chguy. +* Honour the backup disable flag from Element X ([#29290](https://github.com/element-hq/element-web/pull/29290)). Contributed by @dbkr. + +## 🐛 Bug Fixes + +* Fix edited code block width ([#29394](https://github.com/element-hq/element-web/pull/29394)). Contributed by @florianduros. +* new room list: keep space name in one line in header ([#29369](https://github.com/element-hq/element-web/pull/29369)). Contributed by @florianduros. +* Dismiss "Key storage out of sync" toast when secrets received ([#29348](https://github.com/element-hq/element-web/pull/29348)). Contributed by @richvdh. +* Minor CSS fixes for the new room list ([#29334](https://github.com/element-hq/element-web/pull/29334)). Contributed by @florianduros. +* Add padding to room header icon ([#29271](https://github.com/element-hq/element-web/pull/29271)). Contributed by @langleyd. + + + Changes in [1.11.94](https://github.com/element-hq/element-desktop/releases/tag/v1.11.94) (2025-02-27) ====================================================================================================== * No changes diff --git a/package.json b/package.json index a49c8cfc..4e3fd02c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Element", "main": "lib/electron-main.js", "exports": "./lib/electron-main.js", - "version": "1.11.95-rc.0", + "version": "1.11.95", "description": "Element: the future of secure communication", "author": "Element", "homepage": "https://element.io", From bc49c1d58ba2af933db57cadaee5f45d872fc14d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 08:37:17 +0000 Subject: [PATCH 36/38] Update playwright to v1.51.0 (#2202) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- playwright/Dockerfile | 2 +- yarn.lock | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 74a089dd..8e86e18e 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@babel/preset-env": "^7.18.10", "@babel/preset-typescript": "^7.18.6", "@electron/asar": "3.3.1", - "@playwright/test": "1.50.1", + "@playwright/test": "1.51.0", "@stylistic/eslint-plugin": "^3.0.0", "@types/auto-launch": "^5.0.1", "@types/counterpart": "^0.18.1", diff --git a/playwright/Dockerfile b/playwright/Dockerfile index fe830228..b667152f 100644 --- a/playwright/Dockerfile +++ b/playwright/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/playwright:v1.50.1-jammy +FROM mcr.microsoft.com/playwright:v1.51.0-jammy WORKDIR /work/element-desktop diff --git a/yarn.lock b/yarn.lock index aed5a0f3..626aa5c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1868,12 +1868,12 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@playwright/test@1.50.1": - version "1.50.1" - resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.50.1.tgz#027d00ca77ec79688764eb765cfe9a688807bf0b" - integrity sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ== +"@playwright/test@1.51.0": + version "1.51.0" + resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.51.0.tgz#8d5c8400b465a0bfdbcf993e390ceecb903ea6d2" + integrity sha512-dJ0dMbZeHhI+wb77+ljx/FeC8VBP6j/rj9OAojO08JI80wTZy6vRk9KvHKiDCUh4iMpEiseMgqRBIeW+eKX6RA== dependencies: - playwright "1.50.1" + playwright "1.51.0" "@prisma/instrumentation@6.2.1": version "6.2.1" @@ -6191,17 +6191,17 @@ pidtree@^0.6.0: resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== -playwright-core@1.50.1: - version "1.50.1" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.50.1.tgz#6a0484f1f1c939168f40f0ab3828c4a1592c4504" - integrity sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ== +playwright-core@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.51.0.tgz#bb23ea6bb6298242d088ae5e966ffcf8dc9827e8" + integrity sha512-x47yPE3Zwhlil7wlNU/iktF7t2r/URR3VLbH6EknJd/04Qc/PSJ0EY3CMXipmglLG+zyRxW6HNo2EGbKLHPWMg== -playwright@1.50.1: - version "1.50.1" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.50.1.tgz#2f93216511d65404f676395bfb97b41aa052b180" - integrity sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw== +playwright@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.51.0.tgz#9ba154497ba62bc6dc199c58ee19295eb35a4707" + integrity sha512-442pTfGM0xxfCYxuBa/Pu6B2OqxqqaYq39JS8QDMGThUvIOCd6s0ANDog3uwA0cHavVlnTQzGCN7Id2YekDSXA== dependencies: - playwright-core "1.50.1" + playwright-core "1.51.0" optionalDependencies: fsevents "2.3.2" From ef6c8871a2a6a31262ce9acf398c43c2891b1b97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 08:37:44 +0000 Subject: [PATCH 37/38] Update electron-builder to v26.0.11 (#2201) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 6 ++--- yarn.lock | 68 ++++++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 8e86e18e..a8cb293b 100644 --- a/package.json +++ b/package.json @@ -84,12 +84,12 @@ "@types/pacote": "^11.1.1", "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", - "app-builder-lib": "26.0.10", + "app-builder-lib": "26.0.11", "chokidar": "^4.0.0", "detect-libc": "^2.0.0", "electron": "34.3.0", - "electron-builder": "26.0.10", - "electron-builder-squirrel-windows": "26.0.10", + "electron-builder": "26.0.11", + "electron-builder-squirrel-windows": "26.0.11", "electron-devtools-installer": "^4.0.0", "eslint": "^8.26.0", "eslint-config-google": "^0.14.0", diff --git a/yarn.lock b/yarn.lock index 626aa5c4..8fb9c5aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2563,10 +2563,10 @@ app-builder-bin@5.0.0-alpha.12: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80" integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w== -app-builder-lib@26.0.10: - version "26.0.10" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.10.tgz#ddf16db7a554ab2c2ed0893ee96efd8ef3b3c3f3" - integrity sha512-RkvyWzlBkdOBIaEI6iClelSYc+yA8vwqgq4TL/ZpXLFyhybmzktngj+PcY1AJaX5CqAMFQ3p1KyDv7F1eMszKg== +app-builder-lib@26.0.11: + version "26.0.11" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.11.tgz#339e96561ec05f5e4838b3f6c11ac39ffbe9fb8d" + integrity sha512-bsfSjSZp9dg7q28+4NPLJ2ldq3j1ESP2LJ+8AibaPqQb2lTIJeQW1JmgdAs9KuYTtkswiZ/+PMyokC9M7hwnjQ== dependencies: "@develar/schema-utils" "~2.6.5" "@electron/asar" "3.2.18" @@ -2578,7 +2578,7 @@ app-builder-lib@26.0.10: "@malept/flatpak-bundler" "^0.4.0" "@types/fs-extra" "9.0.13" async-exit-hook "^2.0.1" - builder-util "26.0.7" + builder-util "26.0.11" builder-util-runtime "9.3.1" chromium-pickle-js "^0.2.0" config-file-ts "0.2.8-rc1" @@ -2586,7 +2586,7 @@ app-builder-lib@26.0.10: dotenv "^16.4.5" dotenv-expand "^11.0.6" ejs "^3.1.8" - electron-publish "26.0.7" + electron-publish "26.0.11" fs-extra "^10.1.0" hosted-git-info "^4.1.0" is-ci "^3.0.0" @@ -2840,10 +2840,10 @@ builder-util-runtime@9.3.1: debug "^4.3.4" sax "^1.2.4" -builder-util@26.0.7: - version "26.0.7" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.0.7.tgz#ca420095038d30bd60c4bb1bc3c6879334b0f6cd" - integrity sha512-rZL8wTMtpAM8CZO4l6eIM36oie95LP7de4nEp7ZhQ94JsL7kKT4orPwp6weRzxldXPzNyalUPkhCxJcFDanFIg== +builder-util@26.0.11: + version "26.0.11" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.0.11.tgz#ad85b92c93f2b976b973e1d87337e0c6813fcb8f" + integrity sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA== dependencies: "7zip-bin" "~5.2.0" "@types/debug" "^4.1.6" @@ -3400,13 +3400,13 @@ dir-compare@^4.2.0: minimatch "^3.0.5" p-limit "^3.1.0 " -dmg-builder@26.0.10: - version "26.0.10" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.10.tgz#d64ffb387cd0c479df2966565abf68daabfee64a" - integrity sha512-wJxypzHqh79ZzZ2BCDjZPBlxQw0TaxLy3l75XvFSRjZkYxklV7/soy/7Ihzp/pmur19shpxLsFbBjwugIBMl4A== +dmg-builder@26.0.11: + version "26.0.11" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.11.tgz#c9779137d28dc5eaebf268d8ea7782d6ade32250" + integrity sha512-C+SaRneQ11OxG99EeGp3TvPrlkW9ZaiukxB9Z7+OhhO1ge0nAtq9uD0ILt1JpvNAQ1de3gzX7TFRYJrSGsNe+Q== dependencies: - app-builder-lib "26.0.10" - builder-util "26.0.7" + app-builder-lib "26.0.11" + builder-util "26.0.11" builder-util-runtime "9.3.1" fs-extra "^10.1.0" iconv-lite "^0.6.2" @@ -3491,25 +3491,25 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-builder-squirrel-windows@26.0.10: - version "26.0.10" - resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.10.tgz#d30cf02bdaae9900d9cc22ca9dd5b872b2dc4471" - integrity sha512-tjct3LAVC8npEspCTZc0iby6VnOqeNOYXk9J1qJES/Y2yJVFcQcZlArcWbcpfet7QUNTwt6qzERlfXYeHPEhng== +electron-builder-squirrel-windows@26.0.11: + version "26.0.11" + resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.11.tgz#1aca09b93cf30d663618f94cdc844fe3aff6a7bd" + integrity sha512-LM3VDospLXCY6leWPhoJngDlP2GGOPzje/qZbCwX5g9ZeuYhcsVfm5NDDrjS3H6yC4PzHI9U2mnhJxc3bpIMGw== dependencies: - app-builder-lib "26.0.10" - builder-util "26.0.7" + app-builder-lib "26.0.11" + builder-util "26.0.11" electron-winstaller "5.4.0" -electron-builder@26.0.10: - version "26.0.10" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.10.tgz#b2191a7097fd5fc029858b74bd2d0aa9e10d38dd" - integrity sha512-skrpii/V3WLwEWrm8aiEQ4r0eFvKN/oVHdQonVg7xsP0dyqnpCLu9YEZ7nCjGtEJZYTKmfcU/6FIugsrQsbsAA== +electron-builder@26.0.11: + version "26.0.11" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.11.tgz#874741aa3943953bdce6677428ee7587254cbfe5" + integrity sha512-u7Qgge5ue5oOPDbZEseor7RjxKSYAekVflHkbNIY6te1kbtShQFqESq3FZakMBsQf/3SkEycvWhHHRb8zjqBqg== dependencies: - app-builder-lib "26.0.10" - builder-util "26.0.7" + app-builder-lib "26.0.11" + builder-util "26.0.11" builder-util-runtime "9.3.1" chalk "^4.1.2" - dmg-builder "26.0.10" + dmg-builder "26.0.11" fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -3523,13 +3523,13 @@ electron-devtools-installer@^4.0.0: dependencies: unzip-crx-3 "^0.2.0" -electron-publish@26.0.7: - version "26.0.7" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.0.7.tgz#b16cd31122233c228c4459cc7ab8dc25c67b6cb3" - integrity sha512-zSCBtAXnLi1QhCDEomIEu22mjKgsf17VYW3fMyZ4Y9Q7s+Ftu9dqbTMaM/e/FBCn9VthnG7C/zPCr1yKpkI+dg== +electron-publish@26.0.11: + version "26.0.11" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.0.11.tgz#92c9329a101af2836d9d228c82966eca1eee9a7b" + integrity sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "26.0.7" + builder-util "26.0.11" builder-util-runtime "9.3.1" chalk "^4.1.2" form-data "^4.0.0" From 11c58a90ca8d65cff0a0a7494ed15fb722d321ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 11:50:12 +0000 Subject: [PATCH 38/38] Update dependency electron to v34.3.1 (#2200) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a8cb293b..a864d272 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "app-builder-lib": "26.0.11", "chokidar": "^4.0.0", "detect-libc": "^2.0.0", - "electron": "34.3.0", + "electron": "34.3.1", "electron-builder": "26.0.11", "electron-builder-squirrel-windows": "26.0.11", "electron-devtools-installer": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 8fb9c5aa..57b7b4ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3571,10 +3571,10 @@ electron-winstaller@5.4.0: optionalDependencies: "@electron/windows-sign" "^1.1.2" -electron@34.3.0: - version "34.3.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.0.tgz#d52a5bd14c72a5811a0c0e233db5c20ad70ba078" - integrity sha512-I238qRnYTAsuwJ/rS7HGaFNY4NNKAcjX8nlj7mnNmj1TK3z4HvNoD1r7Zud81DYDFx8AITuLd76EPrEnnfF9Bg== +electron@34.3.1: + version "34.3.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.1.tgz#2c337a496d923463a2c7be7eaab191ad8220459b" + integrity sha512-Vsgxc4FDGg7hjduKyvTP5qfNDxZHTliZIiWD1HlR5hHXx3BFjyVv3db/uEH1GaCU0KKyeNsBXRwS4WAOMaSH5g== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0"