diff --git a/package.json b/package.json index df6d7d6979..9f01dd7c67 100644 --- a/package.json +++ b/package.json @@ -41,11 +41,11 @@ "js-yaml": "4.1.0" }, "devDependencies": { - "@biomejs/biome": "1.7.1", - "@biomejs/cli-darwin-arm64": "^1.7.1", - "@biomejs/cli-darwin-x64": "^1.7.1", - "@biomejs/cli-linux-arm64": "^1.7.1", - "@biomejs/cli-linux-x64": "^1.7.1", + "@biomejs/biome": "^1.7.3", + "@biomejs/cli-darwin-arm64": "^1.7.3", + "@biomejs/cli-darwin-x64": "^1.7.3", + "@biomejs/cli-linux-arm64": "^1.7.3", + "@biomejs/cli-linux-x64": "^1.7.3", "@types/node": "20.12.7", "execa": "8.0.1", "pnpm": "9.1.0", diff --git a/packages/client/package.json b/packages/client/package.json index d3bf131cb7..844b40d30f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -19,6 +19,7 @@ "@rollup/plugin-json": "6.1.0", "@rollup/pluginutils": "^5.1.0", "@syuilo/aiscript": "0.17.0", + "@misskey-dev/browser-image-resizer": "2024.1.0", "@types/autosize": "^4.0.3", "@types/glob": "8.1.0", "@types/insert-text-at-cursor": "^0.3.2", @@ -37,7 +38,6 @@ "autobind-decorator": "2.4.0", "autosize": "6.0.1", "broadcast-channel": "7.0.0", - "browser-image-resizer": "github:misskey-dev/browser-image-resizer", "chart.js": "4.4.2", "chartjs-adapter-date-fns": "3.0.0", "chartjs-chart-matrix": "^2.0.1", diff --git a/packages/client/src/scripts/upload.ts b/packages/client/src/scripts/upload.ts index 1f960cd637..a49d1544ad 100644 --- a/packages/client/src/scripts/upload.ts +++ b/packages/client/src/scripts/upload.ts @@ -1,6 +1,6 @@ import { reactive, ref } from "vue"; import type { entities } from "firefish-js"; -import { readAndCompressImage } from "browser-image-resizer"; +import { readAndCompressImage } from "@misskey-dev/browser-image-resizer"; import { defaultStore } from "@/store"; import { apiUrl } from "@/config"; import { me } from "@/me"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a77058db4e..97543f7feb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,20 +13,20 @@ importers: version: 4.1.0 devDependencies: '@biomejs/biome': - specifier: 1.7.1 - version: 1.7.1 + specifier: ^1.7.3 + version: 1.7.3 '@biomejs/cli-darwin-arm64': - specifier: ^1.7.1 - version: 1.7.1 + specifier: ^1.7.3 + version: 1.7.3 '@biomejs/cli-darwin-x64': - specifier: ^1.7.1 - version: 1.7.1 + specifier: ^1.7.3 + version: 1.7.3 '@biomejs/cli-linux-arm64': - specifier: ^1.7.1 - version: 1.7.1 + specifier: ^1.7.3 + version: 1.7.3 '@biomejs/cli-linux-x64': - specifier: ^1.7.1 - version: 1.7.1 + specifier: ^1.7.3 + version: 1.7.3 '@types/node': specifier: 20.12.7 version: 20.12.7 @@ -539,6 +539,9 @@ importers: '@eslint-sets/eslint-config-vue3-ts': specifier: ^3.3.0 version: 3.3.0(@babel/core@7.24.4)(eslint@9.1.1)(prettier@3.2.5)(typescript@5.4.5) + '@misskey-dev/browser-image-resizer': + specifier: 2024.1.0 + version: 2024.1.0 '@phosphor-icons/web': specifier: ^2.1.1 version: 2.1.1 @@ -608,9 +611,6 @@ importers: broadcast-channel: specifier: 7.0.0 version: 7.0.0 - browser-image-resizer: - specifier: github:misskey-dev/browser-image-resizer - version: '@misskey-dev/browser-image-resizer@https://codeload.github.com/misskey-dev/browser-image-resizer/tar.gz/5a70660c2ac8aad3d436bfa67a5e7f7c8946cac4' chart.js: specifier: 4.4.2 version: 4.4.2 @@ -1176,6 +1176,7 @@ packages: '@babel/plugin-proposal-export-namespace-from@7.18.9': resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead. peerDependencies: '@babel/core': ^7.0.0-0 @@ -1306,55 +1307,55 @@ packages: '@bcoe/v8-coverage@0.2.3': resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} - '@biomejs/biome@1.7.1': - resolution: {integrity: sha512-wb2UNoFXcgaMdKXKT5ytsYntaogl2FSTjDt20CZynF3v7OXQUcIpTrr+be3XoOGpoZRj3Ytq9TSpmplUREXmeA==} + '@biomejs/biome@1.7.3': + resolution: {integrity: sha512-ogFQI+fpXftr+tiahA6bIXwZ7CSikygASdqMtH07J2cUzrpjyTMVc9Y97v23c7/tL1xCZhM+W9k4hYIBm7Q6cQ==} engines: {node: '>=14.21.3'} hasBin: true - '@biomejs/cli-darwin-arm64@1.7.1': - resolution: {integrity: sha512-qfLrIIB58dkgiY/1tgG6fSCBK22PZaSIf6blweZBsG6iMij05mEuJt50ne+zPnNFNUmt8t43NC/qOXT3iFHQBA==} + '@biomejs/cli-darwin-arm64@1.7.3': + resolution: {integrity: sha512-eDvLQWmGRqrPIRY7AIrkPHkQ3visEItJKkPYSHCscSDdGvKzYjmBJwG1Gu8+QC5ed6R7eiU63LEC0APFBobmfQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - '@biomejs/cli-darwin-x64@1.7.1': - resolution: {integrity: sha512-OGeyNsEcp5VnKbF9/TBjPCTHNEOm7oHegEve07U3KZmzqfpw2Oe3i9DVW8t6vvj1TYbrwWYCld25H34kBDY7Vg==} + '@biomejs/cli-darwin-x64@1.7.3': + resolution: {integrity: sha512-JXCaIseKRER7dIURsVlAJacnm8SG5I0RpxZ4ya3dudASYUc68WGl4+FEN03ABY3KMIq7hcK1tzsJiWlmXyosZg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - '@biomejs/cli-linux-arm64-musl@1.7.1': - resolution: {integrity: sha512-giH0/CzLOJ+wbxLxd5Shnr5xQf5fGnTRWLDe3lzjaF7IplVydNCEeZJtncB01SvyA6DAFJsvQ4LNxzAOQfEVCg==} + '@biomejs/cli-linux-arm64-musl@1.7.3': + resolution: {integrity: sha512-c8AlO45PNFZ1BYcwaKzdt46kYbuP6xPGuGQ6h4j3XiEDpyseRRUy/h+6gxj07XovmyxKnSX9GSZ6nVbZvcVUAw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-arm64@1.7.1': - resolution: {integrity: sha512-MQDf5wErj1iBvlcxCyOa0XqZYN8WJrupVgbNnqhntO3yVATg8GxduVUn1fDSaolznkDRsj7Pz3Xu1esBFwvfmg==} + '@biomejs/cli-linux-arm64@1.7.3': + resolution: {integrity: sha512-phNTBpo7joDFastnmZsFjYcDYobLTx4qR4oPvc9tJ486Bd1SfEVPHEvJdNJrMwUQK56T+TRClOQd/8X1nnjA9w==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-x64-musl@1.7.1': - resolution: {integrity: sha512-ySNDtPhsLxU125IFHHAxfpoHBpkM56s4mEXeO70GZtgZay/o1h8IUPWCWf5Z7gKgc4jwgYN1U1U9xabI3hZVAg==} + '@biomejs/cli-linux-x64-musl@1.7.3': + resolution: {integrity: sha512-UdEHKtYGWEX3eDmVWvQeT+z05T9/Sdt2+F/7zmMOFQ7boANeX8pcO6EkJPK3wxMudrApsNEKT26rzqK6sZRTRA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-linux-x64@1.7.1': - resolution: {integrity: sha512-3wmCsGcC3KZ4pfTknXHfyMMlXPMhgfXVAcG5GlrR+Tq2JGiAw0EUydaLpsSBEbcG7IxH6OiUZEJZ95kAycCHBA==} + '@biomejs/cli-linux-x64@1.7.3': + resolution: {integrity: sha512-vnedYcd5p4keT3iD48oSKjOIRPYcjSNNbd8MO1bKo9ajg3GwQXZLAH+0Cvlr+eMsO67/HddWmscSQwTFrC/uPA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-win32-arm64@1.7.1': - resolution: {integrity: sha512-8hIDakEqZn0i6+388noYKdZ0ZrovTwnvMU/Qp/oJou0G7EPVdXupOe0oxiQSdRN0W7f6CS/yjPCYuVGzDG6r0g==} + '@biomejs/cli-win32-arm64@1.7.3': + resolution: {integrity: sha512-unNCDqUKjujYkkSxs7gFIfdasttbDC4+z0kYmcqzRk6yWVoQBL4dNLcCbdnJS+qvVDNdI9rHp2NwpQ0WAdla4Q==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - '@biomejs/cli-win32-x64@1.7.1': - resolution: {integrity: sha512-3W9k3uH6Ea6VOpAS9xkkAlS0LTfnGQjmIUCegZ8SDtK2NgJ1gO+qdEkGJb0ltahusFTN1QxJ107dM7ASA9IUEg==} + '@biomejs/cli-win32-x64@1.7.3': + resolution: {integrity: sha512-ZmByhbrnmz/UUFYB622CECwhKIPjJLLPr5zr3edhu04LzbfcOrz16VYeNq5dpO1ADG70FORhAJkaIGdaVBG00w==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] @@ -2124,9 +2125,8 @@ packages: '@microsoft/tsdoc@0.14.2': resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==} - '@misskey-dev/browser-image-resizer@https://codeload.github.com/misskey-dev/browser-image-resizer/tar.gz/5a70660c2ac8aad3d436bfa67a5e7f7c8946cac4': - resolution: {tarball: https://codeload.github.com/misskey-dev/browser-image-resizer/tar.gz/5a70660c2ac8aad3d436bfa67a5e7f7c8946cac4} - version: 2.2.1-misskey.10 + '@misskey-dev/browser-image-resizer@2024.1.0': + resolution: {integrity: sha512-4EnO0zLW5NDtng3Gaz5MuT761uiuoOuplwX18wBqgj8w56LTU5BjLn/vbHwDIIe0j2gwqDYhMb7bDjmr1/Fomg==} '@mole-inc/bin-wrapper@8.0.1': resolution: {integrity: sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==} @@ -2420,6 +2420,7 @@ packages: '@swc/core@1.5.0': resolution: {integrity: sha512-fjADAC5gOOX54Rpcr1lF9DHLD+nPD5H/zXLtEgK2Ez3esmogT+LfHzCZtUxqetjvaMChKhQ0Pp0ZB6Hpz/tCbw==} engines: {node: '>=10'} + deprecated: Mac OS installation is broken peerDependencies: '@swc/helpers': ^0.5.0 peerDependenciesMeta: @@ -8990,35 +8991,35 @@ snapshots: '@bcoe/v8-coverage@0.2.3': {} - '@biomejs/biome@1.7.1': + '@biomejs/biome@1.7.3': optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.7.1 - '@biomejs/cli-darwin-x64': 1.7.1 - '@biomejs/cli-linux-arm64': 1.7.1 - '@biomejs/cli-linux-arm64-musl': 1.7.1 - '@biomejs/cli-linux-x64': 1.7.1 - '@biomejs/cli-linux-x64-musl': 1.7.1 - '@biomejs/cli-win32-arm64': 1.7.1 - '@biomejs/cli-win32-x64': 1.7.1 + '@biomejs/cli-darwin-arm64': 1.7.3 + '@biomejs/cli-darwin-x64': 1.7.3 + '@biomejs/cli-linux-arm64': 1.7.3 + '@biomejs/cli-linux-arm64-musl': 1.7.3 + '@biomejs/cli-linux-x64': 1.7.3 + '@biomejs/cli-linux-x64-musl': 1.7.3 + '@biomejs/cli-win32-arm64': 1.7.3 + '@biomejs/cli-win32-x64': 1.7.3 - '@biomejs/cli-darwin-arm64@1.7.1': {} + '@biomejs/cli-darwin-arm64@1.7.3': {} - '@biomejs/cli-darwin-x64@1.7.1': {} + '@biomejs/cli-darwin-x64@1.7.3': {} - '@biomejs/cli-linux-arm64-musl@1.7.1': + '@biomejs/cli-linux-arm64-musl@1.7.3': optional: true - '@biomejs/cli-linux-arm64@1.7.1': {} + '@biomejs/cli-linux-arm64@1.7.3': {} - '@biomejs/cli-linux-x64-musl@1.7.1': + '@biomejs/cli-linux-x64-musl@1.7.3': optional: true - '@biomejs/cli-linux-x64@1.7.1': {} + '@biomejs/cli-linux-x64@1.7.3': {} - '@biomejs/cli-win32-arm64@1.7.1': + '@biomejs/cli-win32-arm64@1.7.3': optional: true - '@biomejs/cli-win32-x64@1.7.1': + '@biomejs/cli-win32-x64@1.7.3': optional: true '@bull-board/api@5.16.0(@bull-board/ui@5.16.0)': @@ -9932,7 +9933,7 @@ snapshots: '@microsoft/tsdoc@0.14.2': {} - '@misskey-dev/browser-image-resizer@https://codeload.github.com/misskey-dev/browser-image-resizer/tar.gz/5a70660c2ac8aad3d436bfa67a5e7f7c8946cac4': {} + '@misskey-dev/browser-image-resizer@2024.1.0': {} '@mole-inc/bin-wrapper@8.0.1': dependencies: