From bfd01747d1dadd5dde0f7401d9d43acb739f1e7a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 17 Aug 2022 16:38:17 -0700
Subject: [PATCH] revert: :arrow_down: Go back to vue-plyr

Fork had problems with vertical videos
---
 CALCKEY.md                                    |  2 +-
 package.json                                  |  2 +-
 packages/client/package.json                  |  2 +-
 .../client/src/components/media-banner.vue    |  4 +-
 .../client/src/components/media-video.vue     |  4 +-
 yarn.lock                                     | 64 +++++++++++++------
 6 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 13977ea50..21675f291 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -55,6 +55,7 @@
 - Mark as read from notifications widget
 - Less cluttered notification summary
 - Better welcome screen (not logged in)
+- vue-plyr as video/audio player
 - Ability to turn off "Connection lost" message
 - Raw instance info only for moderators
 - New spinner animation
@@ -65,7 +66,6 @@
 - Reply limit bug fixed
 - Make showing the update popup optional
 - Obliteration of Ai-chan
-- [@skjnldsv/vue-plyr](https://www.npmjs.com/package/@skjnldsv/vue-plyr) as video/audio player
 - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996)
 - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056)
 - [OAuth bearer token authentication](https://github.com/misskey-dev/misskey/pull/9021)
diff --git a/package.json b/package.json
index dcdd9aeda..6e6417912 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.118.1-calc.8.1",
+	"version": "12.118.1-calc.8.2",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/package.json b/packages/client/package.json
index a71c3327d..0c6e76d83 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -12,7 +12,6 @@
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@rollup/pluginutils": "^4.2.1",
-		"@skjnldsv/vue-plyr": "^7.2.0",
 		"@syuilo/aiscript": "0.11.1",
 		"@vitejs/plugin-vue": "3.0.3",
 		"@vue/compiler-sfc": "3.2.37",
@@ -61,6 +60,7 @@
 		"vanilla-tilt": "1.7.2",
 		"vite": "3.0.7",
 		"vue": "3.2.37",
+		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1"
 	},
diff --git a/packages/client/src/components/media-banner.vue b/packages/client/src/components/media-banner.vue
index c020be75b..7382e953a 100644
--- a/packages/client/src/components/media-banner.vue
+++ b/packages/client/src/components/media-banner.vue
@@ -30,9 +30,9 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 import * as misskey from 'misskey-js';
-import VuePlyr from '@skjnldsv/vue-plyr';
+import VuePlyr from 'vue-plyr';
 import { ColdDeviceStorage } from '@/store';
