summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-10-10 13:04:51 +0100
committerdakkar <dakkar@thenautilus.net>2024-10-10 13:48:39 +0100
commitabb93f1d79bcbed297c20a0f3d9ef425db9aed5f (patch)
treedd64a98f7ee377d44163210661278df43872913c
parentmaybe update embed mfm to our changes (diff)
downloadsharkey-abb93f1d79bcbed297c20a0f3d9ef425db9aed5f.tar.gz
sharkey-abb93f1d79bcbed297c20a0f3d9ef425db9aed5f.tar.bz2
sharkey-abb93f1d79bcbed297c20a0f3d9ef425db9aed5f.zip
use sfm for embeds
-rw-r--r--packages/frontend-embed/package.json4
-rw-r--r--packages/frontend-embed/src/components/EmMfm.ts2
-rw-r--r--packages/frontend-embed/src/components/EmNote.vue2
-rw-r--r--packages/frontend-embed/src/components/EmNoteDetailed.vue2
-rw-r--r--pnpm-lock.yaml13
5 files changed, 8 insertions, 15 deletions
diff --git a/packages/frontend-embed/package.json b/packages/frontend-embed/package.json
index 9e315996e5..7c515787a9 100644
--- a/packages/frontend-embed/package.json
+++ b/packages/frontend-embed/package.json
@@ -12,17 +12,17 @@
},
"dependencies": {
"@discordapp/twemoji": "15.1.0",
+ "@phosphor-icons/web": "^2.0.3",
"@rollup/plugin-json": "6.1.0",
"@rollup/plugin-replace": "5.0.7",
"@rollup/pluginutils": "5.1.2",
- "@phosphor-icons/web": "^2.0.3",
+ "@transfem-org/sfm-js": "0.24.5",
"@twemoji/parser": "15.1.1",
"@vitejs/plugin-vue": "5.1.4",
"@vue/compiler-sfc": "3.5.10",
"astring": "1.9.0",
"buraha": "0.0.1",
"estree-walker": "3.0.3",
- "mfm-js": "0.24.0",
"misskey-js": "workspace:*",
"frontend-shared": "workspace:*",
"punycode": "2.3.1",
diff --git a/packages/frontend-embed/src/components/EmMfm.ts b/packages/frontend-embed/src/components/EmMfm.ts
index 2549d20a6e..15a28b0829 100644
--- a/packages/frontend-embed/src/components/EmMfm.ts
+++ b/packages/frontend-embed/src/components/EmMfm.ts
@@ -4,7 +4,7 @@
*/
import { VNode, h, SetupContext, provide } from 'vue';
-import * as mfm from 'mfm-js';
+import * as mfm from '@transfem-org/sfm-js';
import * as Misskey from 'misskey-js';
import EmUrl from '@/components/EmUrl.vue';
import EmTime from '@/components/EmTime.vue';
diff --git a/packages/frontend-embed/src/components/EmNote.vue b/packages/frontend-embed/src/components/EmNote.vue
index f7899bfb03..847b6e7a21 100644
--- a/packages/frontend-embed/src/components/EmNote.vue
+++ b/packages/frontend-embed/src/components/EmNote.vue
@@ -106,7 +106,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, inject, ref, shallowRef } from 'vue';
-import * as mfm from 'mfm-js';
+import * as mfm from '@transfem-org/sfm-js';
import * as Misskey from 'misskey-js';
import I18n from '@/components/I18n.vue';
import EmNoteSub from '@/components/EmNoteSub.vue';
diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue
index 360de31864..74fc86e81f 100644
--- a/packages/frontend-embed/src/components/EmNoteDetailed.vue
+++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue
@@ -127,7 +127,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { computed, inject, ref } from 'vue';
-import * as mfm from 'mfm-js';
+import * as mfm from '@transfem-org/sfm-js';
import * as Misskey from 'misskey-js';
import I18n from '@/components/I18n.vue';
import EmMediaList from '@/components/EmMediaList.vue';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8599cc5f6d..c2c4d357f7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1078,6 +1078,9 @@ importers:
'@rollup/pluginutils':
specifier: 5.1.2
version: 5.1.2(rollup@4.22.5)
+ '@transfem-org/sfm-js':
+ specifier: 0.24.5
+ version: 0.24.5
'@twemoji/parser':
specifier: 15.1.1
version: 15.1.1
@@ -1102,9 +1105,6 @@ importers:
json5:
specifier: 2.2.3
version: 2.2.3
- mfm-js:
- specifier: 0.24.0
- version: 0.24.0
misskey-js:
specifier: workspace:*
version: link:../misskey-js
@@ -8523,9 +8523,6 @@ packages:
resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
engines: {node: '>= 0.6'}
- mfm-js@0.24.0:
- resolution: {integrity: sha512-6m8N0ElH9/4CA1izhVqmxTfLj5Z9RspdqM/lMew4xU/UTgm4Pf//VpDunpasxbRFjeJSVW+zoVwL4ZPfPtfiQg==}
-
microformats-parser@2.0.2:
resolution: {integrity: sha512-tUf9DmN4Jq/tGyp1YH2V6D/Cud+9Uc0WhjjUFirqVeHTRkkfLDacv6BQFT7h7HFsD0Z8wja5eKkRgzZU8bv0Fw==}
engines: {node: '>=18'}
@@ -20679,10 +20676,6 @@ snapshots:
methods@1.1.2: {}
- mfm-js@0.24.0:
- dependencies:
- '@twemoji/parser': 15.0.0
-
microformats-parser@2.0.2:
dependencies:
parse5: 7.1.2