pleroma-fe

commit: e1df5716c0fed4986ade5dee89de71270420ce28
parent 2474f155d2ce2b072bef37790f2dc4049b22d49a
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Mon, 18 Jul 2022 19:32:17 +0000

Merge branch 'migrate/ruffle' into 'develop'

Migrate to official Ruffle build

Closes #1151

See merge request pleroma/pleroma-fe!1546
Diffstat:
M
build/webpack.base.conf.js
2
+-
M
package.json
2
+-
M
yarn.lock
10
+++++-----

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -120,7 +120,7 @@ module.exports = {
     new CopyPlugin({
       patterns: [
         {
-          from: "node_modules/ruffle-mirror/*",
+          from: "node_modules/@ruffle-rs/ruffle/*",
           to: "static/ruffle",
           flatten: true
         },
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "@fortawesome/free-solid-svg-icons": "5.15.4",
     "@fortawesome/vue-fontawesome": "3.0.1",
     "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
+    "@ruffle-rs/ruffle": "^0.1.0-nightly.2022.7.12",
     "@vuelidate/core": "2.0.0-alpha.42",
     "@vuelidate/validators": "2.0.0-alpha.30",
     "body-scroll-lock": "2.7.1",
@@ -37,7 +38,6 @@
     "phoenix": "1.6.2",
     "punycode.js": "2.1.0",
     "qrcode": "1",
-    "ruffle-mirror": "2021.12.31",
     "utf8": "^3.0.0",
     "vue": "^3.2.31",
     "vue-i18n": "^9.2.0-beta.34",
diff --git a/yarn.lock b/yarn.lock
@@ -1338,6 +1338,11 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
+"@ruffle-rs/ruffle@^0.1.0-nightly.2022.7.12":
+  version "0.1.0-nightly.2022.7.12"
+  resolved "https://registry.yarnpkg.com/@ruffle-rs/ruffle/-/ruffle-0.1.0-nightly.2022.7.12.tgz#c2d77fce7a0e98d51a6535371550e0bff019d0ea"
+  integrity sha512-DFsiT4kdUuSHsYXzHV97e9Ui3FkcsHEg1GyHJipt/lCpCoZ2uRtP41uEz9eNc9ug8jWd7UyXxJmdkkRvs9UHgQ==
+
 "@socket.io/base64-arraybuffer@~1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61"
@@ -8828,11 +8833,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-ruffle-mirror@2021.12.31:
-  version "2021.12.31"
-  resolved "https://registry.yarnpkg.com/ruffle-mirror/-/ruffle-mirror-2021.12.31.tgz#d5ece0ff164d98468d84eb7cba3e69abff4c0687"
-  integrity sha512-kilyYstBQ+ZQY44IvUHhMt8Uh1yQJ8B+6GdzA1FzErgJy+5mnaLUBtU8JEG7cSrW3QLdFQLhRSeh8lLDINXgSA==
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"