Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history 
(cherry picked from commit f7da2ba)
(cherry picked from commit d60c307)

Co-authored-by: おさむのひと <[email protected]>
Co-authored-by: かっこかり <[email protected]>
  • Loading branch information
@u1-liquid @samunohito @kakkokari-gtyih
3 people committed Jan 13, 2025
1 parent cf1952a commit 44a600d
Show file tree
Hide file tree
Showing 14 changed files with 2,003 additions and 1,846 deletions.
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "git",
"url": "https://github.com/MisskeyIO/misskey.git"
},
"packageManager": "[email protected].0",
"packageManager": "[email protected].3",
"workspaces": [
"packages/frontend",
"packages/backend",
Expand Down Expand Up @@ -56,19 +56,19 @@
"jpeg-js": "0.4.4",
"lodash": "4.17.21",
"sharp": "0.33.5",
"tough-cookie": "5.0.0",
"web-streams-polyfill": "4.0.0"
"tough-cookie": "5.1.0",
"web-streams-polyfill": "4.1.0"
},
"dependencies": {
"cssnano": "7.0.6",
"execa": "9.5.2",
"js-yaml": "4.1.0",
"postcss": "8.4.49",
"terser": "5.37.0",
"typescript": "5.7.2"
"typescript": "5.7.3"
},
"devDependencies": {
"@types/node": "22.10.2",
"@types/node": "22.10.5",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"cross-env": "7.0.3",
Expand Down
70 changes: 35 additions & 35 deletions packages/backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
"generate-api-json": "pnpm build && node ./scripts/generate_api_json.js"
},
"optionalDependencies": {
"@swc/core-darwin-arm64": "1.10.3",
"@swc/core-darwin-x64": "1.10.3",
"@swc/core-linux-arm-gnueabihf": "1.10.3",
"@swc/core-linux-arm64-gnu": "1.10.3",
"@swc/core-linux-arm64-musl": "1.10.3",
"@swc/core-linux-x64-gnu": "1.10.3",
"@swc/core-linux-x64-musl": "1.10.3",
"@swc/core-win32-arm64-msvc": "1.10.3",
"@swc/core-win32-ia32-msvc": "1.10.3",
"@swc/core-win32-x64-msvc": "1.10.3",
"@swc/core-darwin-arm64": "1.10.7",
"@swc/core-darwin-x64": "1.10.7",
"@swc/core-linux-arm-gnueabihf": "1.10.7",
"@swc/core-linux-arm64-gnu": "1.10.7",
"@swc/core-linux-arm64-musl": "1.10.7",
"@swc/core-linux-x64-gnu": "1.10.7",
"@swc/core-linux-x64-musl": "1.10.7",
"@swc/core-win32-arm64-msvc": "1.10.7",
"@swc/core-win32-ia32-msvc": "1.10.7",
"@swc/core-win32-x64-msvc": "1.10.7",
"@tensorflow/tfjs": "4.22.0",
"@tensorflow/tfjs-node": "4.22.0",
"bufferutil": "4.0.9",
Expand All @@ -63,34 +63,34 @@
},
"dependencies": {
"@authenio/samlify-node-xmllint": "2.0.0",
"@aws-sdk/client-s3": "3.717.0",
"@aws-sdk/lib-storage": "3.717.0",
"@bull-board/api": "6.5.4",
"@bull-board/fastify": "6.5.4",
"@bull-board/ui": "6.5.4",
"@aws-sdk/client-s3": "3.726.1",
"@aws-sdk/lib-storage": "3.726.1",
"@bull-board/api": "6.6.1",
"@bull-board/fastify": "6.6.1",
"@bull-board/ui": "6.6.1",
"@discordapp/twemoji": "15.1.0",
"@elastic/elasticsearch": "8.17.0",
"@fastify/accepts": "5.0.2",
"@fastify/cookie": "11.0.1",
"@fastify/cors": "10.0.1",
"@fastify/express": "4.0.1",
"@fastify/formbody": "8.0.1",
"@fastify/http-proxy": "11.0.0",
"@fastify/multipart": "9.0.1",
"@fastify/static": "8.0.3",
"@fastify/view": "10.0.1",
"@fastify/cookie": "11.0.2",
"@fastify/cors": "10.0.2",
"@fastify/express": "4.0.2",
"@fastify/formbody": "8.0.2",
"@fastify/http-proxy": "11.0.1",
"@fastify/multipart": "9.0.2",
"@fastify/static": "8.0.4",
"@fastify/view": "10.0.2",
"@misskey-dev/sharp-read-bmp": "1.2.0",
"@misskey-dev/summaly": "github:MisskeyIO/summaly#5.1.3",
"@napi-rs/canvas": "0.1.65",
"@nestjs/common": "10.4.15",
"@nestjs/core": "10.4.15",
"@nestjs/testing": "10.4.15",
"@peertube/http-signature": "1.7.0",
"@simplewebauthn/server": "13.0.0",
"@simplewebauthn/server": "13.1.0",
"@sinonjs/fake-timers": "11.3.1",
"@smithy/node-http-handler": "3.3.3",
"@swc/cli": "0.5.2",
"@swc/core": "1.10.3",
"@smithy/node-http-handler": "4.0.1",
"@swc/cli": "0.6.0",
"@swc/core": "1.10.7",
"@twemoji/parser": "15.1.1",
"accepts": "1.3.8",
"ajv": "8.17.1",
Expand All @@ -99,7 +99,7 @@
"bcryptjs": "2.4.3",
"blurhash": "2.0.5",
"body-parser": "1.20.3",
"bullmq": "5.34.5",
"bullmq": "5.34.9",
"cacheable-lookup": "7.0.0",
"cbor": "10.0.3",
"chalk": "5.4.1",
Expand All @@ -110,8 +110,8 @@
"content-disposition": "0.5.4",
"date-fns": "4.1.0",
"deep-email-validator": "0.1.21",
"fastify": "5.2.0",
"fastify-http-errors-enhanced": "6.0.0",
"fastify": "5.2.1",
"fastify-http-errors-enhanced": "6.0.1",
"fastify-raw-body": "5.0.0",
"feed": "4.2.2",
"file-type": "19.6.0",
Expand All @@ -127,7 +127,7 @@
"is-svg": "5.1.0",
"jose": "5.9.6",
"js-yaml": "4.1.0",
"jsdom": "25.0.1",
"jsdom": "26.0.0",
"json5": "2.2.3",
"jsonld": "8.3.3",
"jsrsasign": "11.1.0",
Expand Down Expand Up @@ -170,18 +170,18 @@
"rxjs": "7.8.1",
"samlify": "2.8.11",
"sanitize-html": "2.14.0",
"secure-json-parse": "3.0.1",
"secure-json-parse": "3.0.2",
"sharp": "0.33.5",
"slacc": "0.0.10",
"strict-event-emitter-types": "2.0.0",
"stringz": "2.1.0",
"systeminformation": "5.23.23",
"systeminformation": "5.25.11",
"tinycolor2": "1.6.0",
"tmp": "0.2.3",
"tsc-alias": "1.8.10",
"tsconfig-paths": "4.2.0",
"typeorm": "0.3.20",
"typescript": "5.7.2",
"typescript": "5.7.3",
"ulid": "2.3.0",
"vary": "1.1.2",
"web-push": "3.6.7",
Expand Down Expand Up @@ -210,7 +210,7 @@
"@types/jsrsasign": "10.5.15",
"@types/mime-types": "2.1.4",
"@types/ms": "0.7.34",
"@types/node": "22.10.2",
"@types/node": "22.10.5",
"@types/node-forge": "1.3.11",
"@types/nodemailer": "6.4.17",
"@types/oauth": "0.9.6",
Expand Down
28 changes: 14 additions & 14 deletions packages/frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"@rollup/plugin-typescript": "12.1.2",
"@rollup/pluginutils": "5.1.4",
"@syuilo/aiscript": "0.19.0",
"@tabler/icons-webfont": "3.26.0",
"@tabler/icons-webfont": "3.28.1",
"@twemoji/parser": "15.1.1",
"@vitejs/plugin-vue": "5.2.1",
"@vue/compiler-sfc": "3.5.13",
"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.13",
"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.15",
"astring": "1.9.0",
"broadcast-channel": "7.0.0",
"buraha": "0.0.1",
Expand All @@ -41,7 +41,7 @@
"chartjs-chart-matrix": "2.0.1",
"chartjs-plugin-gradient": "0.6.1",
"chartjs-plugin-zoom": "2.2.0",
"chromatic": "11.20.2",
"chromatic": "11.22.2",
"compare-versions": "6.1.1",
"cropperjs": "2.0.0-rc.0",
"date-fns": "4.1.0",
Expand All @@ -59,21 +59,21 @@
"misskey-reversi": "workspace:*",
"photoswipe": "5.4.4",
"punycode.js": "2.3.1",
"rollup": "4.29.1",
"rollup": "4.30.1",
"sanitize-html": "2.14.0",
"sass": "1.83.0",
"shiki": "1.24.4",
"sass": "1.83.1",
"shiki": "1.26.2",
"strict-event-emitter-types": "2.0.0",
"textarea-caret": "3.1.0",
"three": "0.171.0",
"three": "0.172.0",
"throttle-debounce": "5.0.2",
"tinycolor2": "1.6.0",
"tsc-alias": "1.8.10",
"tsconfig-paths": "4.2.0",
"typescript": "5.7.2",
"uuid": "11.0.3",
"typescript": "5.7.3",
"uuid": "11.0.5",
"v-code-diff": "1.13.1",
"vite": "6.0.6",
"vite": "6.0.7",
"vue": "3.5.13",
"vue-gtag": "2.0.1",
"vuedraggable": "next",
Expand Down Expand Up @@ -105,10 +105,10 @@
"@types/estree": "1.0.6",
"@types/matter-js": "0.19.8",
"@types/micromatch": "4.0.9",
"@types/node": "22.10.2",
"@types/node": "22.10.5",
"@types/punycode.js": "npm:@types/[email protected]",
"@types/sanitize-html": "2.13.0",
"@types/three": "0.171.0",
"@types/three": "0.172.0",
"@types/throttle-debounce": "5.0.2",
"@types/tinycolor2": "1.4.6",
"@types/ws": "8.5.13",
Expand All @@ -122,8 +122,8 @@
"eslint": "8.57.1",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-vue": "9.32.0",
"fast-glob": "3.3.2",
"happy-dom": "16.0.1",
"fast-glob": "3.3.3",
"happy-dom": "16.5.3",
"intersection-observer": "0.12.2",
"micromatch": "4.0.8",
"msw": "2.7.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/scripts/code-highlighter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/

import { getHighlighterCore, loadWasm } from 'shiki/core';
import { createHighlighterCore } from 'shiki/core';
import { createOnigurumaEngine } from 'shiki/engine/oniguruma';
import darkPlus from 'shiki/themes/dark-plus.mjs';
import { bundledThemesInfo } from 'shiki/themes';
import { bundledLanguagesInfo } from 'shiki/langs';
Expand Down Expand Up @@ -60,16 +61,15 @@ export async function getHighlighter(): Promise<HighlighterCore> {
}

async function initHighlighter() {
await loadWasm(import('shiki/onig.wasm?init'));

// テーマの重複を消す
const themes = unique([
darkPlus,
...(await Promise.all([getTheme('light'), getTheme('dark')])),
]);

const jsLangInfo = bundledLanguagesInfo.find(t => t.id === 'javascript');
const highlighter = await getHighlighterCore({
const highlighter = await createHighlighterCore({
engine: createOnigurumaEngine(() => import('shiki/onig.wasm?init')),
themes,
langs: [
...(jsLangInfo ? [async () => await jsLangInfo.import()] : []),
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/scripts/merge.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ import { deepClone } from './clone.js';
import type { Cloneable } from './clone.js';

type DeepPartial<T> = {
[P in keyof T]?: T[P] extends Record<string | number | symbol, unknown> ? DeepPartial<T[P]> : T[P];
[P in keyof T]?: T[P] extends Record<PropertyKey, unknown> ? DeepPartial<T[P]> : T[P];
};

function isPureObject(value: unknown): value is Record<string | number | symbol, unknown> {
function isPureObject(value: unknown): value is Record<PropertyKey, unknown> {
return typeof value === 'object' && value !== null && !Array.isArray(value);
}

/**
* valueにないキーをdefからもらう（再帰的）\
* nullはそのまま、undefinedはdefの値
**/
export function deepMerge<X extends Record<string | number | symbol, unknown>>(value: DeepPartial<X>, def: X): X {
export function deepMerge<X extends Record<PropertyKey, unknown>>(value: DeepPartial<X>, def: X): X {
if (isPureObject(value) && isPureObject(def)) {
const result = deepClone(value as Cloneable) as X;
for (const [k, v] of Object.entries(def) as [keyof X, X[keyof X]][]) {
if (!Object.hasOwn(value, k) || value[k] === undefined) {
result[k] = v;
} else if (isPureObject(v) && isPureObject(result[k])) {
const child = deepClone(result[k] as Cloneable) as DeepPartial<X[keyof X] & Record<string | number | symbol, unknown>>;
const child = deepClone(result[k] as Cloneable) as DeepPartial<X[keyof X] & Record<PropertyKey, unknown>>;
result[k] = deepMerge<typeof v>(child, v);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"declaration": false,
"sourceMap": false,
"target": "es2022",
"module": "nodenext",
"moduleResolution": "nodenext",
"module": "es2022",
"moduleResolution": "bundler",
"removeComments": false,
"noLib": false,
"strict": true,
Expand Down
6 changes: 3 additions & 3 deletions packages/misskey-bubble-game/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@
"devDependencies": {
"@misskey-dev/eslint-plugin": "1.0.0",
"@types/matter-js": "0.19.8",
"@types/node": "22.10.2",
"@types/node": "22.10.5",
"@types/seedrandom": "3.0.8",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"eslint": "8.57.1",
"nodemon": "3.1.9",
"typescript": "5.7.2"
"typescript": "5.7.3"
},
"files": [
"built"
],
"dependencies": {
"esbuild": "0.24.2",
"eventemitter3": "5.0.1",
"glob": "11.0.0",
"glob": "11.0.1",
"matter-js": "0.20.0",
"seedrandom": "3.0.5"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/misskey-js/etc/misskey-js.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
```ts

import { EventEmitter } from 'eventemitter3';
import _ReconnectingWebsocket from 'reconnecting-websocket';
import { Options } from 'reconnecting-websocket';

// Warning: (ae-forgotten-export) The symbol "components" needs to be exported by the entry point index.d.ts
//
Expand Down Expand Up @@ -3023,7 +3023,7 @@ export class Stream extends EventEmitter<StreamEvents> {
constructor(origin: string, user: {
token: string;
} | null, options?: {
WebSocket?: _ReconnectingWebsocket.Options['WebSocket'];
WebSocket?: Options['WebSocket'];
});
// (undocumented)
close(): void;
Expand Down
4 changes: 2 additions & 2 deletions packages/misskey-js/generator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"devDependencies": {
"@misskey-dev/eslint-plugin": "1.0.0",
"@readme/openapi-parser": "2.6.0",
"@types/node": "22.10.2",
"@types/node": "22.10.5",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"eslint": "8.57.1",
"openapi-types": "12.1.3",
"openapi-typescript": "6.7.6",
"ts-case-convert": "2.1.0",
"tsx": "4.19.2",
"typescript": "5.7.2"
"typescript": "5.7.3"
},
"files": [
"built"
Expand Down
Loading

0 comments on commit 44a600d

Please sign in to comment.