diff --git a/apps/cli/package.json b/apps/cli/package.json index be48f8084..9b3d1f34f 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -41,7 +41,7 @@ "source-map-support": "^0.5.21" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", "prettier": "^3.3.3", diff --git a/libraries/adb-daemon-webusb/package.json b/libraries/adb-daemon-webusb/package.json index 83eb37c18..8b17e64bb 100644 --- a/libraries/adb-daemon-webusb/package.json +++ b/libraries/adb-daemon-webusb/package.json @@ -38,7 +38,7 @@ "@yume-chan/struct": "workspace:^0.0.24" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/test-runner": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", diff --git a/libraries/adb-server-node-tcp/package.json b/libraries/adb-server-node-tcp/package.json index 59b3b845b..685f874a1 100644 --- a/libraries/adb-server-node-tcp/package.json +++ b/libraries/adb-server-node-tcp/package.json @@ -37,7 +37,7 @@ "@yume-chan/struct": "workspace:^0.0.24" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", "prettier": "^3.3.3", diff --git a/libraries/adb/package.json b/libraries/adb/package.json index 8ba171fc1..452481c53 100644 --- a/libraries/adb/package.json +++ b/libraries/adb/package.json @@ -39,7 +39,7 @@ "@yume-chan/struct": "workspace:^0.0.24" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/test-runner": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", diff --git a/libraries/adb/src/commands/reverse.ts b/libraries/adb/src/commands/reverse.ts index d02404c19..d3bc4bc64 100644 --- a/libraries/adb/src/commands/reverse.ts +++ b/libraries/adb/src/commands/reverse.ts @@ -1,6 +1,5 @@ // cspell: ignore killforward -import { AutoDisposable } from "@yume-chan/event"; import { BufferedReadableStream } from "@yume-chan/stream-extra"; import Struct, { ExactReadableEndedError, encodeUtf8 } from "@yume-chan/struct"; @@ -62,14 +61,12 @@ function decimalToNumber(buffer: Uint8Array) { const OKAY = encodeUtf8("OKAY"); -export class AdbReverseCommand extends AutoDisposable { +export class AdbReverseCommand { protected adb: Adb; readonly #deviceAddressToLocalAddress = new Map(); constructor(adb: Adb) { - super(); - this.adb = adb; } diff --git a/libraries/adb/src/commands/sync/sync.ts b/libraries/adb/src/commands/sync/sync.ts index ea417bf19..61fd15dde 100644 --- a/libraries/adb/src/commands/sync/sync.ts +++ b/libraries/adb/src/commands/sync/sync.ts @@ -1,4 +1,3 @@ -import { AutoDisposable } from "@yume-chan/event"; import type { MaybeConsumable, ReadableStream } from "@yume-chan/stream-extra"; import type { Adb, AdbSocket } from "../../adb.js"; @@ -39,7 +38,7 @@ export interface AdbSyncWriteOptions { dryRun?: boolean; } -export class AdbSync extends AutoDisposable { +export class AdbSync { protected _adb: Adb; protected _socket: AdbSyncSocket; @@ -70,8 +69,6 @@ export class AdbSync extends AutoDisposable { } constructor(adb: Adb, socket: AdbSocket) { - super(); - this._adb = adb; this._socket = new AdbSyncSocket(socket, adb.maxPayloadSize); @@ -172,8 +169,7 @@ export class AdbSync extends AutoDisposable { return this._socket.lock(); } - override dispose() { - super.dispose(); - void this._socket.close(); + dispose() { + return this._socket.close(); } } diff --git a/libraries/android-bin/package.json b/libraries/android-bin/package.json index 88e9859a0..70ca2e2fc 100644 --- a/libraries/android-bin/package.json +++ b/libraries/android-bin/package.json @@ -37,7 +37,7 @@ "@yume-chan/struct": "workspace:^0.0.24" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/test-runner": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", diff --git a/libraries/event/package.json b/libraries/event/package.json index 7af19dad8..a75a9186e 100644 --- a/libraries/event/package.json +++ b/libraries/event/package.json @@ -36,7 +36,7 @@ "@yume-chan/async": "^2.2.0" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/test-runner": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", diff --git a/libraries/fetch-scrcpy-server/package.json b/libraries/fetch-scrcpy-server/package.json index 32808a1bc..2dfb7de53 100644 --- a/libraries/fetch-scrcpy-server/package.json +++ b/libraries/fetch-scrcpy-server/package.json @@ -31,6 +31,6 @@ "gh-release-fetch": "^4.0.3" }, "devDependencies": { - "@types/node": "^22.4.1" + "@types/node": "^22.5.0" } } diff --git a/libraries/no-data-view/package.json b/libraries/no-data-view/package.json index 7ca08d437..62c2296f2 100644 --- a/libraries/no-data-view/package.json +++ b/libraries/no-data-view/package.json @@ -30,7 +30,7 @@ "test": "run-test" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/test-runner": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", diff --git a/libraries/scrcpy/package.json b/libraries/scrcpy/package.json index 63ebcd068..52c517d06 100644 --- a/libraries/scrcpy/package.json +++ b/libraries/scrcpy/package.json @@ -39,7 +39,7 @@ "@yume-chan/struct": "workspace:^0.0.24" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/test-runner": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", diff --git a/libraries/stream-extra/package.json b/libraries/stream-extra/package.json index 8f2043ba3..25a53895b 100644 --- a/libraries/stream-extra/package.json +++ b/libraries/stream-extra/package.json @@ -36,7 +36,7 @@ "@yume-chan/struct": "workspace:^0.0.24" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/test-runner": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", diff --git a/libraries/struct/package.json b/libraries/struct/package.json index c9a76fc51..6e1e5de54 100644 --- a/libraries/struct/package.json +++ b/libraries/struct/package.json @@ -37,7 +37,7 @@ "@yume-chan/no-data-view": "workspace:^0.0.24" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "@yume-chan/eslint-config": "workspace:^1.0.0", "@yume-chan/test-runner": "workspace:^1.0.0", "@yume-chan/tsconfig": "workspace:^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 06e55bcff..7488c04d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,8 +34,8 @@ importers: version: 0.5.21 devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -68,8 +68,8 @@ importers: version: link:../struct devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -121,8 +121,8 @@ importers: version: link:../struct devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -186,8 +186,8 @@ importers: version: link:../struct devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -214,8 +214,8 @@ importers: version: link:../struct devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -258,8 +258,8 @@ importers: version: 2.2.0 devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -283,14 +283,14 @@ importers: version: 4.0.3 devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 libraries/no-data-view: devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -344,8 +344,8 @@ importers: version: link:../struct devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -440,8 +440,8 @@ importers: version: link:../struct devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -465,8 +465,8 @@ importers: version: link:../no-data-view devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 '@yume-chan/eslint-config': specifier: workspace:^1.0.0 version: link:../../toolchain/eslint-config @@ -489,8 +489,8 @@ importers: specifier: ^9.9.0 version: 9.9.0 '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 eslint: specifier: ^9.9.0 version: 9.9.0 @@ -511,8 +511,8 @@ importers: toolchain/package-lint: dependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 json5: specifier: ^2.2.3 version: 2.2.3 @@ -520,8 +520,8 @@ importers: toolchain/test-runner: devDependencies: '@types/node': - specifier: ^22.4.1 - version: 22.4.1 + specifier: ^22.5.0 + version: 22.5.0 typescript: specifier: ^5.5.4 version: 5.5.4 @@ -665,8 +665,8 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.4.1': - resolution: {integrity: sha512-1tbpb9325+gPnKK0dMm+/LMriX0vKxf6RnB0SZUqfyVkQ4fMgUSySqhxE/y8Jvs4NyF1yHzTfG9KlnkIODxPKg==} + '@types/node@22.5.0': + resolution: {integrity: sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} @@ -2016,7 +2016,7 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.4.1': + '@types/node@22.5.0': dependencies: undici-types: 6.19.8 diff --git a/toolchain/eslint-config/package.json b/toolchain/eslint-config/package.json index 1862ea48d..473856d1d 100644 --- a/toolchain/eslint-config/package.json +++ b/toolchain/eslint-config/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@eslint/js": "^9.9.0", - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "eslint": "^9.9.0", "eslint-plugin-import-x": "^3.1.0", "typescript": "^5.5.4", diff --git a/toolchain/package-lint/package.json b/toolchain/package-lint/package.json index d8a659987..534558076 100644 --- a/toolchain/package-lint/package.json +++ b/toolchain/package-lint/package.json @@ -7,7 +7,7 @@ "scripts": {}, "keywords": [], "dependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "json5": "^2.2.3" }, "author": "", diff --git a/toolchain/test-runner/package.json b/toolchain/test-runner/package.json index c1a3a8ed4..830558b12 100644 --- a/toolchain/test-runner/package.json +++ b/toolchain/test-runner/package.json @@ -6,7 +6,7 @@ "run-test": "wrapper.js" }, "devDependencies": { - "@types/node": "^22.4.1", + "@types/node": "^22.5.0", "typescript": "^5.5.4" } } diff --git a/toolchain/test-runner/run-test.js b/toolchain/test-runner/run-test.js index 17bd7cece..05885032a 100644 --- a/toolchain/test-runner/run-test.js +++ b/toolchain/test-runner/run-test.js @@ -117,10 +117,5 @@ const filterCoverage = test.pipe( }), ); -// @ts-expect-error test.pipe(spec()).pipe(process.stdout); -test - // @ts-expect-error - .pipe(lcov) - // @ts-expect-error - .pipe(createWriteStream(resolve(coverageFolder, "lcov.info"))); +test.pipe(lcov).pipe(createWriteStream(resolve(coverageFolder, "lcov.info"))); diff --git a/toolchain/test-runner/wrapper.js b/toolchain/test-runner/wrapper.js index bad651345..9ae0fd12d 100644 --- a/toolchain/test-runner/wrapper.js +++ b/toolchain/test-runner/wrapper.js @@ -7,7 +7,8 @@ const child = spawn( process.execPath, [ "--enable-source-maps", - "--experimental-test-coverage", + // Disable code coverage until https://github.com/nodejs/node/pull/54444 is released + // "--experimental-test-coverage", fileURLToPath(import.meta.resolve("./run-test.js", import.meta.url)), ], {