Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix @types/markdown-it dependency

Chocobozzz5abe1b45fcbb
diff --git a/package.json b/package.json
index 0ea8447e52..e5a5aab37c 100644
--- a/package.json
+++ b/package.json
@@ -96,6 +96,7 @@
"@aws-sdk/s3-request-presigner": "^3.1107.0",
"@commander-js/extra-typings": "^15.0.0",
"@img/sharp-wasm32": "^0.35.3",
+ "@logtape/adaptor-winston": "^2.3.0",
"@misskey-dev/node-http-message-signatures": "^0.0.10",
"@node-oauth/oauth2-server": "^5.3.0",
"@opentelemetry/api": "^1.9.1",
@@ -206,7 +207,6 @@
"yauzl": "^3.4.0"
},
"devDependencies": {
- "@logtape/adaptor-winston": "^2.3.0",
"@stylistic/eslint-plugin": "^5.10.0",
"@types/archiver": "^8.0.0",
"@types/bcrypt": "^6.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 880ad75220..51ce06a66c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,9 +9,6 @@ overrides:
'@types/express-serve-static-core': 4.19.5
patchedDependencies:
- '@types/markdown-it':
- hash: b68247cf64808c60a86b4f1ee56430de5e1b3d0fb2023e0c82242537f4f27937
- path: pnpm-patches/@types__markdown-it.patch
sharp:
hash: 6360e5a7ee3bb2fcc71d0f3c8a8532b01555e32108f8ec2eedcbfaba4ea25704
path: pnpm-patches/sharp.patch
@@ -41,6 +38,9 @@ importers:
'@img/sharp-wasm32':
specifier: ^0.35.3
version: 0.35.3
+ '@logtape/adaptor-winston':
+ specifier: ^2.3.0
+ version: 2.3.0(@logtape/[email protected])([email protected])
'@misskey-dev/node-http-message-signatures':
specifier: ^0.0.10
version: 0.0.10
@@ -366,9 +366,6 @@ importers:
specifier: ^3.4.0
version: 3.4.0
devDependencies:
- '@logtape/adaptor-winston':
- specifier: ^2.3.0
- version: 2.3.0(@logtape/[email protected])([email protected])
'@stylistic/eslint-plugin':
specifier: ^5.10.0
@@ -12703,7 +12700,7 @@ snapshots:
nostics: 1.2.0
optionalDependencies:
dependencies:
@@ -12712,7 +12709,7 @@ snapshots:
nostics: 1.2.0
zigpty: 0.2.1
optionalDependencies:
'@digitalbazaar/[email protected]':
dependencies:
@@ -15406,7 +15403,7 @@ snapshots:
mlly: 1.8.2
nostics: 1.2.0
nypm: 0.6.9
transitivePeerDependencies:
- '@modelcontextprotocol/client'
- '@modelcontextprotocol/server'
@@ -23622,7 +23619,6 @@ snapshots:
sass-embedded: 1.100.0
tsx: 4.23.12
yaml: 2.9.0
- optional: true
diff --git a/pnpm-patches/@types__markdown-it.patch b/pnpm-patches/@types__markdown-it.patch
deleted file mode 100644
index b3a05e01c1..0000000000
--- a/pnpm-patches/@types__markdown-it.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dist/index.cjs.d.ts b/dist/index.cjs.d.ts
-index 3af194c26afe0bc4dd10b5eb4640b5efe691d0d1..57d4e6cc0abb715e7ecedc448149ea23521fd498 100644
---- a/dist/index.cjs.d.ts
-+++ b/dist/index.cjs.d.ts
-@@ -978,7 +978,7 @@ interface MarkdownIt {
- * Used by [linkify](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js)
- * rule.
- */
-- readonly linkify: LinkifyIt;
-+ readonly linkify: typeof LinkifyIt;
-
- /**
- * Link validation function. CommonMark allows too much in links. By default
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 9891bc5f67..ad640ad7f9 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -6,6 +6,8 @@ packages:
- client/packages/*
- client/src/standalone/player
+blockExoticSubdeps: false
+
ignoredBuiltDependencies:
- sharp
@@ -31,13 +33,10 @@ onlyBuiltDependencies:
overrides:
'@types/express': 4.17.9
'@types/express-serve-static-core': 4.19.5
- 'p2p-media-loader-core': "github:Chocobozzz/p2p-media-loader#v4-external-test&path:packages/p2p-media-loader-core"
- 'p2p-media-loader-hlsjs': "github:Chocobozzz/p2p-media-loader#v4-external-test&path:packages/p2p-media-loader-hlsjs"
+ p2p-media-loader-core: github:Chocobozzz/p2p-media-loader#v4-external-test&path:packages/p2p-media-loader-core
+ p2p-media-loader-hlsjs: github:Chocobozzz/p2p-media-loader#v4-external-test&path:packages/p2p-media-loader-hlsjs
patchedDependencies:
- '@types/markdown-it': pnpm-patches/@types__markdown-it.patch
sharp: pnpm-patches/sharp.patch
tinykeys: pnpm-patches/tinykeys.patch
video.js: pnpm-patches/video.js.patch
-
-blockExoticSubdeps: false