ActivityPub-federated video streaming platform using P2P directly in your web browser
Upgrade typescript to v6
Chocobozzz002ee2452d95
diff --git a/client/tsconfig.json b/client/tsconfig.jsonindex b8892fdb50..e283b300ce 100644--- a/client/tsconfig.json+++ b/client/tsconfig.json@@ -19,13 +19,12 @@"typeRoots": ["node_modules/@types"],- "baseUrl": "./","paths": {"@app/*": [- "src/app/*"+ "./src/app/*"],"@root-helpers/*": [- "src/root-helpers/*"+ "./src/root-helpers/*"]}},@@ -35,12 +34,12 @@{ "path": "../packages/typescript-utils" }],"include": [- "src/polyfills.ts",- "src/environments/*.ts",- "src/main*.ts",- "src/**/*.d.ts",- "src/app/**/*.ts",- "src/shims/*.ts"+ "./src/polyfills.ts",+ "./src/environments/*.ts",+ "./src/main*.ts",+ "./src/**/*.d.ts",+ "./src/app/**/*.ts",+ "./src/shims/*.ts"],"angularCompilerOptions": {"strictInjectionParameters": true,diff --git a/client/tsconfig.types.json b/client/tsconfig.types.jsonindex 417db34538..ff25eaae80 100644--- a/client/tsconfig.types.json+++ b/client/tsconfig.types.json@@ -7,11 +7,11 @@"outDir": "../packages/types-generator/dist-tmp/client/","emitDeclarationOnly": true,"composite": true,- "rootDir": "src/",+ "rootDir": "./src/","tsBuildInfoFile": "../packages/types-generator/dist-tmp/tsconfig.client.tsbuildinfo"},- "files": [ "src/types/index.ts" ],+ "files": [ "./src/types/index.ts" ],"include": [- "src/types/**/*"+ "./src/types/**/*"]}diff --git a/package.json b/package.jsonindex d590b70c99..52b8f493f3 100644--- a/package.json+++ b/package.json@@ -262,7 +262,7 @@"tsc-watch": "^7.2.0","tsx": "^4.21.0","type-fest": "^5.4.4",- "typescript": "~5.9.3"+ "typescript": "~6.0.2"},"packageManager": "[email protected]+sha512.34e538c329b5553014ca8e8f4535997f96180a1d0f614339357449935350d924e22f8614682191264ec33d1462ac21561aff97f6bb18065351c162c7e8f6de67"}diff --git a/packages/server-commands/package.json b/packages/server-commands/package.jsonindex d0764f8913..c9335b6820 100644--- a/packages/server-commands/package.json+++ b/packages/server-commands/package.json@@ -14,7 +14,7 @@"type": "module","devDependencies": {"@types/superagent": "^8.1.9",- "@types/supertest": "^6.0.3",+ "@types/supertest": "^7.2.0","supertest": "^7.2.2"},"scripts": {diff --git a/packages/server-commands/src/requests/requests.ts b/packages/server-commands/src/requests/requests.tsindex 9669290760..ffe66042ee 100644--- a/packages/server-commands/src/requests/requests.ts+++ b/packages/server-commands/src/requests/requests.ts@@ -1,4 +1,5 @@-/* oxlint-disable @typescript-eslint/no-floating-promises */+// Fix typing issue because superagent is referenced by supertest+import 'superagent'import { pick, queryParamsToObject } from '@peertube/peertube-core-utils'import { HttpStatusCode, HttpStatusCodeType } from '@peertube/peertube-models'@@ -186,7 +187,7 @@ export function makePutBodyRequest (options: {fields: { [fieldName: string]: any }expectedStatus?: HttpStatusCodeTypeheaders?: { [name: string]: string }-}) {+}): request.Test {const req = request(options.url).put(options.path).send(options.fields)diff --git a/packages/server-commands/src/shared/abstract-command.ts b/packages/server-commands/src/shared/abstract-command.tsindex fa09cae9ec..15f94cdef0 100644--- a/packages/server-commands/src/shared/abstract-command.ts+++ b/packages/server-commands/src/shared/abstract-command.ts@@ -1,8 +1,10 @@/* oxlint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */+import { pick } from '@peertube/peertube-core-utils'import { HttpStatusCode, HttpStatusCodeType } from '@peertube/peertube-models'import { buildAbsoluteFixturePath, getFileSize } from '@peertube/peertube-node-utils'import { expect } from 'chai'+import { createReadStream } from 'fs'import got, { Response as GotResponse } from 'got'import { isAbsolute } from 'path'import {@@ -14,9 +16,6 @@ import {unwrapBody,unwrapText} from '../requests/requests.js'--import { pick } from '@peertube/peertube-core-utils'-import { createReadStream } from 'fs'import type { PeerTubeServer } from '../server/server.js'export interface OverrideCommandOptions {diff --git a/packages/server-commands/tsconfig.json b/packages/server-commands/tsconfig.jsonindex e29fc20a36..7045ea747b 100644--- a/packages/server-commands/tsconfig.json+++ b/packages/server-commands/tsconfig.json@@ -5,6 +5,7 @@"rootDir": "src","tsBuildInfoFile": "./dist/.tsbuildinfo"},+"references": [{ "path": "../models" },{ "path": "../core-utils" },diff --git a/packages/tests/src/shared/checks.ts b/packages/tests/src/shared/checks.tsindex 3c8e46ae7b..a915697e2b 100644--- a/packages/tests/src/shared/checks.ts+++ b/packages/tests/src/shared/checks.ts@@ -158,8 +158,8 @@ export async function testImageSize (options: {// ----------------------------------------------------------------------------export function checkBadStartPagination (url: string, path: string, token?: string, query = {}) {- return makeGetRequest({+export async function checkBadStartPagination (url: string, path: string, token?: string, query = {}) {+ await makeGetRequest({url,path,token,@@ -186,8 +186,8 @@ export async function checkBadCountPagination (url: string, path: string, token?})}-export function checkBadSort (url: string, path: string, token?: string, query = {}) {- return makeGetRequest({+export async function checkBadSort (url: string, path: string, token?: string, query = {}) {+ await makeGetRequest({url,path,token,diff --git a/packages/tests/src/shared/import-export.ts b/packages/tests/src/shared/import-export.tsindex 2be795d52e..0bc701791f 100644--- a/packages/tests/src/shared/import-export.ts+++ b/packages/tests/src/shared/import-export.ts@@ -123,10 +123,12 @@ export async function checkExportFileExists (options: {if (exists === true) {if (withObjectStorage) {- return makeRawRequest({ url: redirectedUrl, expectedStatus: HttpStatusCode.OK_200 })+ await makeRawRequest({ url: redirectedUrl, expectedStatus: HttpStatusCode.OK_200 })+ } else {+ await testFileExistsOnFSOrNot(server, 'tmp-persistent', filename, true)}- return testFileExistsOnFSOrNot(server, 'tmp-persistent', filename, true)+ return}await testFileExistsOnFSOrNot(server, 'tmp-persistent', filename, false)diff --git a/packages/tests/tsconfig.json b/packages/tests/tsconfig.jsonindex 642b973933..dad850c64d 100644--- a/packages/tests/tsconfig.json+++ b/packages/tests/tsconfig.json@@ -4,6 +4,7 @@"outDir": "./dist","rootDir": "src","tsBuildInfoFile": "./dist/.tsbuildinfo",+ "types": [ "node", "mocha" ],"paths": {"@tests/*": [ "./src/*" ],"@server/*": [ "../../server/core/*" ],diff --git a/packages/types-generator/src/client/tsconfig.types.json b/packages/types-generator/src/client/tsconfig.types.jsonindex a1203c0bed..813320f002 100644--- a/packages/types-generator/src/client/tsconfig.types.json+++ b/packages/types-generator/src/client/tsconfig.types.json@@ -6,7 +6,6 @@"emitDeclarationOnly": true,"outDir": "../../dist-tmp/client/","rootDir": "./",- "baseUrl": "./","tsBuildInfoFile": "../../dist-tmp/tsconfig.client.types.tsbuildinfo","paths": {"@client/*": [ "../../../../client/src/*" ]diff --git a/packages/types-generator/tsconfig.dist-tmp.json b/packages/types-generator/tsconfig.dist-tmp.jsonindex feb70d9a04..8bdb291f02 100644--- a/packages/types-generator/tsconfig.dist-tmp.json+++ b/packages/types-generator/tsconfig.dist-tmp.json@@ -5,13 +5,12 @@"node_modules/@types","client/node_modules/@types"],- "baseUrl": "./dist-tmp","paths": {- "@server/*": [ "server/core/*" ],- "@client/*": [ "client/*" ],- "@peertube/peertube-models": [ "peertube-models" ],- "@peertube/peertube-typescript-utils": [ "peertube-typescript-utils" ],- "@peertube/peertube-transcription": [ "peertube-transcription" ]+ "@server/*": [ "./dist-tmp/server/core/*" ],+ "@client/*": [ "./dist-tmp/client/*" ],+ "@peertube/peertube-models": [ "./dist-tmp/peertube-models" ],+ "@peertube/peertube-typescript-utils": [ "./dist-tmp/peertube-typescript-utils" ],+ "@peertube/peertube-transcription": [ "./dist-tmp/peertube-transcription" ]}}}diff --git a/packages/types-generator/tsconfig.types.json b/packages/types-generator/tsconfig.types.jsonindex 16fb85829b..8be4167db0 100644--- a/packages/types-generator/tsconfig.types.json+++ b/packages/types-generator/tsconfig.types.json@@ -6,7 +6,6 @@"emitDeclarationOnly": true,"sourceMap": false,"outDir": "./dist-tmp/",- "baseUrl": "./","rootDir": "./src","tsBuildInfoFile": "./dist-tmp/tsconfig.server.types.tsbuildinfo","paths": {diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 9ebfdc60dd..bd2bae90da 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -214,7 +214,7 @@ importers:version: 0.1.7i18next:specifier: ^25.8.13- version: 25.8.13([email protected])+ version: 25.8.13([email protected])i18next-icu:specifier: ^2.4.3version: 2.4.3([email protected])@@ -365,7 +365,7 @@ importers:devDependencies:'@peertube/resolve-tspaths':specifier: ^0.8.14- version: 0.8.14([email protected])+ version: 0.8.14([email protected])'@stylistic/eslint-plugin':specifier: ^5.9.0version: 5.9.0([email protected]([email protected]))@@ -497,7 +497,7 @@ importers:version: 5.5.6i18next-cli:specifier: ^1.47.3- version: 1.47.3(@types/[email protected])([email protected]([email protected]))([email protected])+ version: 1.47.3(@types/[email protected])([email protected]([email protected]))([email protected])jszip:specifier: ^3.10.1version: 3.10.1@@ -524,7 +524,7 @@ importers:version: 4.59.0rollup-plugin-dts:specifier: ^6.3.0- version: 6.3.0([email protected])([email protected])+ version: 6.3.0([email protected])([email protected])socket.io-client:specifier: ^4.8.3version: 4.8.3([email protected])([email protected])@@ -533,7 +533,7 @@ importers:version: 4.0.4([email protected])tsc-watch:specifier: ^7.2.0- version: 7.2.0([email protected])+ version: 7.2.0([email protected])tsx:specifier: ^4.21.0version: 4.21.0@@ -541,8 +541,8 @@ importers:specifier: ^5.4.4version: 5.4.4typescript:- specifier: ~5.9.3- version: 5.9.3+ specifier: ~6.0.2+ version: 6.0.2optionalDependencies:webtorrent:specifier: ^2.8.5@@ -883,8 +883,8 @@ importers:specifier: ^8.1.9version: 8.1.9'@types/supertest':- specifier: ^6.0.3- version: 6.0.3+ specifier: ^7.2.0+ version: 7.2.0supertest:specifier: ^7.2.2version: 7.2.2@@ -4449,6 +4449,9 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-8WzXq62EXFhJ7QsH3Ocb/iKQ/Ty9ZVWnVzoTKc9tyyFRRF3a74Tk2+TLFgaFFw364Ere+npzHKEJ6ga2LzIL7w==}+ '@types/[email protected]':+ resolution: {integrity: sha512-uh2Lv57xvggst6lCqNdFAmDSvoMG7M/HDtX4iUCquxQ5EGPtaPM5PL5Hmi7LCvOG8db7YaCPNJEeoI8s/WzIQw==}+'@types/[email protected]':resolution: {integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==}@@ -10848,6 +10851,11 @@ packages:engines: {node: '>=14.17'}hasBin: true+ resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==}+ engines: {node: '>=14.17'}+ hasBin: true+resolution: {integrity: sha512-RwKDW2p3iyWn4UbaxpP2+VxwqXh0jpvdxsYpZ5j/MLLiQOfbsV5shpgQiw93+KMYQPcteeMQ289MaAFzs3G9pw==}@@ -14103,12 +14111,12 @@ snapshots:smtp-server: 3.18.1wildstring: 1.0.9- '@peertube/[email protected]([email protected])':+ '@peertube/[email protected]([email protected])':dependencies:ansi-colors: 4.1.3commander: 11.0.0fast-glob: 3.3.1- typescript: 5.9.3+ typescript: 6.0.2'@peertube/[email protected]':dependencies:@@ -15351,6 +15359,11 @@ snapshots:'@types/methods': 1.1.4'@types/superagent': 8.1.9+ '@types/[email protected]':+ dependencies:+ '@types/methods': 1.1.4+ '@types/superagent': 8.1.9+'@types/[email protected]': {}'@types/[email protected]':@@ -19131,7 +19144,7 @@ snapshots:transitivePeerDependencies:- supports-color- [email protected](@types/[email protected])([email protected]([email protected]))([email protected]):+ [email protected](@types/[email protected])([email protected]([email protected]))([email protected]):dependencies:'@croct/json5-parser': 0.2.2'@swc/core': 1.15.17@@ -19147,7 +19160,7 @@ snapshots:minimatch: 10.2.4ora: 9.3.0react: 19.2.4yaml: 2.8.2transitivePeerDependencies:- '@swc/helpers'@@ -19170,11 +19183,11 @@ snapshots:transitivePeerDependencies:- '@swc/helpers'dependencies:'@babel/runtime': 7.28.6optionalDependencies:- typescript: 5.9.3+ typescript: 6.0.2dependencies:@@ -21725,15 +21738,15 @@ snapshots:dependencies:setimmediate: 1.0.5dependencies:'@babel/runtime': 7.28.6html-parse-stringify: 3.0.1- i18next: 25.8.13([email protected])+ i18next: 25.8.13([email protected])react: 19.2.4use-sync-external-store: 1.6.0([email protected])optionalDependencies:- typescript: 5.9.3+ typescript: 6.0.2@@ -22023,11 +22036,11 @@ snapshots:'@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.5'@rolldown/binding-win32-x64-msvc': 1.0.0-rc.5dependencies:magic-string: 0.30.21rollup: 4.59.0- typescript: 5.9.3+ typescript: 6.0.2optionalDependencies:'@babel/code-frame': 7.29.0@@ -23221,13 +23234,13 @@ snapshots:optionalDependencies:'@swc/core': 1.15.17dependencies:cross-spawn: 7.0.6node-cleanup: 2.1.2ps-tree: 1.2.0string-argv: 0.3.2- typescript: 5.9.3+ typescript: 6.0.2dependencies:@@ -23371,6 +23384,8 @@ snapshots:+ [email protected]: {}+diff --git a/server/tsconfig.lib.json b/server/tsconfig.lib.jsonindex 5b304ba2c2..ca31deffda 100644--- a/server/tsconfig.lib.json+++ b/server/tsconfig.lib.json@@ -3,10 +3,9 @@"compilerOptions": {"outDir": "./dist","tsBuildInfoFile": "./dist/.tsbuildinfo",- "baseUrl": "../","rootDir": ".","paths": {- "@server/*": [ "server/core/*" ]+ "@server/*": [ "./core/*" ]}}}diff --git a/tsconfig.base.json b/tsconfig.base.jsonindex f3e8e9e976..745dd99d46 100644--- a/tsconfig.base.json+++ b/tsconfig.base.json@@ -31,6 +31,9 @@"noUnusedLocals": true,"skipLibCheck": true,"composite": true,- "declarationMap": true+ "declarationMap": true,+ "types": [+ "node"+ ]}}