Merge remote-tracking branch 'misskey/develop' into develop

CHANGELOG.md

@@ -18,6 +18,7 @@ You should also include the user name that made the change.
 - Server: リモートユーザーを正しくブロックできるように修正する @xianonn
 - Client: 一度作ったwebhookの設定画面を開こうとするとページがフリーズする @syuilo
 - Client: MiAuth認証ページが機能していない @syuilo
+- Client: 一部のアプリからファイルを投稿フォームへドロップできない場合がある問題を修正 @m-hayabusa
 
 ## 12.117.1 (2022/07/19)
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.0-calc-beta.3.6",
+	"version": "12.118.0-calc-beta.4",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -54,12 +54,9 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/eslint-plugin": "latest",
+		"@typescript-eslint/parser": "5.30.7",
-		"@typescript-eslint/parser": "5.30.6",
 		"cross-env": "7.0.3",
-		"cypress": "10.3.0",
+		"cypress": "10.3.1",
-		"eslint-plugin-import": "^2.26.0",
-		"eslint-plugin-vue": "latest",
 		"start-server-and-test": "1.14.0",
 		"typescript": "4.7.4",
 		"vue-eslint-parser": "^9.0.2"

packages/backend/package.json

@@ -28,7 +28,6 @@
 		"@peertube/http-signature": "1.6.0",
 		"@sinonjs/fake-timers": "9.1.2",
 		"@syuilo/aiscript": "0.11.1",
-		"abort-controller": "3.0.0",
 		"ajv": "8.11.0",
 		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
@@ -45,13 +44,13 @@
 		"cli-highlight": "2.1.11",
 		"color-convert": "2.0.1",
 		"content-disposition": "0.5.4",
-		"date-fns": "2.28.0",
+		"date-fns": "2.29.1",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
 		"feed": "4.2.2",
 		"file-type": "17.1.3",
 		"fluent-ffmpeg": "2.1.2",
-		"got": "12.1.0",
+		"got": "12.2.0",
 		"hpagent": "0.1.2",
 		"ioredis": "4.28.5",
 		"ip-cidr": "3.0.10",
@@ -61,7 +60,7 @@
 		"json5": "2.2.1",
 		"json5-loader": "4.0.1",
 		"jsonld": "6.0.0",
-		"jsrsasign": "10.5.25",
+		"jsrsasign": "10.5.26",
 		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
@@ -71,14 +70,14 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"mfm-js": "0.23.0-canary.1",
+		"mfm-js": "0.23.0",
 		"mime-types": "2.1.35",
 		"misskey-js": "0.0.14",
 		"mocha": "10.0.0",
 		"ms": "3.0.0-canary.1",
 		"multer": "1.4.4",
 		"nested-property": "4.0.0",
-		"node-fetch": "3.2.8",
+		"node-fetch": "3.2.9",
 		"nodemailer": "6.7.7",
 		"nsfwjs": "2.4.1",
 		"oauth": "^0.9.15",
@@ -91,32 +90,30 @@
 		"pug": "3.0.2",
 		"punycode": "2.1.1",
 		"pureimage": "0.3.14",
-		"qrcode": "1.5.0",
+		"qrcode": "1.5.1",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
 		"re2": "1.17.7",
 		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
-		"require-all": "3.0.0",
 		"rndstr": "1.0.0",
 		"rss-parser": "3.12.0",
 		"s-age": "1.1.2",
-		"sanitize-html": "2.7.0",
+		"sanitize-html": "2.7.1",
 		"semver": "7.3.7",
 		"sharp": "0.30.6",
 		"speakeasy": "2.0.0",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"style-loader": "3.3.1",
 		"summaly": "2.7.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.12.0",
+		"systeminformation": "5.12.1",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
 		"ts-loader": "9.3.1",
-		"ts-node": "10.8.2",
+		"ts-node": "10.9.1",
-		"tsc-alias": "1.6.11",
+		"tsc-alias": "1.7.0",
 		"tsconfig-paths": "4.0.0",
 		"twemoji-parser": "14.0.0",
 		"typeorm": "0.3.7",