-import '@skjnldsv/vue-plyr/dist/vue-plyr.css';
+import 'vue-plyr/dist/vue-plyr.css';
 
 const props = withDefaults(defineProps<{
 	media: misskey.entities.DriveFile;
diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 260835a76..0dfd304aa 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -28,9 +28,9 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as misskey from 'misskey-js';
-import VuePlyr from '@skjnldsv/vue-plyr';
+import VuePlyr from 'vue-plyr';
 import { defaultStore } from '@/store';
-import '@skjnldsv/vue-plyr/dist/vue-plyr.css';
+import 'vue-plyr/dist/vue-plyr.css';
 
 const props = defineProps<{
 	video: misskey.entities.DriveFile;
diff --git a/yarn.lock b/yarn.lock
index 5765c010f..0a741e8e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33,7 +33,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
+"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.18.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
   version: 7.18.11
   resolution: "@babel/parser@npm:7.18.11"
   bin:
@@ -798,16 +798,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@skjnldsv/vue-plyr@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "@skjnldsv/vue-plyr@npm:7.2.0"
-  dependencies:
-    plyr: ^3.6.8
-    vue: ^3.2.37
-  checksum: fc39a9159b9539b12e1ea9e7404c98766418eb19146a14ea6bd540cfa69619b38ba03766e905ee063ffdf69dd6725976759d420b7945cce99e283a33668ac515
-  languageName: node
-  linkType: hard
-
 "@sqltools/formatter@npm:^1.2.2":
   version: 1.2.3
   resolution: "@sqltools/formatter@npm:1.2.3"
@@ -1984,6 +1974,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vue/compiler-sfc@npm:2.7.8":
+  version: 2.7.8
+  resolution: "@vue/compiler-sfc@npm:2.7.8"
+  dependencies:
+    "@babel/parser": ^7.18.4
+    postcss: ^8.4.14
+    source-map: ^0.6.1
+  checksum: da0b4b0866224fe2aee376a88c25914da4e73ba9e11e7aa2ed240b99897735b4a988e951dcae9c8f0843216c5a97050bf16e1bb04bf65541444a8bdfedc35b38
+  languageName: node
+  linkType: hard
+
 "@vue/compiler-sfc@npm:3.2.37":
   version: 3.2.37
   resolution: "@vue/compiler-sfc@npm:3.2.37"
@@ -3855,7 +3856,6 @@ __metadata:
     "@rollup/plugin-alias": 3.1.9
     "@rollup/plugin-json": 4.1.0
     "@rollup/pluginutils": ^4.2.1
-    "@skjnldsv/vue-plyr": ^7.2.0
     "@syuilo/aiscript": 0.11.1
     "@types/escape-regexp": 0.0.1
     "@types/glob": 7.2.0
@@ -3924,6 +3924,7 @@ __metadata:
     vanilla-tilt: 1.7.2
     vite: 3.0.7
     vue: 3.2.37
+    vue-plyr: ^7.0.0
     vue-prism-editor: 2.0.0-alpha.2
     vuedraggable: 4.0.1
   languageName: unknown
@@ -4609,6 +4610,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"csstype@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "csstype@npm:3.1.0"
+  checksum: 644e986cefab86525f0b674a06889cfdbb1f117e5b7d1ce0fc55b0423ecc58807a1ea42ecc75c4f18999d14fc42d1d255f84662a45003a52bb5840e977eb2ffd
+  languageName: node
+  linkType: hard
+
 "custom-event-polyfill@npm:^1.0.7":
   version: 1.0.7
   resolution: "custom-event-polyfill@npm:1.0.7"
@@ -11527,16 +11535,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"plyr@npm:^3.6.8":
-  version: 3.7.2
-  resolution: "plyr@npm:3.7.2"
+"plyr@github:sampotts/plyr#develop":
+  version: 3.7.0
+  resolution: "plyr@https://github.com/sampotts/plyr.git#commit=d434c9af16e641400aaee93188594208d88f2658"
   dependencies:
     core-js: ^3.22.0
     custom-event-polyfill: ^1.0.7
     loadjs: ^4.2.0
     rangetouch: ^2.0.1
     url-polyfill: ^1.1.12
-  checksum: 140b2e43272023737dd7f95b7bc745490131da866a4ef154f6b2c7992f94d6d951b859614ca851c3ec4a134b6b8fd1244a2642d2739dfad3aae5402b8f311455
+  checksum: ee85815c1c992141af030d71f70e79532814b142b0057c1bedbf7c74000a79f647147bb1f03f3a9f725341afa43e848e7b54168361d95285dfed30d53be63607
   languageName: node
   linkType: hard
 
@@ -11875,7 +11883,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.1.10, postcss@npm:^8.3.11, postcss@npm:^8.4.16":
+"postcss@npm:^8.1.10, postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.16":
   version: 8.4.16
   resolution: "postcss@npm:8.4.16"
   dependencies:
@@ -15308,6 +15316,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue-plyr@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "vue-plyr@npm:7.0.0"
+  dependencies:
+    plyr: "github:sampotts/plyr#develop"
+    vue: ^2.6.12
+  checksum: 004d830cfc9dbe0563cafafab6240379b7224362d3e60d8d441126f0eaafd2487c7416cb434482165b52e961b83f020dfbc2645536aa8ba991f101477d984206
+  languageName: node
+  linkType: hard
+
 "vue-prism-editor@npm:2.0.0-alpha.2":
   version: 2.0.0-alpha.2
   resolution: "vue-prism-editor@npm:2.0.0-alpha.2"
@@ -15317,7 +15335,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue@npm:3.2.37, vue@npm:^3.2.37":
+"vue@npm:3.2.37":
   version: 3.2.37
   resolution: "vue@npm:3.2.37"
   dependencies:
@@ -15330,6 +15348,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vue@npm:^2.6.12":
+  version: 2.7.8
+  resolution: "vue@npm:2.7.8"
+  dependencies:
+    "@vue/compiler-sfc": 2.7.8
+    csstype: ^3.1.0
+  checksum: 45fc85a13fc027798ad859fe4a5509b54217ae2f129240fc349a799bd4dbc6848ef8fa9968ab7ef7afcb954735882dbfdeb746673aa3f051e4d7ae555c213a1b
+  languageName: node
+  linkType: hard
+
 "vuedraggable@npm:4.0.1":
   version: 4.0.1
   resolution: "vuedraggable@npm:4.0.1"