Merge branch 'develop' into mkjs-n

This commit is contained in:
tamaina
2023-05-19 07:37:04 +00:00
6 changed files with 598 additions and 430 deletions

View File

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

View File

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

View File

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