From 7ddf51ac4072fb9e6b22e319f2d5d690b31ac592 Mon Sep 17 00:00:00 2001 From: Hoto Ras Date: Wed, 23 Oct 2024 08:41:40 +0900 Subject: [PATCH 1/5] Update package.json --- packages/backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index dcd3661dc0ab..c1a09490259e 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -134,7 +134,7 @@ "jsrsasign": "11.1.0", "meilisearch": "0.42.0", "juice": "11.0.0", - "mfm-js": "github:nekoplanet/mfm.js", + "mfm-js": "github:nekoplanet/mfm.js#nekoplanet", "microformats-parser": "2.0.2", "mime-types": "2.1.35", "misskey-js": "workspace:*", From 31ed42c79fd263a76424ad4f791ccdcfb8216e34 Mon Sep 17 00:00:00 2001 From: Hoto Ras Date: Wed, 23 Oct 2024 08:42:17 +0900 Subject: [PATCH 2/5] Update package.json --- packages/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/package.json b/packages/frontend/package.json index aad9162fbe33..9409ec693dc7 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -50,7 +50,7 @@ "is-file-animated": "1.0.2", "json5": "2.2.3", "matter-js": "0.19.0", - "mfm-js": "github:nekoplanet/mfm.js", + "mfm-js": "github:nekoplanet/mfm.js#nekoplanet", "misskey-bubble-game": "workspace:*", "misskey-js": "workspace:*", "misskey-reversi": "workspace:*", From 247983c8e3026062d6889eae158938adaf7d642b Mon Sep 17 00:00:00 2001 From: HotoRas Date: Wed, 23 Oct 2024 08:59:44 +0900 Subject: [PATCH 3/5] asdf --- pnpm-lock.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7a4f462aaf10..cfd64f54cc8e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -291,7 +291,7 @@ importers: specifier: 0.42.0 version: 0.42.0(encoding@0.1.13) mfm-js: - specifier: github:nekoplanet/mfm.js + specifier: github:nekoplanet/mfm.js#nekoplanet version: https://codeload.github.com/nekoplanet/mfm.js/tar.gz/d3f26f5cab65916c59ed7b7a22ee1c392a83b496 microformats-parser: specifier: 2.0.2 @@ -794,7 +794,7 @@ importers: specifier: 0.19.0 version: 0.19.0 mfm-js: - specifier: github:nekoplanet/mfm.js + specifier: github:nekoplanet/mfm.js#nekoplanet version: https://codeload.github.com/nekoplanet/mfm.js/tar.gz/d3f26f5cab65916c59ed7b7a22ee1c392a83b496 misskey-bubble-game: specifier: workspace:* @@ -964,7 +964,7 @@ importers: version: 8.7.0(eslint@9.12.0)(typescript@5.6.2) '@vitest/coverage-v8': specifier: 1.6.0 - version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0)) + version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0)) '@vue/runtime-core': specifier: 3.5.10 version: 3.5.10 @@ -1030,7 +1030,7 @@ importers: version: 1.0.3 vitest: specifier: 1.6.0 - version: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0) + version: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0) vitest-fetch-mock: specifier: 0.2.2 version: 0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0)) @@ -1160,7 +1160,7 @@ importers: version: 8.7.0(eslint@9.12.0)(typescript@5.6.2) '@vitest/coverage-v8': specifier: 1.6.0 - version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0)) + version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0)) '@vue/runtime-core': specifier: 3.5.10 version: 3.5.10 @@ -15404,7 +15404,7 @@ snapshots: vite: 5.4.8(@types/node@20.14.12)(sass@1.79.3)(terser@5.33.0) vue: 3.5.10(typescript@5.6.2) - '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0))': + '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -15419,7 +15419,7 @@ snapshots: std-env: 3.7.0 strip-literal: 2.1.0 test-exclude: 6.0.0 - vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0) + vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0) transitivePeerDependencies: - supports-color @@ -22403,11 +22403,11 @@ snapshots: vitest-fetch-mock@0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0)): dependencies: cross-fetch: 3.1.8(encoding@0.1.13) - vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0) + vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0) transitivePeerDependencies: - encoding - vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0): + vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0): dependencies: '@vitest/expect': 1.6.0 '@vitest/runner': 1.6.0 From 2c38c97ca8906262de5880460275c0552d5d1d47 Mon Sep 17 00:00:00 2001 From: HotoRas Date: Wed, 23 Oct 2024 09:08:16 +0900 Subject: [PATCH 4/5] hmm --- pnpm-lock.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cfd64f54cc8e..4655f7cb7f0e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -964,7 +964,7 @@ importers: version: 8.7.0(eslint@9.12.0)(typescript@5.6.2) '@vitest/coverage-v8': specifier: 1.6.0 - version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0)) + version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0)) '@vue/runtime-core': specifier: 3.5.10 version: 3.5.10 @@ -1030,7 +1030,7 @@ importers: version: 1.0.3 vitest: specifier: 1.6.0 - version: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0) + version: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0) vitest-fetch-mock: specifier: 0.2.2 version: 0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0)) @@ -1160,7 +1160,7 @@ importers: version: 8.7.0(eslint@9.12.0)(typescript@5.6.2) '@vitest/coverage-v8': specifier: 1.6.0 - version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0)) + version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0)) '@vue/runtime-core': specifier: 3.5.10 version: 3.5.10 @@ -15404,7 +15404,7 @@ snapshots: vite: 5.4.8(@types/node@20.14.12)(sass@1.79.3)(terser@5.33.0) vue: 3.5.10(typescript@5.6.2) - '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0))': + '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -15419,7 +15419,7 @@ snapshots: std-env: 3.7.0 strip-literal: 2.1.0 test-exclude: 6.0.0 - vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0) + vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0) transitivePeerDependencies: - supports-color @@ -22403,11 +22403,11 @@ snapshots: vitest-fetch-mock@0.2.2(encoding@0.1.13)(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0)): dependencies: cross-fetch: 3.1.8(encoding@0.1.13) - vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0) + vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0) transitivePeerDependencies: - encoding - vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3))(sass@1.79.3)(terser@5.33.0): + vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.3)(terser@5.33.0): dependencies: '@vitest/expect': 1.6.0 '@vitest/runner': 1.6.0 From f610622c3c15b81f3c33079ea2206866532c2828 Mon Sep 17 00:00:00 2001 From: HotoRas Date: Wed, 23 Oct 2024 09:25:34 +0900 Subject: [PATCH 5/5] assss --- packages/backend/package.json | 2 +- packages/frontend/package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index c1a09490259e..4da63627a221 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -134,7 +134,7 @@ "jsrsasign": "11.1.0", "meilisearch": "0.42.0", "juice": "11.0.0", - "mfm-js": "github:nekoplanet/mfm.js#nekoplanet", + "mfm-js": "github:nekoplanet/mfm.js#neko-241023", "microformats-parser": "2.0.2", "mime-types": "2.1.35", "misskey-js": "workspace:*", diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 9409ec693dc7..44aaaccade50 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -50,7 +50,7 @@ "is-file-animated": "1.0.2", "json5": "2.2.3", "matter-js": "0.19.0", - "mfm-js": "github:nekoplanet/mfm.js#nekoplanet", + "mfm-js": "github:nekoplanet/mfm.js#neko-241023", "misskey-bubble-game": "workspace:*", "misskey-js": "workspace:*", "misskey-reversi": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4655f7cb7f0e..6395a695cad6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -291,8 +291,8 @@ importers: specifier: 0.42.0 version: 0.42.0(encoding@0.1.13) mfm-js: - specifier: github:nekoplanet/mfm.js#nekoplanet - version: https://codeload.github.com/nekoplanet/mfm.js/tar.gz/d3f26f5cab65916c59ed7b7a22ee1c392a83b496 + specifier: github:nekoplanet/mfm.js#neko-241023 + version: https://codeload.github.com/nekoplanet/mfm.js/tar.gz/c270d9a24e9cc0777d61121cb7d85b68c10d2974 microformats-parser: specifier: 2.0.2 version: 2.0.2 @@ -794,8 +794,8 @@ importers: specifier: 0.19.0 version: 0.19.0 mfm-js: - specifier: github:nekoplanet/mfm.js#nekoplanet - version: https://codeload.github.com/nekoplanet/mfm.js/tar.gz/d3f26f5cab65916c59ed7b7a22ee1c392a83b496 + specifier: github:nekoplanet/mfm.js#neko-241023 + version: https://codeload.github.com/nekoplanet/mfm.js/tar.gz/c270d9a24e9cc0777d61121cb7d85b68c10d2974 misskey-bubble-game: specifier: workspace:* version: link:../misskey-bubble-game @@ -8170,8 +8170,8 @@ packages: mfm-js@0.24.0: resolution: {integrity: sha512-6m8N0ElH9/4CA1izhVqmxTfLj5Z9RspdqM/lMew4xU/UTgm4Pf//VpDunpasxbRFjeJSVW+zoVwL4ZPfPtfiQg==} - mfm-js@https://codeload.github.com/nekoplanet/mfm.js/tar.gz/d3f26f5cab65916c59ed7b7a22ee1c392a83b496: - resolution: {tarball: https://codeload.github.com/nekoplanet/mfm.js/tar.gz/d3f26f5cab65916c59ed7b7a22ee1c392a83b496} + mfm-js@https://codeload.github.com/nekoplanet/mfm.js/tar.gz/c270d9a24e9cc0777d61121cb7d85b68c10d2974: + resolution: {tarball: https://codeload.github.com/nekoplanet/mfm.js/tar.gz/c270d9a24e9cc0777d61121cb7d85b68c10d2974} version: 0.24.0 microformats-parser@2.0.2: @@ -19621,7 +19621,7 @@ snapshots: dependencies: '@twemoji/parser': 15.0.0 - mfm-js@https://codeload.github.com/nekoplanet/mfm.js/tar.gz/d3f26f5cab65916c59ed7b7a22ee1c392a83b496: + mfm-js@https://codeload.github.com/nekoplanet/mfm.js/tar.gz/c270d9a24e9cc0777d61121cb7d85b68c10d2974: dependencies: '@twemoji/parser': 15.0.0