@@ -125,21 +122,20 @@
 		"uuid": "8.3.2",
 		"web-push": "3.5.0",
 		"websocket": "1.0.34",
-		"ws": "8.8.0",
+		"ws": "8.8.1",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.100",
+		"@redocly/openapi-core": "1.0.0-beta.104",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.15.8",
 		"@types/cbor": "6.0.0",
 		"@types/escape-regexp": "0.0.1",
 		"@types/fluent-ffmpeg": "2.1.20",
-		"@types/is-url": "1.2.30",
 		"@types/js-yaml": "4.0.5",
 		"@types/jsdom": "16.2.14",
 		"@types/jsonld": "1.5.6",
-		"@types/jsrsasign": "10.5.1",
+		"@types/jsrsasign": "10.5.2",
 		"@types/koa": "2.13.5",
 		"@types/koa-bodyparser": "4.3.7",
 		"@types/koa-cors": "0.0.2",
@@ -152,7 +148,7 @@
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "9.1.1",
-		"@types/node": "18.0.3",
+		"@types/node": "18.6.1",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.4",
 		"@types/oauth": "0.9.1",
@@ -174,10 +170,10 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.30.6",
+		"@typescript-eslint/eslint-plugin": "5.30.7",
-		"@typescript-eslint/parser": "5.30.6",
+		"@typescript-eslint/parser": "5.30.7",
 		"cross-env": "7.0.3",
-		"eslint": "8.19.0",
+		"eslint": "8.20.0",
 		"eslint-plugin-import": "2.26.0",
 		"execa": "6.1.0",
 		"form-data": "^4.0.0",

packages/client/package.json

@@ -15,47 +15,34 @@
 		"@syuilo/aiscript": "0.11.1",
 		"@vitejs/plugin-vue": "3.0.1",
 		"@vue/compiler-sfc": "3.2.37",
-		"abort-controller": "3.0.0",
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.1",
-		"autwh": "0.1.0",
 		"blurhash": "1.1.5",
-		"broadcast-channel": "4.13.0",
+		"broadcast-channel": "4.14.0",
-		"browser-image-resizer": "misskey-dev/browser-image-resizer#tag=v2.2.1-misskey.2",
+		"browser-image-resizer": "git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2",
-		"chart.js": "3.8.0",
+		"chart.js": "3.8.2",
 		"chartjs-adapter-date-fns": "2.0.0",
 		"chartjs-plugin-gradient": "0.5.0",
 		"chartjs-plugin-zoom": "1.2.1",
 		"compare-versions": "4.1.3",
-		"content-disposition": "0.5.4",
 		"cropperjs": "2.0.0-beta",
-		"date-fns": "2.28.0",
+		"date-fns": "2.29.1",
 		"escape-regexp": "0.0.1",
 		"eventemitter3": "4.0.7",
-		"feed": "4.2.2",
 		"idb-keyval": "6.2.0",
 		"insert-text-at-cursor": "0.3.0",
 		"json5": "2.2.1",
 		"katex": "0.15.6",
 		"matter-js": "0.18.0",
-		"mfm-js": "0.23.0-canary.1",
+		"mfm-js": "0.23.0",
 		"misskey-js": "0.0.14",
-		"mocha": "10.0.0",
+		"photoswipe": "5.3.0",
-		"ms": "2.1.3",
-		"nested-property": "4.0.0",
-		"photoswipe": "5.2.8",
 		"prismjs": "1.28.0",
-		"private-ip": "2.3.3",
-		"promise-limit": "2.7.0",
-		"pug": "3.0.2",
 		"punycode": "2.1.1",
-		"qrcode": "1.5.0",
 		"querystring": "0.2.1",
-		"random-seed": "0.3.0",
-		"reflect-metadata": "0.1.13",
 		"rndstr": "1.0.0",
 		"s-age": "1.1.2",
-		"sass": "1.53.0",
+		"sass": "1.54.0",
 		"seedrandom": "3.0.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
@@ -64,47 +51,37 @@
 		"three": "0.142.0",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.4.2",
-		"tsc-alias": "1.6.11",
+		"tsc-alias": "1.7.0",
 		"tsconfig-paths": "4.0.0",
 		"twemoji-parser": "14.0.0",
 		"typescript": "4.7.4",
 		"uuid": "8.3.2",
