From 93135215281f0f944250e3c2db8a5ec5409cdb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Mon, 27 Jul 2026 16:56:13 +0200 Subject: [PATCH] Upgrade npm dependencies --- package-lock.json | 102 ++++++++++++++++++++++------------- package.json | 12 ++--- tests/support/cobs/issue.ts | 5 +- tests/support/cobs/patch.ts | 7 ++- tests/support/peerManager.ts | 7 ++- tests/support/support.ts | 4 +- 6 files changed, 84 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index adab46001..4360ca16d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@pierre/trees": "1.0.0-beta.5", "@tauri-apps/api": "^2.11.1", "@tauri-apps/plugin-clipboard-manager": "^2.3.2", - "@tauri-apps/plugin-dialog": "^2.7.1", + "@tauri-apps/plugin-dialog": "^2.7.2", "@tauri-apps/plugin-log": "^2.9.0", "@tauri-apps/plugin-shell": "^2.3.5", "@tauri-apps/plugin-window-state": "^2.4.1", @@ -47,13 +47,13 @@ "dompurify": "^3.4.12", "eslint": "^10.7.0", "eslint-config-prettier": "^10.1.8", - "eslint-plugin-simple-import-sort": "^13.0.0", - "eslint-plugin-svelte": "^3.20.0", - "execa": "^9.6.1", + "eslint-plugin-simple-import-sort": "^14.0.0", + "eslint-plugin-svelte": "^3.22.0", + "execa": "^10.0.0", "fuzzysort": "^3.1.0", "get-port": "^7.2.0", "globals": "^17.7.0", - "happy-dom": "^20.10.6", + "happy-dom": "^20.11.0", "hast-util-to-dom": "^4.0.1", "js-yaml": "^5.2.1", "katex": "^0.17.0", @@ -69,7 +69,7 @@ "playwright": "1.61.1", "prettier": "^3.9.5", "prettier-plugin-svelte": "^4.1.1", - "svelte": "^5.56.5", + "svelte": "^5.56.6", "svelte-check": "^4.7.3", "svelte-eslint-parser": "^1.8.0", "tslib": "^2.8.1", @@ -1269,9 +1269,9 @@ } }, "node_modules/@tauri-apps/plugin-dialog": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.7.1.tgz", - "integrity": "sha512-OK1UBXYt+ojcmxMktzzuyonYIFta8CmAASpX+CA+DTGK24KlHjhYI6x2iOJ/TjZF4N7/ACK1oFmEOjIY9IhzOQ==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.7.2.tgz", + "integrity": "sha512-pX0IGm1I3I6wc+zeKYcq1GSqogK6okCNX5fOdaNU5ab1AjGS6l1E5wFNjEb7meg7ZFSp0JUs+0jQGQNyOvLrsg==", "license": "MIT OR Apache-2.0", "dependencies": { "@tauri-apps/api": "^2.11.0" @@ -1974,16 +1974,16 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", - "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", + "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" } }, "node_modules/bs58": { @@ -2489,9 +2489,9 @@ } }, "node_modules/eslint-plugin-simple-import-sort": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-13.0.0.tgz", - "integrity": "sha512-McAc+/Nlvcg4byY/CABGH8kqnefWBj8s3JA2okEtz8ixbECQgU46p0HkTUKa4YS7wvgGceimlc34p1nXqbWqtA==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-14.0.0.tgz", + "integrity": "sha512-NUJO0+XFCkk+o5EsAJruTgnfMEpeWrPWeJS15UVF60GgXmqz1BJ9/3hzlvG7lkL8Bubzos5cCLptThbFfPnSMQ==", "dev": true, "license": "MIT", "peerDependencies": { @@ -2499,9 +2499,9 @@ } }, "node_modules/eslint-plugin-svelte": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.20.0.tgz", - "integrity": "sha512-AElKLVt7Hjy4d7ljwhrhw9hux60DCxCNkmK8cY/aAXvjs8tpR7PvU4DlyI/SA1PaJww1gh0wPGo2pbyURuEwxQ==", + "version": "3.22.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-svelte/-/eslint-plugin-svelte-3.22.0.tgz", + "integrity": "sha512-O3qn0NePTWta+1o25dIThqeEP/hEQ3VxDK2LVO8SQ5wG9umLMvulK+m1yQ4JGOb2Pkl8IB0G1lpRV/HXDXSLTQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2675,32 +2675,46 @@ } }, "node_modules/execa": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-9.6.1.tgz", - "integrity": "sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-10.0.0.tgz", + "integrity": "sha512-Cxl6MKxB1dr1H0FHmiizJ+lavKF7pV+fcDZFyqMB8d5m7qUPm/OtZYcD5vPWePKxSnTQ57KuBd9mtdZ3oNCvyQ==", "dev": true, "license": "MIT", "dependencies": { "@sindresorhus/merge-streams": "^4.0.0", - "cross-spawn": "^7.0.6", "figures": "^6.1.0", - "get-stream": "^9.0.0", + "get-stream": "^9.0.1", "human-signals": "^8.0.1", "is-plain-obj": "^4.1.0", "is-stream": "^4.0.1", "npm-run-path": "^6.0.0", - "pretty-ms": "^9.2.0", + "path-key": "^4.0.0", + "pretty-ms": "^9.3.0", "signal-exit": "^4.1.0", "strip-final-newline": "^4.0.0", - "yoctocolors": "^2.1.1" + "which-command": "^0.1.0", + "yoctocolors": "^2.1.2" }, "engines": { - "node": "^18.19.0 || >=20.5.0" + "node": ">=22" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/execa/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/expect-type": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz", @@ -3028,9 +3042,9 @@ "license": "ISC" }, "node_modules/happy-dom": { - "version": "20.10.6", - "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-20.10.6.tgz", - "integrity": "sha512-6QD0ilzDDt93tX44y8tbmZdAcdTRYDhUP+Asgi6pC8Pp5IA3cvaZGyoVN/EGtlq9ziT65iPuBBn3ASLr6hCgVw==", + "version": "20.11.0", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-20.11.0.tgz", + "integrity": "sha512-XogN4asPd1a56di9prVG6bZxteNcXsZxxKmAvcEfc5Px5Ca2hMyMgk8wvqK2K1V8zXg40j9VANXsDaJYh9DeNA==", "dev": true, "license": "MIT", "dependencies": { @@ -3331,9 +3345,9 @@ } }, "node_modules/js-yaml": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.2.1.tgz", - "integrity": "sha512-zfLtNfQqxVqq3uaTqSkh4x4hZw3KHobGUA0fJUj4wawW8bsQLTVqpHdXSIzidh7o+4lEW36tANuAGdaFx6Zgnw==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.2.2.tgz", + "integrity": "sha512-dayzUzKkJ1MkuUtZglSebU43utNXH0OWQByK9rKOOuYIO8M5TV1y+n8ALMdG0rdzBnfNkOmZEqrURepb0ejqBw==", "dev": true, "funding": [ { @@ -4808,9 +4822,9 @@ } }, "node_modules/svelte": { - "version": "5.56.5", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.56.5.tgz", - "integrity": "sha512-P03YJmUy2JoOxYHb4Ka3oFat1hq2ko2it1MOItSjsJ4B6WgZPLc3+RyyU+57OGWhs3Ieq74EJpZtSnNXdAGgDw==", + "version": "5.56.6", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.56.6.tgz", + "integrity": "sha512-p4HDLDogGHKRKCrgckQHNs5PEfXkju6JI5jTywueaKJI5hAdjPohEhRtQ0M1SWC/+TA73SPln+r7srr+7e4nZA==", "license": "MIT", "dependencies": { "@jridgewell/remapping": "^2.3.4", @@ -5537,6 +5551,22 @@ "node": ">= 8" } }, + "node_modules/which-command": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/which-command/-/which-command-0.1.0.tgz", + "integrity": "sha512-XZyoF5/5hZtXitIwzrU4NKK+Wtbb9aB9CezUEw2Q0wlYK8NUYQxC1rRXgNueYLtBAJwXIb+/tFVk4dozciNJMA==", + "dev": true, + "license": "MIT", + "bin": { + "which-command": "cli.js" + }, + "engines": { + "node": ">=22" + }, + "funding": { + "url": "https://github.com/sindresorhus/which-command?sponsor=1" + } + }, "node_modules/why-is-node-running": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", diff --git a/package.json b/package.json index 64b2e506a..4784bd711 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@pierre/trees": "1.0.0-beta.5", "@tauri-apps/api": "^2.11.1", "@tauri-apps/plugin-clipboard-manager": "^2.3.2", - "@tauri-apps/plugin-dialog": "^2.7.1", + "@tauri-apps/plugin-dialog": "^2.7.2", "@tauri-apps/plugin-log": "^2.9.0", "@tauri-apps/plugin-shell": "^2.3.5", "@tauri-apps/plugin-window-state": "^2.4.1", @@ -64,13 +64,13 @@ "dompurify": "^3.4.12", "eslint": "^10.7.0", "eslint-config-prettier": "^10.1.8", - "eslint-plugin-simple-import-sort": "^13.0.0", - "eslint-plugin-svelte": "^3.20.0", - "execa": "^9.6.1", + "eslint-plugin-simple-import-sort": "^14.0.0", + "eslint-plugin-svelte": "^3.22.0", + "execa": "^10.0.0", "fuzzysort": "^3.1.0", "get-port": "^7.2.0", "globals": "^17.7.0", - "happy-dom": "^20.10.6", + "happy-dom": "^20.11.0", "hast-util-to-dom": "^4.0.1", "js-yaml": "^5.2.1", "katex": "^0.17.0", @@ -86,7 +86,7 @@ "playwright": "1.61.1", "prettier": "^3.9.5", "prettier-plugin-svelte": "^4.1.1", - "svelte": "^5.56.5", + "svelte": "^5.56.6", "svelte-check": "^4.7.3", "svelte-eslint-parser": "^1.8.0", "tslib": "^2.8.1", diff --git a/tests/support/cobs/issue.ts b/tests/support/cobs/issue.ts index eb52e65a9..b50f29a57 100644 --- a/tests/support/cobs/issue.ts +++ b/tests/support/cobs/issue.ts @@ -1,12 +1,11 @@ -import type { RadiclePeer } from "@tests/support/peerManager.js"; -import type { Options } from "execa"; +import type { RadiclePeer, SpawnOptions } from "@tests/support/peerManager.js"; export async function create( peer: RadiclePeer, title: string, description: string, labels: string[], - options: Options, + options: SpawnOptions, ): Promise { const issueOptions: string[] = [ "issue", diff --git a/tests/support/cobs/patch.ts b/tests/support/cobs/patch.ts index 449a30f77..27c547a73 100644 --- a/tests/support/cobs/patch.ts +++ b/tests/support/cobs/patch.ts @@ -1,5 +1,4 @@ -import type { RadiclePeer } from "@tests/support/peerManager.js"; -import type { Options } from "execa"; +import type { RadiclePeer, SpawnOptions } from "@tests/support/peerManager.js"; export async function create( peer: RadiclePeer, @@ -7,7 +6,7 @@ export async function create( branch: string, changeFn: () => Promise, messages: string[], - options: Options, + options: SpawnOptions, ): Promise { if (branch) { await peer.git(["reset", "--hard"], options); @@ -38,7 +37,7 @@ export async function merge( peer: RadiclePeer, targetBranch: string, featureBranch: string, - options: Options, + options: SpawnOptions, ): Promise { await peer.git(["switch", targetBranch], options); await peer.git(["merge", featureBranch], options); diff --git a/tests/support/peerManager.ts b/tests/support/peerManager.ts index 595a626c1..5ac4e4ca1 100644 --- a/tests/support/peerManager.ts +++ b/tests/support/peerManager.ts @@ -128,8 +128,11 @@ type SpawnResult = Execa.ResultPromise< } >; -type SpawnOptions = Omit< - Execa.Options, +// `Execa.Options` is a union of the text and binary encoding variants. Exclude +// the binary variant, which requires `encoding`, so that the omitted result +// stays assignable to `Execa.Options`. +export type SpawnOptions = Omit< + Exclude, "stdin" | "stdout" | "stderr" | "lines" | "encoding" >; diff --git a/tests/support/support.ts b/tests/support/support.ts index 80d45c76a..85608f47a 100644 --- a/tests/support/support.ts +++ b/tests/support/support.ts @@ -1,4 +1,4 @@ -import type { Options } from "execa"; +import type { SpawnOptions } from "@tests/support/peerManager.js"; import * as Crypto from "node:crypto"; import * as Fs from "node:fs/promises"; @@ -12,7 +12,7 @@ export function randomTag(): string { return Crypto.randomBytes(8).toString("hex"); } -export function createOptions(repoFolder: string, days: number): Options { +export function createOptions(repoFolder: string, days: number): SpawnOptions { return { cwd: repoFolder, // eslint-disable-next-line @typescript-eslint/naming-convention