Compare commits

...

5 Commits

Author SHA1 Message Date
syuilo
a3832d73fd 13.0.0-rc.7 2023-01-15 09:19:11 +09:00
syuilo
cedb4267ba update deps 2023-01-15 09:19:02 +09:00
syuilo
9c6629d582 refactor(client): use css modules 2023-01-15 09:14:17 +09:00
syuilo
4ee4e70ee0 fix(client): Custom emojis in Inline emoji autocomplete(MkAutoComplete) is way too big
Fix #9570
2023-01-15 09:09:44 +09:00
syuilo
bb7867351c typo 2023-01-15 09:03:07 +09:00
10 changed files with 415 additions and 306 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "13.0.0-rc.6", "version": "13.0.0-rc.7",
"codename": "indigo", "codename": "indigo",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -53,8 +53,8 @@
"devDependencies": { "devDependencies": {
"@types/gulp": "4.0.10", "@types/gulp": "4.0.10",
"@types/gulp-rename": "2.0.1", "@types/gulp-rename": "2.0.1",
"@typescript-eslint/eslint-plugin": "5.48.0", "@typescript-eslint/eslint-plugin": "5.48.1",
"@typescript-eslint/parser": "5.48.0", "@typescript-eslint/parser": "5.48.1",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"cypress": "12.3.0", "cypress": "12.3.0",
"eslint": "^8.31.0", "eslint": "^8.31.0",
@@ -62,6 +62,6 @@
"typescript": "4.9.4" "typescript": "4.9.4"
}, },
"optionalDependencies": { "optionalDependencies": {
"@tensorflow/tfjs-core": "^4.1.0" "@tensorflow/tfjs-core": "^4.2.0"
} }
} }

View File

