diff options
| author | Kagami Sascha Rosylight <saschanaz@outlook.com> | 2023-02-12 09:18:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-12 17:18:31 +0900 |
| commit | 9965bc8f9457692eb8b18efa7d9f68e5bae97d24 (patch) | |
| tree | 3b5fd0f228d3d4466f62cdd447d528175360b1f1 /packages/backend/src/core | |
| parent | enhance(client): リアクションが無いことを伝える (#9901) (diff) | |
| download | misskey-9965bc8f9457692eb8b18efa7d9f68e5bae97d24.tar.gz misskey-9965bc8f9457692eb8b18efa7d9f68e5bae97d24.tar.bz2 misskey-9965bc8f9457692eb8b18efa7d9f68e5bae97d24.zip | |
Fix moduleNameMapper to not resolve `.wasm.js` to `.wasm` (#9894)
* Fix moduleNameMapper to not resolve `.wasm.js` to `.js`
Fixes #9767
Undici [tries to import `./llhttp/llhttp.wasm.js`](https://github.com/nodejs/undici/blob/e155c6db5cec9bc577d548fa7c7378013631c79c/lib/client.js#L342) which is currently broken by the (hacky) module name mapper.
* longer timeout value
* 30s
* 50s
* 60s to be safe
* Revert "60s to be safe"
This reverts commit f3e0f5796273c0cdcbd901e8c08ae3136b9768f8.
* 2cc98226cac2e0a08332e1ce281ba8917c5b58fc revert?
* revert
* remove timeout
* detectOpenHandles
* Really solved?
* Revert "detectOpenHandles"
This reverts commit 29214bdff80e15998f34171bf409d454a3d10129.
* Add `coveragePathIgnorePatterns`
* Revert "Add `coveragePathIgnorePatterns`"
This reverts commit fcf8c6806b339b7c21f53137f9939d00020904aa.
* Import jsonld dynamically
* remove import
* add comment
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/core')
| -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, }); } |