-		"v-debounce": "0.1.2",
 		"vanilla-tilt": "1.7.2",
-		"vite": "^3.0.2",
+		"vite": "3.0.3",
 		"vue": "3.2.37",
 		"vue-prism-editor": "2.0.0-alpha.2",
-		"vuedraggable": "4.0.1",
+		"vuedraggable": "4.0.1"
-		"websocket": "1.0.34",
-		"ws": "8.8.0"
 	},
 	"devDependencies": {
 		"@types/escape-regexp": "0.0.1",
 		"@types/glob": "7.2.0",
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@types/is-url": "1.2.30",
 		"@types/katex": "0.14.0",
 		"@types/matter-js": "0.17.7",
-		"@types/mocha": "9.1.1",
-		"@types/oauth": "0.9.1",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.4.2",
-		"@types/random-seed": "0.3.3",
 		"@types/seedrandom": "3.0.2",
 		"@types/throttle-debounce": "5.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/uuid": "8.3.4",
-		"@types/websocket": "1.0.5",
+		"@typescript-eslint/eslint-plugin": "5.30.7",
-		"@types/ws": "8.5.3",
+		"@typescript-eslint/parser": "5.30.7",
-		"@typescript-eslint/eslint-plugin": "5.30.6",
-		"@typescript-eslint/parser": "5.30.6",
 		"cross-env": "7.0.3",
-		"cypress": "10.3.0",
+		"cypress": "10.3.1",
-		"eslint": "8.19.0",
+		"eslint": "8.20.0",
 		"eslint-plugin-import": "2.26.0",
-		"eslint-plugin-vue": "9.2.0",
+		"eslint-plugin-vue": "9.3.0",
-		"rollup": "2.76.0",
+		"rollup": "2.77.0",
 		"start-server-and-test": "1.14.0"
 	}
 }

packages/client/src/components/form/link.vue

@@ -19,33 +19,16 @@
 </div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
-import { defineComponent } from 'vue';
+import { } from 'vue';
 
-export default defineComponent({
+const props = defineProps<{
-	props: {
+	to: string;
-		to: {
+	active?: boolean;
-			type: String,
+	external?: boolean;
-			required: true
+	behavior?: null | 'window' | 'browser' | 'modalWindow';
-		},
+	inline?: boolean;
-		active: {
+}>();
-			type: Boolean,
-			required: false
-		},
-		external: {
-			type: Boolean,
-			required: false
-		},
-		behavior: {
-			type: String,
-			required: false,
-		},
-		inline: {
-			type: Boolean,
-			required: false
-		},
-	},
-});
 </script>
 
 <style lang="scss" scoped>
@@ -61,7 +44,7 @@ export default defineComponent({
 		align-items: center;
 		width: 100%;
 		box-sizing: border-box;
-		padding: 12px 14px 12px 14px;
+		padding: 10px 14px;
 		background: var(--buttonBg);
 		border-radius: 6px;
 		font-size: 0.9em;

packages/client/src/components/post-form.vue

@@ -479,7 +479,22 @@ function onDragover(ev) {
 	if (isFile || isDriveFile) {
 		ev.preventDefault();
 		draghover = true;
-		ev.dataTransfer.dropEffect = ev.dataTransfer.effectAllowed === 'all' ? 'copy' : 'move';
+		switch (ev.dataTransfer.effectAllowed) {
+			case 'all':
+			case 'uninitialized':
+			case 'copy': 
+			case 'copyLink': 
+			case 'copyMove': 
+				ev.dataTransfer.dropEffect = 'copy';
+				break;
+			case 'linkMove':
+			case 'move':
+				ev.dataTransfer.dropEffect = 'move';
+				break;
+			default:
+				ev.dataTransfer.dropEffect = 'none';
+				break;
+		}
 	}
 }
 

packages/client/src/pages/settings/theme.vue

@@ -186,6 +186,7 @@ definePageMetadata({
 			text-align: left;
 			overflow: clip;
 			padding: 0 100px;
+			vertical-align: bottom;
 
 			input {
 				position: absolute;