From c30f02ae4c046b73b94c437be5912fa5e94684b7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 10 Aug 2021 15:07:15 +0900 Subject: [PATCH] Update vue to 3.2.1 --- package.json | 4 +- src/client/scripts/paging.ts | 12 +++- yarn.lock | 106 +++++++++++++++++------------------ 3 files changed, 65 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index 45f74ef0be..b4dfcfb6da 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "@types/websocket": "1.0.3", "@types/ws": "7.4.6", "@typescript-eslint/parser": "4.28.3", - "@vue/compiler-sfc": "3.1.5", + "@vue/compiler-sfc": "3.2.1", "abort-controller": "3.0.0", "apexcharts": "3.27.2", "autobind-decorator": "2.4.0", @@ -238,7 +238,7 @@ "uuid": "8.3.2", "v-debounce": "0.1.2", "vanilla-tilt": "1.7.0", - "vue": "3.1.5", + "vue": "3.2.1", "vue-color": "2.8.1", "vue-json-pretty": "1.8.1", "vue-loader": "16.3.1", diff --git a/src/client/scripts/paging.ts b/src/client/scripts/paging.ts index 194c2e8003..1da518efa1 100644 --- a/src/client/scripts/paging.ts +++ b/src/client/scripts/paging.ts @@ -201,7 +201,11 @@ export default (opts) => ({ if (isBottom) { // オーバーフローしたら古いアイテムは捨てる if (this.items.length >= opts.displayLimit) { - this.items = this.items.slice(-opts.displayLimit); + // このやり方だとVue 3.2以降アニメーションが動かなくなる + //this.items = this.items.slice(-opts.displayLimit); + while (this.items.length >= opts.displayLimit) { + this.items.shift(); + } this.more = true; } } @@ -216,7 +220,11 @@ export default (opts) => ({ // オーバーフローしたら古いアイテムは捨てる if (this.items.length >= opts.displayLimit) { - this.items = this.items.slice(0, opts.displayLimit); + // このやり方だとVue 3.2以降アニメーションが動かなくなる + //this.items = this.items.slice(0, opts.displayLimit); + while (this.items.length >= opts.displayLimit) { + this.items.pop(); + } this.more = true; } } else { diff --git a/yarn.lock b/yarn.lock index 60f6d11ba8..131892cd2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1312,37 +1312,37 @@ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== -"@vue/compiler-core@3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.1.5.tgz#298f905b6065d6d81ff63756f98c60876b393c87" - integrity sha512-TXBhFinoBaXKDykJzY26UEuQU1K07FOp/0Ie+OXySqqk0bS0ZO7Xvl7UmiTUPYcLrWbxWBR7Bs/y55AI0MNc2Q== +"@vue/compiler-core@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.1.tgz#8e13232f7aef8e308fb2d4a10571a5640257064b" + integrity sha512-UEJf2ZGww5wGVdrWIXIZo04KdJFGPmI2bHRUsBZ3AdyCAqJ5ykRXKOBn1OR1hvA2YzimudOEyHM+DpbBv91Kww== dependencies: "@babel/parser" "^7.12.0" "@babel/types" "^7.12.0" - "@vue/shared" "3.1.5" + "@vue/shared" "3.2.1" estree-walker "^2.0.1" source-map "^0.6.1" -"@vue/compiler-dom@3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.1.5.tgz#cbb97020c62a5faa3fbc2a97916bd98041ac9856" - integrity sha512-ZsL3jqJ52OjGU/YiT/9XiuZAmWClKInZM2aFJh9gnsAPqOrj2JIELMbkIFpVKR/CrVO/f2VxfPiiQdQTr65jcQ== +"@vue/compiler-dom@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.1.tgz#5cc68873f1928c7b9aee8c8a2846f7f362cb1ab9" + integrity sha512-tXg8tkPb3j54zNfWqoao9T1JI41yWPz8TROzmif/QNNA46eq8/SRuRsBd36i47GWaz7mh+yg3vOJ87/YBjcMyQ== dependencies: - "@vue/compiler-core" "3.1.5" - "@vue/shared" "3.1.5" + "@vue/compiler-core" "3.2.1" + "@vue/shared" "3.2.1" -"@vue/compiler-sfc@3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.1.5.tgz#e61e54f3a963b0f4a8e523fbb8632390dc52b0d6" - integrity sha512-mtMY6xMvZeSRx9MTa1+NgJWndrkzVTdJ1pQAmAKQuxyb5LsHVvrgP7kcQFvxPHVpLVTORbTJWHaiqoKrJvi1iA== +"@vue/compiler-sfc@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.1.tgz#7809b298cf0fbce62a2c628b7dfc1e82dd9a3a9b" + integrity sha512-fVLdme5RZVkBt+jxv2LCSRM72o4FX7BR2eu2FpjjEi1kEtUMKBDnjKwGWy7TyhTju0t0CocctyoM+G56vH7NpQ== dependencies: "@babel/parser" "^7.13.9" "@babel/types" "^7.13.0" "@types/estree" "^0.0.48" - "@vue/compiler-core" "3.1.5" - "@vue/compiler-dom" "3.1.5" - "@vue/compiler-ssr" "3.1.5" - "@vue/shared" "3.1.5" + "@vue/compiler-core" "3.2.1" + "@vue/compiler-dom" "3.2.1" + "@vue/compiler-ssr" "3.2.1" + "@vue/shared" "3.2.1" consolidate "^0.16.0" estree-walker "^2.0.1" hash-sum "^2.0.0" @@ -1354,42 +1354,42 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" -"@vue/compiler-ssr@3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.1.5.tgz#f068652774293256a1e53084bed48a67682df9d2" - integrity sha512-CU5N7Di/a4lyJ18LGJxJYZS2a8PlLdWpWHX9p/XcsjT2TngMpj3QvHVRkuik2u8QrIDZ8OpYmTyj1WDNsOV+Dg== +"@vue/compiler-ssr@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.1.tgz#f900762f83482e44e9260c2322e3d332c711826c" + integrity sha512-6YAOtQunuEyYlVSjK1F7a7BXi7rxVfiTiJ0Ro7eq0q0MNCFV9Z+sN68lfa/E4ABVb0ledEY/Rt8kL23nwCoTCQ== dependencies: - "@vue/compiler-dom" "3.1.5" - "@vue/shared" "3.1.5" + "@vue/compiler-dom" "3.2.1" + "@vue/shared" "3.2.1" -"@vue/reactivity@3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.1.5.tgz#dbec4d9557f7c8f25c2635db1e23a78a729eb991" - integrity sha512-1tdfLmNjWG6t/CsPldh+foumYFo3cpyCHgBYQ34ylaMsJ+SNHQ1kApMIa8jN+i593zQuaw3AdWH0nJTARzCFhg== +"@vue/reactivity@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.1.tgz#0e71d4ee00b0d0ca6a6141966c30b68b3f685002" + integrity sha512-4Lja2KmyiKvuraDed6dXK2A6+r/7x7xGDA7vVR2Aqc8hQVu0+FWeVX+IBfiVOSpbZXFlHLNmCBFkbuWLQSlgxg== dependencies: - "@vue/shared" "3.1.5" + "@vue/shared" "3.2.1" -"@vue/runtime-core@3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.1.5.tgz#a545b7f146092929cb5e833e85439150f17ac87b" - integrity sha512-YQbG5cBktN1RowQDKA22itmvQ+b40f0WgQ6CXK4VYoYICAiAfu6Cc14777ve8zp1rJRGtk5oIeS149TOculrTg== +"@vue/runtime-core@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.1.tgz#39641110b2f84fdda3b80b86830827b7b5ef041a" + integrity sha512-IsgelRM/5hYeRhz5+ECi66XvYDdjG2t4lARjHvCXw5s9Q4N6uIbjLMwtLzAWRxYf3/y258BrD+ehxAi943ScJg== dependencies: - "@vue/reactivity" "3.1.5" - "@vue/shared" "3.1.5" + "@vue/reactivity" "3.2.1" + "@vue/shared" "3.2.1" -"@vue/runtime-dom@3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.1.5.tgz#4fa28947d408aa368fa17ea0edc1beb9af1472a1" - integrity sha512-tNcf3JhVR0RfW0kw1p8xZgv30nvX8Y9rsz7eiQ0dHe273sfoCngAG0y4GvMaY4Xd8FsjUwFedd4suQ8Lu8meXg== +"@vue/runtime-dom@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.1.tgz#087cf36f40ad0869712c4154693c620e478061a8" + integrity sha512-bUAHUSe49A5wYdHQ8wsLU1CMPXaG2fRuv2661mx/6Q9+20QxglT3ss8ZeL6AVRu16JNJMcdvTTsNpbnMbVc/lQ== dependencies: - "@vue/runtime-core" "3.1.5" - "@vue/shared" "3.1.5" + "@vue/runtime-core" "3.2.1" + "@vue/shared" "3.2.1" csstype "^2.6.8" -"@vue/shared@3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.5.tgz#74ee3aad995d0a3996a6bb9533d4d280514ede03" - integrity sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA== +"@vue/shared@3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.1.tgz#1f1fe26fe0334404cce10740b5ffb2654f1281aa" + integrity sha512-INN92dVBNgd0TW9BqfQQKx/HWGCHhUUbAV5EZ5FgSCiEdwuZsJbGt1mdnaD9IxGhpiyOjP2ClxGG8SFp7ELcWg== "@webassemblyjs/ast@1.11.0": version "1.11.0" @@ -11591,14 +11591,14 @@ vue-svg-loader@0.17.0-beta.2: semver "^7.3.2" svgo "^1.3.2" -vue@3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.1.5.tgz#12879b11d0685ee4478c8869551799630a52f9fe" - integrity sha512-Ho7HNb1nfDoO+HVb6qYZgeaobt1XbY6KXFe4HGs1b9X6RhkWG/113n4/SrtM1LUclM6OrP/Se5aPHHvAPG1iVQ== +vue@3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.1.tgz#30dde152f2fdad0669ea9854d5a90a00ef96974b" + integrity sha512-0jhXluF5mzTAK5bXw/8yq4McvsI8HwEWI4cnQwJeN8NYGRbwh9wwuE4FNv1Kej9pxBB5ajTNsWr0M6DPs5EJZg== dependencies: - "@vue/compiler-dom" "3.1.5" - "@vue/runtime-dom" "3.1.5" - "@vue/shared" "3.1.5" + "@vue/compiler-dom" "3.2.1" + "@vue/runtime-dom" "3.2.1" + "@vue/shared" "3.2.1" vuedraggable@4.0.1: version "4.0.1"