@@ -21,17 +21,17 @@
"@tensorflow/tfjs-node": "4.1.0" "@tensorflow/tfjs-node": "4.1.0"
}, },
"dependencies": { "dependencies": {
"@bull-board/api": "^4.10.1", "@bull-board/api": "^4.10.2",
"@bull-board/fastify": "^4.10.1", "@bull-board/fastify": "^4.10.2",
"@bull-board/ui": "^4.10.1", "@bull-board/ui": "^4.10.2",
"@discordapp/twemoji": "14.0.2", "@discordapp/twemoji": "14.0.2",
"@fastify/accepts": "4.1.0", "@fastify/accepts": "4.1.0",
"@fastify/cookie": "^8.3.0", "@fastify/cookie": "^8.3.0",
"@fastify/cors": "8.2.0", "@fastify/cors": "8.2.0",
"@fastify/http-proxy": "^8.4.0", "@fastify/http-proxy": "^8.4.0",
"@fastify/multipart": "7.3.0", "@fastify/multipart": "7.4.0",
"@fastify/static": "6.6.0", "@fastify/static": "6.6.1",
"@fastify/view": "7.3.0", "@fastify/view": "7.4.0",
"@nestjs/common": "9.2.1", "@nestjs/common": "9.2.1",
"@nestjs/core": "9.2.1", "@nestjs/core": "9.2.1",
"@nestjs/testing": "9.2.1", "@nestjs/testing": "9.2.1",
@@ -41,7 +41,7 @@
"ajv": "8.12.0", "ajv": "8.12.0",
"archiver": "5.3.1", "archiver": "5.3.1",
"autwh": "0.1.0", "autwh": "0.1.0",
"aws-sdk": "2.1289.0", "aws-sdk": "2.1295.0",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"blurhash": "2.0.4", "blurhash": "2.0.4",
"bull": "4.10.2", "bull": "4.10.2",
@@ -58,7 +58,7 @@
"escape-regexp": "0.0.1", "escape-regexp": "0.0.1",
"fastify": "4.11.0", "fastify": "4.11.0",
"feed": "4.2.2", "feed": "4.2.2",
"file-type": "18.0.0", "file-type": "18.1.0",
"fluent-ffmpeg": "2.1.2", "fluent-ffmpeg": "2.1.2",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"got": "12.5.3", "got": "12.5.3",
@@ -67,7 +67,7 @@
"ip-cidr": "3.0.11", "ip-cidr": "3.0.11",
"is-svg": "4.3.2", "is-svg": "4.3.2",
"js-yaml": "4.1.0", "js-yaml": "4.1.0",
"jsdom": "20.0.3", "jsdom": "21.0.0",
"json5": "2.2.3", "json5": "2.2.3",
"json5-loader": "4.0.1", "json5-loader": "4.0.1",
"jsonld": "8.1.0", "jsonld": "8.1.0",
@@ -77,7 +77,7 @@
"misskey-js": "0.0.14", "misskey-js": "0.0.14",
"ms": "3.0.0-canary.1", "ms": "3.0.0-canary.1",
"nested-property": "4.0.0", "nested-property": "4.0.0",
"nodemailer": "6.8.0", "nodemailer": "6.9.0",
"nsfwjs": "2.4.2", "nsfwjs": "2.4.2",
"oauth": "^0.10.0", "oauth": "^0.10.0",
"os-utils": "0.0.14", "os-utils": "0.0.14",
@@ -87,7 +87,7 @@
"probe-image-size": "7.2.3", "probe-image-size": "7.2.3",
"promise-limit": "2.7.0", "promise-limit": "2.7.0",
"pug": "3.0.2", "pug": "3.0.2",
"punycode": "2.1.1", "punycode": "2.2.0",
"pureimage": "0.3.15", "pureimage": "0.3.15",
"qrcode": "1.5.1", "qrcode": "1.5.1",
"random-seed": "0.3.0", "random-seed": "0.3.0",
@@ -109,7 +109,7 @@
"stringz": "2.1.0", "stringz": "2.1.0",
"summaly": "2.7.0", "summaly": "2.7.0",
"syslog-pro": "git+https://github.com/misskey-dev/SyslogPro#0.2.9-misskey.2", "syslog-pro": "git+https://github.com/misskey-dev/SyslogPro#0.2.9-misskey.2",
"systeminformation": "5.17.1", "systeminformation": "5.17.3",
"tinycolor2": "1.5.2", "tinycolor2": "1.5.2",
"tmp": "0.2.1", "tmp": "0.2.1",
"tsc-alias": "1.8.2", "tsc-alias": "1.8.2",
@@ -117,18 +117,18 @@
"twemoji-parser": "14.0.0", "twemoji-parser": "14.0.0",
"typeorm": "0.3.11", "typeorm": "0.3.11",
"ulid": "2.3.0", "ulid": "2.3.0",
"undici": "^5.14.0", "undici": "^5.15.0",
"unzipper": "0.10.11", "unzipper": "0.10.11",
"uuid": "9.0.0", "uuid": "9.0.0",
"vary": "1.1.2", "vary": "1.1.2",
"web-push": "3.5.0", "web-push": "3.5.0",
"websocket": "1.0.34", "websocket": "1.0.34",
"ws": "8.11.0", "ws": "8.12.0",
"xev": "3.0.2" "xev": "3.0.2"
}, },
"devDependencies": { "devDependencies": {
"@redocly/openapi-core": "1.0.0-beta.117", "@redocly/openapi-core": "1.0.0-beta.120",
"@swc/core": "1.3.25", "@swc/core": "1.3.26",
"@swc/jest": "0.2.24", "@swc/jest": "0.2.24",
"@types/accepts": "1.3.5", "@types/accepts": "1.3.5",
"@types/archiver": "5.3.1", "@types/archiver": "5.3.1",
@@ -172,11 +172,11 @@
"@types/web-push": "3.3.2", "@types/web-push": "3.3.2",
"@types/websocket": "1.0.5", "@types/websocket": "1.0.5",
"@types/ws": "8.5.4", "@types/ws": "8.5.4",
"@typescript-eslint/eslint-plugin": "5.48.0", "@typescript-eslint/eslint-plugin": "5.48.1",
"@typescript-eslint/parser": "5.48.0", "@typescript-eslint/parser": "5.48.1",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"eslint": "8.31.0", "eslint": "8.31.0",
"eslint-plugin-import": "2.26.0", "eslint-plugin-import": "2.27.4",
"execa": "6.1.0", "execa": "6.1.0",
"jest": "29.3.1", "jest": "29.3.1",
"jest-mock": "^29.3.1", "jest-mock": "^29.3.1",

View File

@@ -18,7 +18,7 @@
"autobind-decorator": "2.4.0", "autobind-decorator": "2.4.0",
"autosize": "5.0.2", "autosize": "5.0.2",
"blurhash": "2.0.4", "blurhash": "2.0.4",
"broadcast-channel": "4.19.1", "broadcast-channel": "4.20.1",
"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.3", "browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
"canvas-confetti": "^1.6.0", "canvas-confetti": "^1.6.0",
"chart.js": "4.1.2", "chart.js": "4.1.2",
@@ -41,10 +41,10 @@
"misskey-js": "0.0.14", "misskey-js": "0.0.14",
"photoswipe": "5.3.4", "photoswipe": "5.3.4",
"prismjs": "1.29.0", "prismjs": "1.29.0",
"punycode": "2.1.1", "punycode": "2.2.0",
"querystring": "0.2.1", "querystring": "0.2.1",
"rndstr": "1.0.0", "rndstr": "1.0.0",
"rollup": "3.9.1", "rollup": "3.10.0",
"s-age": "1.1.2", "s-age": "1.1.2",
"sanitize-html": "^2.8.1", "sanitize-html": "^2.8.1",
"sass": "1.57.1", "sass": "1.57.1",
@@ -81,16 +81,16 @@
"@types/uuid": "9.0.0", "@types/uuid": "9.0.0",
"@types/websocket": "1.0.5", "@types/websocket": "1.0.5",
"@types/ws": "8.5.4", "@types/ws": "8.5.4",
"@typescript-eslint/eslint-plugin": "5.48.0", "@typescript-eslint/eslint-plugin": "5.48.1",
"@typescript-eslint/parser": "5.48.0", "@typescript-eslint/parser": "5.48.1",
"@vue/runtime-core": "3.2.45", "@vue/runtime-core": "3.2.45",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"cypress": "12.3.0", "cypress": "12.3.0",
"eslint": "8.31.0", "eslint": "8.31.0",
"eslint-plugin-import": "2.26.0", "eslint-plugin-import": "2.27.4",
"eslint-plugin-vue": "9.8.0", "eslint-plugin-vue": "9.9.0",
"start-server-and-test": "1.15.2", "start-server-and-test": "1.15.2",
"vue-eslint-parser": "^9.1.0", "vue-eslint-parser": "^9.1.0",
"vue-tsc": "^1.0.22" "vue-tsc": "^1.0.24"
} }
} }

