From 3195c430551dfbabb8ec15c7bc6777d359f9d128 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@users.noreply.github.com>
Date: Sun, 9 Jun 2024 18:08:17 -0700
Subject: [PATCH] deps: bump to wabac.js 2.18.3, wobmat 3.7.6 for various
 fidelity improvements (#225)

* ruffle: move to ruffle/ root dir to make RWP setup
* bump to 0.12.1
---
 package.json                                  |  6 ++--
 {src/static/ruffle => ruffle}/.gitignore      |  0
 {src/static/ruffle => ruffle}/LICENSE_MIT     |  0
 .../download-latest-ruffle.sh                 |  0
 webpack.config.js                             |  2 ++
 yarn.lock                                     | 36 +++++++++++++++++++
 6 files changed, 41 insertions(+), 3 deletions(-)
 rename {src/static/ruffle => ruffle}/.gitignore (100%)
 rename {src/static/ruffle => ruffle}/LICENSE_MIT (100%)
 rename {src/static/ruffle => ruffle}/download-latest-ruffle.sh (100%)

diff --git a/package.json b/package.json
index cb8a5ac3..f561948f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@webrecorder/archivewebpage",
   "productName": "ArchiveWeb.page",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "main": "index.js",
   "description": "Create Web Archives directly in your browser",
   "repository": "https://github.com/webrecorder/archiveweb.page",
@@ -11,7 +11,7 @@
     "@fortawesome/fontawesome-free": "^5.13.0",
     "@ipld/car": "^5.3.1",
     "@webrecorder/awp-sw": "^0.4.4",
-    "@webrecorder/wabac": "^2.18.1",
+    "@webrecorder/wabac": "^2.18.3",
     "auto-js-ipfs": "^2.3.0",
     "browsertrix-behaviors": "^0.6.0",
     "btoa": "^1.2.1",
@@ -57,7 +57,7 @@
     "start-electron": "NODE_ENV=development electron ./dist/electron/electron.js",
     "start-ext": "NODE_ENV=development webpack --mode=development --watch",
     "start-embed": "yarn run build-dev && cd dist/embed/ && http-server -p 10001",
-    "update-ruffle": "./src/static/ruffle/download-latest-ruffle.sh",
+    "update-ruffle": "./ruffle/download-latest-ruffle.sh",
     "pack": "CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --publish never",
     "pack-signed": "electron-builder",
     "dist": "yarn run build && yarn run pack",
diff --git a/src/static/ruffle/.gitignore b/ruffle/.gitignore
similarity index 100%
rename from src/static/ruffle/.gitignore
rename to ruffle/.gitignore
diff --git a/src/static/ruffle/LICENSE_MIT b/ruffle/LICENSE_MIT
similarity index 100%
rename from src/static/ruffle/LICENSE_MIT
rename to ruffle/LICENSE_MIT
diff --git a/src/static/ruffle/download-latest-ruffle.sh b/ruffle/download-latest-ruffle.sh
similarity index 100%
rename from src/static/ruffle/download-latest-ruffle.sh
rename to ruffle/download-latest-ruffle.sh
diff --git a/webpack.config.js b/webpack.config.js
index 724e881e..2ba4ea73 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -189,6 +189,7 @@ const extensionWebConfig = (env, argv) => {
 
   const copy = [
     { from: "src/static/", to: "./" },
+    { from: "ruffle", to: "./ruffle/" },
   ];
 
   const entry = {
@@ -208,6 +209,7 @@ const electronWebConfig = (env, argv) => {
 
   const copy = [
     { from: "src/static/", to: "./" },
+    { from: "ruffle", to: "./ruffle/" },
     { from: "src/electron/rec-preload.js", to: "" },
     { from: "src/electron/rec-window.html", to: "" },
   ];
diff --git a/yarn.lock b/yarn.lock
index acdebbcc..40271370 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1013,6 +1013,35 @@
     stream-browserify "^3.0.0"
     warcio "^2.2.1"
 
+"@webrecorder/wabac@^2.18.3":
+  version "2.18.3"
+  resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.18.3.tgz#eda195452a9964e8216fb0676d5da6cc69239dae"
+  integrity sha512-qmNLXky9QHpljt0EyEmcO6L2qFGG63mZbMYKso0MZZLFY3NeUf/ANafq9pWWm1Bw10+zoV6KRtHUin8gropccA==
+  dependencies:
+    "@peculiar/asn1-ecc" "^2.3.4"
+    "@peculiar/asn1-schema" "^2.3.3"
+    "@peculiar/x509" "^1.9.2"
+    "@webrecorder/wombat" "^3.7.6"
+    acorn "^8.10.0"
+    auto-js-ipfs "^2.1.1"
+    base64-js "^1.5.1"
+    brotli "^1.3.3"
+    buffer "^6.0.3"
+    fast-xml-parser "^4.2.5"
+    hash-wasm "^4.9.0"
+    http-link-header "^1.1.3"
+    http-status-codes "^2.1.4"
+    idb "^7.1.1"
+    js-levenshtein "^1.1.6"
+    js-yaml "^4.1.0"
+    pako "^1.0.11"
+    parse5-html-rewriting-stream "^7.0.0"
+    parse5-sax-parser "^7.0.0"
+    path-parser "^6.1.0"
+    process "^0.11.10"
+    stream-browserify "^3.0.0"
+    warcio "^2.2.1"
+
 "@webrecorder/wombat@^3.7.4":
   version "3.7.4"
   resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.7.4.tgz#782f36955df82acf8653f68298fbb62df95c3c68"
@@ -1020,6 +1049,13 @@
   dependencies:
     warcio "^2.2.0"
 
+"@webrecorder/wombat@^3.7.6":
+  version "3.7.6"
+  resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.7.6.tgz#e52a1bcfccd0150517989bc4310a03730a1f74e7"
+  integrity sha512-SA34StdLc+D60Aa8bZ2I+8PLjody1B/j9DmZ2zyXg/EZuPLSG4ec6XvMzq8QYuoGvD+hkjAf0YlUGxmI/viIcw==
+  dependencies:
+    warcio "^2.2.0"
+
 "@xmldom/xmldom@^0.8.8":
   version "0.8.10"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"