Merge branch 'develop'

.node-version

@@ -1 +1 @@
-v11.7.0
+v12.1.0

CHANGELOG.md

@@ -73,8 +73,16 @@ mongodb:
 8. master ブランチに戻す
 9. enjoy
 
+11.10.1 (2019/05/04)
+--------------------
+### Fixes
+* MisskeyPagesでページブロックを削除できなくなっていた問題を修正
+
+### その他
+* Node.js v12対応
+
 11.10.0 (2019/05/03)
--------------------
+--------------------
 ### 注意
 このアップデートを適用した後、プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:11-alpine AS base
+FROM node:12.1-alpine AS base
 
 ENV NODE_ENV=production
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.10.0",
+	"version": "11.10.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -63,8 +63,8 @@
 		"@types/lolex": "3.1.1",
 		"@types/minio": "7.0.1",
 		"@types/mocha": "5.2.6",
-		"@types/node": "11.13.4",
+		"@types/node": "11.13.8",
-		"@types/nodemailer": "4.6.7",
+		"@types/nodemailer": "4.6.8",
 		"@types/nprogress": "0.0.29",
 		"@types/oauth": "0.9.1",
 		"@types/parse5": "5.0.0",
@@ -77,7 +77,7 @@
 		"@types/redis": "2.8.12",
 		"@types/rename": "1.0.1",
 		"@types/request": "2.48.1",
-		"@types/request-promise-native": "1.0.15",
+		"@types/request-promise-native": "1.0.16",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.28",
@@ -89,7 +89,7 @@
 		"@types/tmp": "0.1.0",
 		"@types/uuid": "3.4.4",
 		"@types/web-push": "3.3.0",
-		"@types/webpack": "4.4.27",
+		"@types/webpack": "4.4.29",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
@@ -112,12 +112,12 @@
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
-		"diskusage": "1.1.0",
+		"diskusage": "1.1.1",
 		"double-ended-queue": "2.1.0-0",
 		"emojilib": "2.4.0",
 		"eslint": "5.16.0",
 		"eslint-plugin-vue": "5.2.2",
-		"eventemitter3": "3.1.0",
+		"eventemitter3": "3.1.2",
 		"feed": "2.0.4",
 		"file-type": "10.11.0",
 		"fuckadblock": "3.2.1",
@@ -160,13 +160,13 @@
 		"loader-utils": "1.2.3",
 		"lolex": "3.1.0",
 		"lookup-dns-cache": "2.1.0",
-		"minio": "7.0.7",
+		"minio": "7.0.8",
-		"mocha": "6.1.3",
+		"mocha": "6.1.4",
 		"moji": "0.5.1",
 		"moment": "2.24.0",
 		"ms": "2.1.1",
 		"nested-property": "0.0.7",
-		"node-fetch": "2.3.0",
+		"node-fetch": "2.5.0",
 		"nodemailer": "6.1.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
@@ -234,8 +234,8 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "3.0.0",
-		"vue-i18n": "8.11.1",
+		"vue-i18n": "8.11.2",
-		"vue-js-modal": "1.3.28",
+		"vue-js-modal": "1.3.31",
 		"vue-json-pretty": "1.6.0",
 		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
@@ -251,9 +251,9 @@
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.3",
 		"webpack": "4.30.0",
-		"webpack-cli": "3.3.0",
+		"webpack-cli": "3.3.1",
 		"websocket": "1.0.28",
-		"ws": "6.2.1",
+		"ws": "7.0.0",
 		"xev": "2.0.1"
 	}
 }

src/client/app/common/views/components/page-editor/page-editor.blocks.vue

@@ -1,6 +1,6 @@
 <template>
 <x-draggable tag="div" :list="blocks" handle=".drag-handle" :group="{ name: 'blocks' }" animation="150" swap-threshold="0.5">
-	<component v-for="block in blocks" :is="'x-' + block.type" :value="block" @input="updateItem" @remove="removeItem" :key="block.id" :ai-script="aiScript"/>
+	<component v-for="block in blocks" :is="'x-' + block.type" :value="block" @input="updateItem" @remove="() => removeItem(block)" :key="block.id" :ai-script="aiScript"/>
 </x-draggable>
 </template>