Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Merge branch 'release/v8.1.x' into develop

Chocobozzzc2345d670bfe
diff --cc packages/tests/src/server-helpers/image.ts
index 22003f6a54,8f3891ff90..42bbb05e7e
--- a/packages/tests/src/server-helpers/image.ts
+++ b/packages/tests/src/server-helpers/image.ts
@@@ -1,5 -1,8 +1,8 @@@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+/* oxlint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
+ import { buildAbsoluteFixturePath, root } from '@peertube/peertube-node-utils'
+ import { execPromise } from '@peertube/peertube-server/core/helpers/core-utils.js'
+ import { processImage } from '@peertube/peertube-server/core/helpers/image-utils.js'
import { expect } from 'chai'
import { remove } from 'fs-extra/esm'
import { readFile } from 'fs/promises'