usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into mkjs-n

This commit is contained in:
tamaina 2023-05-19 07:37:04 +00:00
parent f7a0213af9 02715f5d14
commit 0709ec5d82
6 changed files with 598 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -6,7 +6,7 @@
"type": "git", "type": "git",
"url": "https://github.com/misskey-dev/misskey.git" "url": "https://github.com/misskey-dev/misskey.git"
}, },
"packageManager": "pnpm@8.3.1", "packageManager": "pnpm@8.5.1",
"workspaces": [ "workspaces": [
"packages/frontend", "packages/frontend",
"packages/backend", "packages/backend",

26
packages/backend/package.json
View File

@ -51,9 +51,9 @@
"@aws-sdk/client-s3": "3.321.1", "@aws-sdk/client-s3": "3.321.1",
"@aws-sdk/lib-storage": "3.321.1", "@aws-sdk/lib-storage": "3.321.1",
"@aws-sdk/node-http-handler": "3.321.1", "@aws-sdk/node-http-handler": "3.321.1",
"@bull-board/api": "5.1.2", "@bull-board/api": "5.2.0",
"@bull-board/fastify": "5.1.2", "@bull-board/fastify": "5.2.0",
"@bull-board/ui": "5.1.2", "@bull-board/ui": "5.2.0",
"@discordapp/twemoji": "14.1.2", "@discordapp/twemoji": "14.1.2",
"@fastify/accepts": "4.1.0", "@fastify/accepts": "4.1.0",
"@fastify/cookie": "8.3.0", "@fastify/cookie": "8.3.0",
@ -62,13 +62,13 @@
"@fastify/multipart": "7.6.0", "@fastify/multipart": "7.6.0",
"@fastify/static": "6.10.1", "@fastify/static": "6.10.1",
"@fastify/view": "7.4.1", "@fastify/view": "7.4.1",
"@nestjs/common": "9.4.0", "@nestjs/common": "9.4.1",
"@nestjs/core": "9.4.0", "@nestjs/core": "9.4.1",
"@nestjs/testing": "9.4.0", "@nestjs/testing": "9.4.1",
"@peertube/http-signature": "1.7.0", "@peertube/http-signature": "1.7.0",
"@sinonjs/fake-timers": "10.0.2", "@sinonjs/fake-timers": "10.0.2",
"@swc/cli": "0.1.62", "@swc/cli": "0.1.62",
"@swc/core": "1.3.56", "@swc/core": "1.3.59",
"accepts": "1.3.8", "accepts": "1.3.8",
"ajv": "8.12.0", "ajv": "8.12.0",
"archiver": "5.3.1", "archiver": "5.3.1",
@ -93,7 +93,7 @@
"fluent-ffmpeg": "2.1.2", "fluent-ffmpeg": "2.1.2",
"form-data": "4.0.0", "form-data": "4.0.0",
"got": "12.6.0", "got": "12.6.0",
"happy-dom": "9.16.0", "happy-dom": "9.19.2",
"hpagent": "1.2.0", "hpagent": "1.2.0",
"ioredis": "5.3.2", "ioredis": "5.3.2",
"ip-cidr": "3.1.0", "ip-cidr": "3.1.0",
@ -116,7 +116,7 @@
"os-utils": "0.0.14", "os-utils": "0.0.14",
"otpauth": "9.1.2", "otpauth": "9.1.2",
"parse5": "7.1.2", "parse5": "7.1.2",
"pg": "8.10.0", "pg": "8.11.0",
"private-ip": "3.0.0", "private-ip": "3.0.0",
"probe-image-size": "7.2.3", "probe-image-size": "7.2.3",
"promise-limit": "2.7.0", "promise-limit": "2.7.0",
@ -136,10 +136,10 @@
"s-age": "1.1.2", "s-age": "1.1.2",
"sanitize-html": "2.10.0", "sanitize-html": "2.10.0",
"seedrandom": "3.0.5", "seedrandom": "3.0.5",
"semver": "7.5.0", "semver": "7.5.1",
"sharp": "0.32.1", "sharp": "0.32.1",
"sharp-read-bmp": "github:misskey-dev/sharp-read-bmp", "sharp-read-bmp": "github:misskey-dev/sharp-read-bmp",
"slacc": "0.0.7", "slacc": "0.0.9",
"strict-event-emitter-types": "2.0.0", "strict-event-emitter-types": "2.0.0",
"stringz": "2.1.0", "stringz": "2.1.0",
"summaly": "github:misskey-dev/summaly", "summaly": "github:misskey-dev/summaly",
@ -178,9 +178,9 @@
"@types/jsonld": "1.5.8", "@types/jsonld": "1.5.8",
"@types/jsrsasign": "10.5.8", "@types/jsrsasign": "10.5.8",
"@types/mime-types": "2.1.1", "@types/mime-types": "2.1.1",
"@types/node": "20.1.3", "@types/node": "20.2.1",
"@types/node-fetch": "3.0.3", "@types/node-fetch": "3.0.3",
"@types/nodemailer": "6.4.7", "@types/nodemailer": "6.4.8",
"@types/oauth": "0.9.1", "@types/oauth": "0.9.1",
"@types/pg": "8.6.6", "@types/pg": "8.6.6",
"@types/pug": "2.0.6", "@types/pug": "2.0.6",

16
packages/frontend/package.json
View File

@ -23,7 +23,7 @@
"@tabler/icons-webfont": "2.17.0", "@tabler/icons-webfont": "2.17.0",
"@vitejs/plugin-vue": "4.2.3", "@vitejs/plugin-vue": "4.2.3",
"@vue-macros/reactivity-transform": "0.3.7", "@vue-macros/reactivity-transform": "0.3.7",
"@vue/compiler-sfc": "3.3.2", "@vue/compiler-sfc": "3.3.4",
"autosize": "6.0.1", "autosize": "6.0.1",
"broadcast-channel": "4.20.2", "broadcast-channel": "4.20.2",
"browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3", "browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
@ -70,8 +70,8 @@
"typescript": "5.0.4", "typescript": "5.0.4",
"uuid": "9.0.0", "uuid": "9.0.0",
"vanilla-tilt": "1.8.0", "vanilla-tilt": "1.8.0",
"vite": "4.3.7", "vite": "4.3.8",
"vue": "3.3.2", "vue": "3.3.4",
"vue-plyr": "7.0.0", "vue-plyr": "7.0.0",
"vue-prism-editor": "2.0.0-alpha.2", "vue-prism-editor": "2.0.0-alpha.2",
"vuedraggable": "next" "vuedraggable": "next"
@ -103,7 +103,7 @@
"@types/gulp-rename": "2.0.2", "@types/gulp-rename": "2.0.2",
"@types/matter-js": "0.18.3", "@types/matter-js": "0.18.3",
"@types/micromatch": "4.0.2", "@types/micromatch": "4.0.2",
"@types/node": "20.1.7", "@types/node": "20.2.1",
"@types/punycode": "2.1.0", "@types/punycode": "2.1.0",
"@types/sanitize-html": "2.9.0", "@types/sanitize-html": "2.9.0",
"@types/seedrandom": "3.0.5", "@types/seedrandom": "3.0.5",
@ -115,8 +115,8 @@
"@types/ws": "8.5.4", "@types/ws": "8.5.4",
"@typescript-eslint/eslint-plugin": "5.59.5", "@typescript-eslint/eslint-plugin": "5.59.5",
"@typescript-eslint/parser": "5.59.5", "@typescript-eslint/parser": "5.59.5",
"@vitest/coverage-c8": "0.31.0", "@vitest/coverage-c8": "0.31.1",
"@vue/runtime-core": "3.3.2", "@vue/runtime-core": "3.3.4",
"astring": "1.8.4", "astring": "1.8.4",
"chokidar-cli": "3.0.0", "chokidar-cli": "3.0.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
@ -125,7 +125,7 @@
"eslint-plugin-import": "2.27.5", "eslint-plugin-import": "2.27.5",
"eslint-plugin-vue": "9.13.0", "eslint-plugin-vue": "9.13.0",
"fast-glob": "3.2.12", "fast-glob": "3.2.12",
"happy-dom": "9.18.3", "happy-dom": "9.19.2",
"micromatch": "3.1.10", "micromatch": "3.1.10",
"msw": "1.2.1", "msw": "1.2.1",
"msw-storybook-addon": "1.8.0", "msw-storybook-addon": "1.8.0",
@ -137,7 +137,7 @@
"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme", "storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
"summaly": "github:misskey-dev/summaly", "summaly": "github:misskey-dev/summaly",
"vite-plugin-turbosnap": "1.0.2", "vite-plugin-turbosnap": "1.0.2",
"vitest": "0.31.0", "vitest": "0.31.1",
"vitest-fetch-mock": "0.2.2", "vitest-fetch-mock": "0.2.2",
"vue-eslint-parser": "9.3.0", "vue-eslint-parser": "9.3.0",
"vue-tsc": "1.6.5" "vue-tsc": "1.6.5"

6
packages/frontend/src/ui/minimum.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="mk-app" style="container-type: inline-size;"> <div :class="$style.root" style="container-type: inline-size;">
<RouterView/> <RouterView/>
<XCommon/> <XCommon/>
@ -26,8 +26,8 @@ provideMetadataReceiver((info) => {
document.documentElement.style.overflowY = 'scroll'; document.documentElement.style.overflowY = 'scroll';
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.mk-app { .root {
min-height: 100dvh; min-height: 100dvh;
box-sizing: border-box; box-sizing: border-box;
} }

6
packages/frontend/src/ui/zen.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="mk-app" style="container-type: inline-size;"> <div :class="$style.root" style="container-type: inline-size;">
<RouterView/> <RouterView/>
<XCommon/> <XCommon/>
@ -26,8 +26,8 @@ provideMetadataReceiver((info) => {
document.documentElement.style.overflowY = 'scroll'; document.documentElement.style.overflowY = 'scroll';
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.mk-app { .root {
min-height: 100dvh; min-height: 100dvh;
box-sizing: border-box; box-sizing: border-box;
} }

972
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff