From 7bb49675f91908915d1544a7294c728a24c10d04 Mon Sep 17 00:00:00 2001 From: Shigma Date: Mon, 17 Jul 2023 01:51:52 +0800 Subject: [PATCH] chore: bump versions --- adapters/discord/package.json | 4 ++-- adapters/kook/package.json | 4 ++-- adapters/lark/package.json | 2 +- adapters/line/package.json | 8 +++----- adapters/mail/package.json | 4 ++-- adapters/matrix/package.json | 4 ++-- adapters/onebot/package.json | 4 ++-- adapters/qqguild/package.json | 4 ++-- adapters/telegram/package.json | 4 ++-- package.json | 2 +- packages/axios/package.json | 2 +- packages/core/package.json | 4 ++-- packages/satori/package.json | 4 ++-- packages/satori/src/axios.ts | 6 +++--- 14 files changed, 27 insertions(+), 29 deletions(-) diff --git a/adapters/discord/package.json b/adapters/discord/package.json index 5872e90a..060dc644 100644 --- a/adapters/discord/package.json +++ b/adapters/discord/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/adapter-discord", "description": "Discord Adapter for Satorijs", - "version": "3.8.2", + "version": "3.8.4", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ @@ -29,7 +29,7 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.5.0" + "@satorijs/satori": "^2.5.3" }, "dependencies": { "form-data": "^4.0.0" diff --git a/adapters/kook/package.json b/adapters/kook/package.json index 0f7e1dda..047fbb87 100644 --- a/adapters/kook/package.json +++ b/adapters/kook/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/adapter-kook", "description": "Kook (Kaiheila) Adapter for Satorijs", - "version": "3.10.0", + "version": "3.10.1", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ @@ -26,7 +26,7 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.5.0" + "@satorijs/satori": "^2.5.3" }, "dependencies": { "form-data": "^4.0.0" diff --git a/adapters/lark/package.json b/adapters/lark/package.json index 735833ad..c33fe8ea 100644 --- a/adapters/lark/package.json +++ b/adapters/lark/package.json @@ -30,7 +30,7 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.5.0" + "@satorijs/satori": "^2.5.3" }, "dependencies": { "form-data": "^4.0.0" diff --git a/adapters/line/package.json b/adapters/line/package.json index d5c55a15..c5461fcd 100644 --- a/adapters/line/package.json +++ b/adapters/line/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/adapter-line", "description": "Line Adapter for Satorijs", - "version": "1.0.0", + "version": "1.0.1", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ @@ -26,8 +26,6 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.4.0" - }, - "dependencies": {}, - "devDependencies": {} + "@satorijs/satori": "^2.5.3" + } } diff --git a/adapters/mail/package.json b/adapters/mail/package.json index 83473147..4ebbadeb 100644 --- a/adapters/mail/package.json +++ b/adapters/mail/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/adapter-mail", "description": "Mail Adapter for Satorijs", - "version": "1.0.6", + "version": "1.1.0", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ @@ -25,7 +25,7 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.5.0" + "@satorijs/satori": "^2.5.3" }, "dependencies": { "@types/mailparser": "^3.4.0", diff --git a/adapters/matrix/package.json b/adapters/matrix/package.json index bcb63641..fe3a572e 100644 --- a/adapters/matrix/package.json +++ b/adapters/matrix/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/adapter-matrix", "description": "Matrix Adapter for Satorijs", - "version": "0.0.1", + "version": "3.1.2", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ @@ -24,7 +24,7 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.5.0" + "@satorijs/satori": "^2.5.3" }, "dependencies": { "image-size": "^1.0.2", diff --git a/adapters/onebot/package.json b/adapters/onebot/package.json index f111bf21..59b949d6 100644 --- a/adapters/onebot/package.json +++ b/adapters/onebot/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/adapter-onebot", "description": "OneBot Adapter for Satorijs", - "version": "5.7.2", + "version": "5.7.3", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ @@ -25,7 +25,7 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.5.0" + "@satorijs/satori": "^2.5.3" }, "dependencies": { "qface": "^1.4.1" diff --git a/adapters/qqguild/package.json b/adapters/qqguild/package.json index 48255b0c..a94b335e 100644 --- a/adapters/qqguild/package.json +++ b/adapters/qqguild/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/adapter-qqguild", "description": "QQ Guild Adapter for Satorijs", - "version": "3.5.2", + "version": "3.5.4", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ @@ -26,7 +26,7 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.5.0" + "@satorijs/satori": "^2.5.3" }, "dependencies": { "@qq-guild-sdk/core": "^2.2.2", diff --git a/adapters/telegram/package.json b/adapters/telegram/package.json index b6ab2e36..aad005c2 100644 --- a/adapters/telegram/package.json +++ b/adapters/telegram/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/adapter-telegram", "description": "Telegram Adapter for Satorijs", - "version": "3.7.11", + "version": "3.7.13", "main": "lib/index.js", "typings": "lib/index.d.ts", "files": [ @@ -30,7 +30,7 @@ "satori" ], "peerDependencies": { - "@satorijs/satori": "^2.5.0" + "@satorijs/satori": "^2.5.3" }, "dependencies": { "form-data": "^4.0.0" diff --git a/package.json b/package.json index 579191bc..33e320b6 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "license": "MIT", "devDependencies": { - "@koishijs/eslint-config": "^1.0.2", + "@koishijs/eslint-config": "^1.0.3", "@types/chai": "^4.3.5", "@types/mocha": "^9.1.1", "@types/node": "^18.16.9", diff --git a/packages/axios/package.json b/packages/axios/package.json index 2c8efe54..ede36959 100644 --- a/packages/axios/package.json +++ b/packages/axios/package.json @@ -36,7 +36,7 @@ "service" ], "peerDependencies": { - "cordis": "^2.8.0" + "cordis": "^2.8.3" }, "devDependencies": { "@types/mime-db": "^1.43.1", diff --git a/packages/core/package.json b/packages/core/package.json index b0e257ea..c60a57e7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/core", "description": "Core components of Satorijs", - "version": "2.5.0", + "version": "2.5.3", "main": "lib/index.cjs", "module": "lib/index.mjs", "typings": "lib/index.d.ts", @@ -35,7 +35,7 @@ }, "dependencies": { "@satorijs/element": "^2.4.2", - "cordis": "^2.8.0", + "cordis": "^2.8.3", "cordis-axios": "^3.1.2", "cosmokit": "^1.4.2", "ws": "^8.13.0", diff --git a/packages/satori/package.json b/packages/satori/package.json index da41c3b7..285d2016 100644 --- a/packages/satori/package.json +++ b/packages/satori/package.json @@ -1,7 +1,7 @@ { "name": "@satorijs/satori", "description": "Core components of Satorijs", - "version": "2.5.0", + "version": "2.5.3", "main": "lib/index.js", "typings": "lib/index.d.ts", "engines": { @@ -32,7 +32,7 @@ }, "dependencies": { "@koa/router": "^10.1.1", - "@satorijs/core": "2.5.0", + "@satorijs/core": "2.5.3", "@types/koa": "*", "@types/koa__router": "*", "@types/ws": "^8.5.4", diff --git a/packages/satori/src/axios.ts b/packages/satori/src/axios.ts index 1bbfba21..8006c822 100644 --- a/packages/satori/src/axios.ts +++ b/packages/satori/src/axios.ts @@ -2,10 +2,10 @@ import { Quester, Schema } from '@satorijs/core' import { base64ToArrayBuffer, defineProperty } from 'cosmokit' import { ClientRequestArgs } from 'http' import { WebSocket } from 'ws' -import { fromBuffer } from 'file-type' import { basename } from 'path' import { promises as fs } from 'fs' import { fileURLToPath } from 'url' +import FileType from 'file-type' import createHttpProxyAgent from 'http-proxy-agent' import createHttpsProxyAgent from 'https-proxy-agent' import createSocksProxyAgent from 'socks-proxy-agent' @@ -15,13 +15,13 @@ Quester.prototype.file = async function file(this: Quester, url: string) { // for backward compatibility if (url.startsWith('base64://')) { const data = base64ToArrayBuffer(url.slice(9)) - const result = await fromBuffer(data) + const result = await FileType.fromBuffer(data) const filename = 'file' + (result ? '.' + result.ext : '') return { mime: result?.mime, filename, data } } if (url.startsWith('file://')) { const data = await fs.readFile(fileURLToPath(url)) - const result = await fromBuffer(data) + const result = await FileType.fromBuffer(data) return { mime: result?.mime, filename: basename(url), data } } return oldFile.call(this, url)