From 2851a1a7efa6799f2af5ec4fb5ae89f23e05c216 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 4 May 2019 14:47:28 +0900
Subject: [PATCH 1/4] Update dependencies :rocket:
---
package.json | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/package.json b/package.json
index 27a6b60a5e..de433072dc 100644
--- a/package.json
+++ b/package.json
@@ -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/nodemailer": "4.6.7",
+ "@types/node": "11.13.8",
+ "@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",
- "mocha": "6.1.3",
+ "minio": "7.0.8",
+ "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-js-modal": "1.3.28",
+ "vue-i18n": "8.11.2",
+ "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"
}
}
From e62c810b7cb47f4e5708fce9834beda53e2148de Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 4 May 2019 14:53:46 +0900
Subject: [PATCH 2/4] Use node 12
---
.node-version | 2 +-
Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.node-version b/.node-version
index 79aa7360f1..bb0aefa18c 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-v11.7.0
+v12.1.0
diff --git a/Dockerfile b/Dockerfile
index be2768033d..8a61508767 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:11-alpine AS base
+FROM node:12.1-alpine AS base
ENV NODE_ENV=production
From d6131c0b09f11d1aabbf422cbc8b7debe95c7ad4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 4 May 2019 15:14:02 +0900
Subject: [PATCH 3/4] =?UTF-8?q?MisskeyPages=E3=81=A7=E3=83=9A=E3=83=BC?=
=?UTF-8?q?=E3=82=B8=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E3=82=92=E5=89=8A?=
=?UTF-8?q?=E9=99=A4=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3?=
=?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/views/components/page-editor/page-editor.blocks.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/client/app/common/views/components/page-editor/page-editor.blocks.vue b/src/client/app/common/views/components/page-editor/page-editor.blocks.vue
index 266b6d6b21..379c960ee1 100644
--- a/src/client/app/common/views/components/page-editor/page-editor.blocks.vue
+++ b/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>
From c6249b82d4b8bb19cee62b09179320bed31957bd Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 4 May 2019 15:21:35 +0900
Subject: [PATCH 4/4] 11.10.1
---
CHANGELOG.md | 10 +++++++++-
package.json | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 962ce57eb1..10bf40f065 100644
--- a/CHANGELOG.md
+++ b/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)の手順を実行してください
diff --git a/package.json b/package.json
index de433072dc..a549ac4d17 100644
--- a/package.json
+++ b/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",