usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/channel_muting

This commit is contained in:
おさむのひと 2025-10-30 21:49:55 +09:00 committed by GitHub
parent e8dd5b6b2c a888f2863b
commit 60e5e710cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/jest.js
View File

@ -10,7 +10,7 @@ const __dirname = path.dirname(__filename);
const args = [];
args.push(...[
...semver.satisfies(process.version, '^20.17.0 || ^22.0.0') ? ['--no-experimental-require-module'] : [],
...semver.satisfies(process.version, '^20.17.0 || ^22.0.0 || ^24.10.0') ? ['--no-experimental-require-module'] : [],
'--experimental-vm-modules',
'--experimental-import-meta-resolve',
path.join(__dirname, 'node_modules/jest/bin/jest.js'),

8
packages/backend/test/utils.ts
View File

@ -316,8 +316,12 @@ export const uploadFile = async (user?: UserToken, { path, name, blob }: UploadO
: new URL(path, new URL('resources/', import.meta.url));
const formData = new FormData();
formData.append('file', blob ??
new File([new Uint8Array(await readFile(absPath))], basename(absPath.toString())));
formData.append(
'file',
blob ?? new Blob([new Uint8Array(await readFile(absPath))]),
basename(absPath.toString()),
);
formData.append('force', 'true');
if (name) {
formData.append('name', name);