View File

@@ -17,9 +17,7 @@
</ol> </ol>
<ol v-else-if="emojis.length > 0" ref="suggests" :class="$style.list"> <ol v-else-if="emojis.length > 0" ref="suggests" :class="$style.list">
<li v-for="emoji in emojis" :key="emoji.emoji" :class="$style.item" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown"> <li v-for="emoji in emojis" :key="emoji.emoji" :class="$style.item" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
<div :class="$style.emoji"> <MkEmoji :emoji="emoji.emoji" :class="$style.emoji"/>
<MkEmoji :emoji="emoji.emoji"/>
</div>
<!-- eslint-disable-next-line vue/no-v-html --> <!-- eslint-disable-next-line vue/no-v-html -->
<span v-if="q" :class="$style.emojiName" v-html="sanitizeHtml(emoji.name.replace(q, `<b>${q}</b>`))"></span> <span v-if="q" :class="$style.emojiName" v-html="sanitizeHtml(emoji.name.replace(q, `<b>${q}</b>`))"></span>
<span v-else v-text="emoji.name"></span> <span v-else v-text="emoji.name"></span>
@@ -439,14 +437,15 @@ onBeforeUnmount(() => {
} }
.emoji { .emoji {
flex-shrink: 0; flex-shrink: 0 !important;
display: flex; display: flex !important;
margin: 0 4px 0 0; margin: 0 4px 0 0 !important;
height: 24px; height: 24px !important;
width: 24px; width: 24px !important;
justify-content: center; justify-content: center !important;
align-items: center; align-items: center !important;
font-size: 20px; font-size: 20px !important;
pointer-events: none !important;
} }
.emojiImg { .emojiImg {

View File

@@ -1,10 +1,10 @@
<template> <template>
<MkTooltip ref="tooltip" :showing="showing" :x="x" :y="y" :max-width="340" :direction="'top'" :inner-margin="16" @closed="emit('closed')"> <MkTooltip ref="tooltip" :showing="showing" :x="x" :y="y" :max-width="340" :direction="'top'" :inner-margin="16" @closed="emit('closed')">
<div v-if="title || series" class="qpcyisrl"> <div v-if="title || series">
<div v-if="title" class="title">{{ title }}</div> <div v-if="title" :class="$style.title">{{ title }}</div>
<template v-if="series"> <template v-if="series">
<div v-for="x in series" class="series"> <div v-for="x in series">
<span class="color" :style="{ background: x.backgroundColor, borderColor: x.borderColor }"></span> <span :class="$style.color" :style="{ background: x.backgroundColor, borderColor: x.borderColor }"></span>
<span>{{ x.text }}</span> <span>{{ x.text }}</span>
</div> </div>
</template> </template>
@@ -33,21 +33,17 @@ const emit = defineEmits<{
}>(); }>();
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.qpcyisrl { .title {
> .title { margin-bottom: 4px;
margin-bottom: 4px; }
}
> .series { .color {
> .color { display: inline-block;
display: inline-block; width: 8px;
width: 8px; height: 8px;
height: 8px; border-width: 1px;
border-width: 1px; border-style: solid;
border-style: solid; margin-right: 8px;
margin-right: 8px;
}
}
} }
</style> </style>

View File

@@ -1,6 +1,12 @@
<template> <template>
<Transition :name="$store.state.animation ? 'fade' : ''" appear> <Transition
<div ref="rootEl" class="nvlagfpb" :style="{ zIndex }" @contextmenu.prevent.stop="() => {}"> appear
:enter-active-class="$store.state.animation ? $style.transition_fade_enterActive : ''"
:leave-active-class="$store.state.animation ? $style.transition_fade_leaveActive : ''"
:enter-from-class="$store.state.animation ? $style.transition_fade_enterFrom : ''"
:leave-to-class="$store.state.animation ? $style.transition_fade_leaveTo : ''"
>
<div ref="rootEl" :class="$style.root" :style="{ zIndex }" @contextmenu.prevent.stop="() => {}">
<MkMenu :items="items" :align="'left'" @close="$emit('closed')"/> <MkMenu :items="items" :align="'left'" @close="$emit('closed')"/>
</div> </div>
</Transition> </Transition>
@@ -68,18 +74,19 @@ function onMousedown(evt: Event) {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.nvlagfpb { .transition_fade_enterActive,
position: absolute; .transition_fade_leaveActive {
}
.fade-enter-active, .fade-leave-active {
transition: opacity 0.3s cubic-bezier(0.16, 1, 0.3, 1), transform 0.3s cubic-bezier(0.16, 1, 0.3, 1); transition: opacity 0.3s cubic-bezier(0.16, 1, 0.3, 1), transform 0.3s cubic-bezier(0.16, 1, 0.3, 1);
transform-origin: left top; transform-origin: left top;
} }
.transition_fade_enterFrom,
.fade-enter-from, .fade-leave-to { .transition_fade_leaveTo {
opacity: 0; opacity: 0;
transform: scale(0.9); transform: scale(0.9);
} }
.root {
position: absolute;
}
</style> </style>

View File

@@ -31,6 +31,3 @@ const emit = defineEmits<{
const shown = ref(!!props.initialShown); const shown = ref(!!props.initialShown);
</script> </script>
<style lang="scss" scoped>
</style>

View File

@@ -1,5 +1,5 @@
<template> <template>
<div v-if="meta" class="xfbouadm" :style="{ backgroundImage: `url(${ meta.backgroundImageUrl })` }"></div> <div v-if="meta" :class="$style.root" :style="{ backgroundImage: `url(${ meta.backgroundImageUrl })` }"></div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@@ -14,8 +14,8 @@ os.api('meta', { detail: true }).then(gotMeta => {
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" module>
.xfbouadm { .root {
background-position: center; background-position: center;
background-size: cover; background-size: cover;
} }

View File

@@ -493,7 +493,7 @@ function readPromo() {
bottom: 1em; bottom: 1em;
} }
.howLessLabel { .showLessLabel {
display: inline-block; display: inline-block;
background: var(--popup); background: var(--popup);
padding: 6px 10px; padding: 6px 10px;

566
yarn.lock

File diff suppressed because it is too large Load Diff