From 8f371c5965c07923641e69d069e9ad73157dbec0 Mon Sep 17 00:00:00 2001 From: John Wright Date: Fri, 16 Jan 2026 19:19:19 +0000 Subject: [PATCH 1/2] chore: typescript@~5.9.3 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index de5caf20..97b665a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "prettier": "3.6.2", "rimraf": "6.0.1", "semantic-release": "^24.2.4", - "typescript": "~5.8.3", + "typescript": "~5.9.3", "vitest": "^3.1.4" }, "optionalDependencies": { @@ -11461,9 +11461,9 @@ } }, "node_modules/typescript": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", - "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", "peer": true, diff --git a/package.json b/package.json index d8bd2a46..186f9091 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "prettier": "3.6.2", "rimraf": "6.0.1", "semantic-release": "^24.2.4", - "typescript": "~5.8.3", + "typescript": "~5.9.3", "vitest": "^3.1.4" }, "lint-staged": { From 3bfa15c403a1e57134c4123d5c5386da6a2de579 Mon Sep 17 00:00:00 2001 From: John Wright Date: Fri, 16 Jan 2026 19:37:03 +0000 Subject: [PATCH 2/2] fix: work around for multi-mixins Multi-mixins don't work as expected typescript@5.9 --- src/commands/RepublishCommand.ts | 5 +++-- src/commands/StartCommand.ts | 5 +++-- src/commands/WaitForRegistryCommand.ts | 4 ++-- src/commands/WatchCommand.ts | 5 +++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/commands/RepublishCommand.ts b/src/commands/RepublishCommand.ts index ae5ee1d9..b419fcf3 100644 --- a/src/commands/RepublishCommand.ts +++ b/src/commands/RepublishCommand.ts @@ -1,9 +1,10 @@ +import { Command } from 'clipanion' import { ESMDevCommand } from './ESMDevCommand.js' export class RepublishCommand extends ESMDevCommand { - static override paths = [['republish']] + static paths = [['republish']] - static override usage = this.Usage({ + static usage = Command.Usage({ description: 'Removes the references, of given packages, from the ESM server and registry and republishes.', }) diff --git a/src/commands/StartCommand.ts b/src/commands/StartCommand.ts index e1264cdf..2a5e0f25 100644 --- a/src/commands/StartCommand.ts +++ b/src/commands/StartCommand.ts @@ -2,13 +2,14 @@ import { ESMDevCommand } from './ESMDevCommand.js' import { Servable } from './mixins/Servable.js' import { Watchable } from './mixins/Watchable.js' import { ESMServed } from './mixins/ESMServed.js' +import { Command } from 'clipanion' export class StartCommand extends Servable( Watchable(ESMServed(ESMDevCommand)), ) { - static override paths = [['start']] + static paths = [['start']] - static override usage = this.Usage({ + static usage = Command.Usage({ description: 'Runs a server and concurrently watches a file system', }) diff --git a/src/commands/WaitForRegistryCommand.ts b/src/commands/WaitForRegistryCommand.ts index d0200d42..8f43d945 100644 --- a/src/commands/WaitForRegistryCommand.ts +++ b/src/commands/WaitForRegistryCommand.ts @@ -5,9 +5,9 @@ import { Retryable } from './mixins/Retryable.js' export class WaitForRegistryCommand extends Retryable( RegistrySpecific(Command), ) { - static override paths = [['wait-for-registry'], ['wfr']] + static paths = [['wait-for-registry'], ['wfr']] - static override usage = this.Usage({ + static usage = Command.Usage({ description: 'wait for the registry to be online', }) diff --git a/src/commands/WatchCommand.ts b/src/commands/WatchCommand.ts index 31586b08..411fc823 100644 --- a/src/commands/WatchCommand.ts +++ b/src/commands/WatchCommand.ts @@ -1,10 +1,11 @@ +import { Command } from 'clipanion' import { ESMDevCommand } from './ESMDevCommand.js' import { Watchable } from './mixins/Watchable.js' export class WatchCommand extends Watchable(ESMDevCommand) { - static override paths = [['watch']] + static paths = [['watch']] - static override usage = this.Usage({ + static usage = Command.Usage({ description: 'Watches directories and republishes on changes', })