diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-02-12 08:42:42 +0000 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2023-02-12 08:42:42 +0000 |
| commit | d7a2d59f418da48cf85d40a47dedff33cfc9fd0f (patch) | |
| tree | 1cb712c89d0eefb2c580b8c3de78fe7dc295b393 /packages/backend/src | |
| parent | :art: (diff) | |
| parent | Fix moduleNameMapper to not resolve `.wasm.js` to `.wasm` (#9894) (diff) | |
| download | sharkey-d7a2d59f418da48cf85d40a47dedff33cfc9fd0f.tar.gz sharkey-d7a2d59f418da48cf85d40a47dedff33cfc9fd0f.tar.bz2 sharkey-d7a2d59f418da48cf85d40a47dedff33cfc9fd0f.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/core/activitypub/LdSignatureService.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/backend/src/core/activitypub/LdSignatureService.ts b/packages/backend/src/core/activitypub/LdSignatureService.ts index a29e1be564..618ae48b1b 100644 --- a/packages/backend/src/core/activitypub/LdSignatureService.ts +++ b/packages/backend/src/core/activitypub/LdSignatureService.ts @@ -1,6 +1,5 @@ import * as crypto from 'node:crypto'; import { Inject, Injectable } from '@nestjs/common'; -import jsonld from 'jsonld'; import { HttpRequestService } from '@/core/HttpRequestService.js'; import { bindThis } from '@/decorators.js'; import { CONTEXTS } from './misc/contexts.js'; @@ -85,7 +84,9 @@ class LdSignature { @bindThis public async normalize(data: any) { const customLoader = this.getLoader(); - return await jsonld.normalize(data, { + // XXX: Importing jsonld dynamically since Jest frequently fails to import it statically + // https://github.com/misskey-dev/misskey/pull/9894#discussion_r1103753595 + return (await import('jsonld')).default.normalize(data, { documentLoader: customLoader, }); } |