From 04a173c9b2440fdb2e8b5d4497f1993badef791c Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 21 Nov 2024 15:11:19 -0800 Subject: [PATCH 1/2] deps: update to wabac.js 2.20.6 for localStorage replay fixes fix defaulting cookie archiving to true (also check for undefined) deps: update replaywebpage to 2.2.3 bump to 0.14.1 --- package.json | 6 +++--- src/recorder.ts | 2 +- src/ui/app.ts | 2 +- yarn.lock | 47 ++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 914afb3e..ea2ee482 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@webrecorder/archivewebpage", "productName": "ArchiveWeb.page", - "version": "0.14.0", + "version": "0.14.1", "main": "index.js", "description": "Create Web Archives directly in your browser", "repository": { @@ -13,8 +13,8 @@ "dependencies": { "@fortawesome/fontawesome-free": "^5.13.0", "@ipld/car": "^5.3.1", - "@webrecorder/awp-sw": "^0.5.2", - "@webrecorder/wabac": "^2.20.5", + "@webrecorder/awp-sw": "^0.5.3", + "@webrecorder/wabac": "^2.20.6", "auto-js-ipfs": "^2.3.0", "browsertrix-behaviors": "^0.6.4", "btoa": "^1.2.1", diff --git a/src/recorder.ts b/src/recorder.ts index eca040d0..f1cc8196 100644 --- a/src/recorder.ts +++ b/src/recorder.ts @@ -1372,7 +1372,7 @@ class Recorder { if (rw) { string = payload.toString(); - newString = rw.rewrite(string, { live: true, save: extraOpts }); + newString = rw.rewrite(string, { save: extraOpts }); } } } diff --git a/src/ui/app.ts b/src/ui/app.ts index f29c0633..ef8c2acd 100644 --- a/src/ui/app.ts +++ b/src/ui/app.ts @@ -111,7 +111,7 @@ class ArchiveWebApp extends ReplayWebApp { const archiveCookies = await getLocalOption("archiveCookies"); // default to true if unset to match existing behavior - if (archiveCookies === null) { + if (archiveCookies === null || archiveCookies === undefined) { await setLocalOption("archiveCookies", "1"); this.archiveCookies = true; } else { diff --git a/yarn.lock b/yarn.lock index 67a268d5..70a5e36a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2303,14 +2303,14 @@ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== -"@webrecorder/awp-sw@^0.5.2": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@webrecorder/awp-sw/-/awp-sw-0.5.2.tgz#3ed0b9f1de816a5d1f426c96ef3440527b35c982" - integrity sha512-q82K8P4Z0NRoOgDBB0reutLllUyh+H69RB1KM09GFN0wWDlZ1qmB8wXgM14MFilmWrQOEQEu9Muu7mhDT+FWsA== +"@webrecorder/awp-sw@^0.5.3": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@webrecorder/awp-sw/-/awp-sw-0.5.3.tgz#881699895e09517ac44fda2f37edf40118a7fa66" + integrity sha512-g8RuI6bF4ixmrurJI+V9hFBZHy1OtIFf6sMqSmJ+JfCQzCg+ZBNTqm8qdFNmiG7cy8Tf2CxXz9LduVKKldin5g== dependencies: "@ipld/car" "^5.3.2" "@ipld/unixfs" "^3.0.0" - "@webrecorder/wabac" "^2.20.5" + "@webrecorder/wabac" "^2.20.6" auto-js-ipfs "^2.3.0" client-zip "^2.3.0" hash-wasm "^4.9.0" @@ -2349,6 +2349,36 @@ stream-browserify "^3.0.0" warcio "^2.4.2" +"@webrecorder/wabac@^2.20.6": + version "2.20.6" + resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.20.6.tgz#8b28b58d5ae900faebd7be30224eadc620838f9e" + integrity sha512-bCvHgfnKHFzEuwPkIxdYIVuBmVTzOgxf96DeDTdZkhPI99iP7AUrz/Y6+qgoD9Vjn4usozUff25vdViD5mtiUg== + dependencies: + "@peculiar/asn1-ecc" "^2.3.4" + "@peculiar/asn1-schema" "^2.3.3" + "@peculiar/x509" "^1.9.2" + "@types/js-levenshtein" "^1.1.3" + "@webrecorder/wombat" "^3.8.7" + 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.4.1" + 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.4.2" + "@webrecorder/wombat@^3.8.6": version "3.8.6" resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.8.6.tgz#3aa99d9519f6263434a9e0b963f6ef86d3e0494a" @@ -2356,6 +2386,13 @@ dependencies: warcio "^2.4.0" +"@webrecorder/wombat@^3.8.7": + version "3.8.7" + resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.8.7.tgz#51c7465c589e0020be064121127c7c10a38ec21f" + integrity sha512-bW5V7cBweTkTazOIN8oZZGwHLevsGNv1luY3t0RYdEZhs5BDpTmUHN33zEbrXDOiPUlY3N3I8+73VA+PuxihoQ== + dependencies: + warcio "^2.4.0" + "@xmldom/xmldom@^0.8.8": version "0.8.10" resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" From e284b6e06d3768404fd69bb43b64809e32c5b335 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 21 Nov 2024 15:28:33 -0800 Subject: [PATCH 2/2] update rwp --- package.json | 4 +-- yarn.lock | 75 +++++++++++++--------------------------------------- 2 files changed, 21 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index ea2ee482..908ba968 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node-fetch": "2.6.7", "pdfjs-dist": "2.2.228", "pretty-bytes": "^5.6.0", - "replaywebpage": "^2.2.2", + "replaywebpage": "^2.2.3", "stream-browserify": "^3.0.0", "tsconfig-paths-webpack-plugin": "^4.1.0", "unused-filename": "^4.0.1", @@ -64,7 +64,7 @@ "webpack-extension-reloader": "^1.1.4" }, "resolutions": { - "@webrecorder/wabac": "^2.20.5" + "@webrecorder/wabac": "^2.20.6" }, "files": [ "src/", diff --git a/yarn.lock b/yarn.lock index 70a5e36a..b0e5a5a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2319,36 +2319,6 @@ uuid "^9.0.0" warcio "^2.3.1" -"@webrecorder/wabac@^2.20.3", "@webrecorder/wabac@^2.20.5": - version "2.20.5" - resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.20.5.tgz#bac841e278a318663dbb5935d5241cd043b40a82" - integrity sha512-2TfVJM0a319W+qWj/qocnYgF6lDaaeTotcPn6ZRqIUq70r8TXi8ZzIqpjYAxqGNkxCRapq/7Yo1/gDVIjVpD3Q== - dependencies: - "@peculiar/asn1-ecc" "^2.3.4" - "@peculiar/asn1-schema" "^2.3.3" - "@peculiar/x509" "^1.9.2" - "@types/js-levenshtein" "^1.1.3" - "@webrecorder/wombat" "^3.8.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.4.1" - 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.4.2" - "@webrecorder/wabac@^2.20.6": version "2.20.6" resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.20.6.tgz#8b28b58d5ae900faebd7be30224eadc620838f9e" @@ -2379,13 +2349,6 @@ stream-browserify "^3.0.0" warcio "^2.4.2" -"@webrecorder/wombat@^3.8.6": - version "3.8.6" - resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.8.6.tgz#3aa99d9519f6263434a9e0b963f6ef86d3e0494a" - integrity sha512-+IxV0bkoc6QdHYzwejsPFPC31dRjaxa6zGuR9F08aFb4Ooeekf9AK16ZIYweizs/wm7nvTG5E12ZwW0LUUzX8w== - dependencies: - warcio "^2.4.0" - "@webrecorder/wombat@^3.8.7": version "3.8.7" resolved "https://registry.yarnpkg.com/@webrecorder/wombat/-/wombat-3.8.7.tgz#51c7465c589e0020be064121127c7c10a38ec21f" @@ -2972,18 +2935,18 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -builder-util-runtime@9.2.4: - version "9.2.4" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz#13cd1763da621e53458739a1e63f7fcba673c42a" - integrity sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA== +builder-util-runtime@9.2.10: + version "9.2.10" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz#a0f7d9e214158402e78b74a745c8d9f870c604bc" + integrity sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util-runtime@9.2.5: - version "9.2.5" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz#0afdffa0adb5c84c14926c7dd2cf3c6e96e9be83" - integrity sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg== +builder-util-runtime@9.2.4: + version "9.2.4" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz#13cd1763da621e53458739a1e63f7fcba673c42a" + integrity sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA== dependencies: debug "^4.3.4" sax "^1.2.4" @@ -3766,12 +3729,12 @@ electron-to-chromium@^1.4.668: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.788.tgz#a3545959d5cfa0a266d3e551386c040be34e7e06" integrity sha512-ubp5+Ev/VV8KuRoWnfP2QF2Bg+O2ZFdb49DiiNbz2VmgkIqrnyYaqIOqj8A6K/3p1xV0QcU5hBQ1+BmB6ot1OA== -electron-updater@^6.3.2: - version "6.3.4" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.3.4.tgz#3934bc89875bb524c2cbbd11041114e97c0c2496" - integrity sha512-uZUo7p1Y53G4tl6Cgw07X1yF8Jlz6zhaL7CQJDZ1fVVkOaBfE2cWtx80avwDVi8jHp+I/FWawrMgTAeCCNIfAg== +electron-updater@^6.3.9: + version "6.3.9" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.3.9.tgz#e1e7f155624c58e6f3760f376c3a584028165ec4" + integrity sha512-2PJNONi+iBidkoC5D1nzT9XqsE8Q1X28Fn6xRQhO3YX8qRRyJ3mkV4F1aQsuRnYPqq6Hw+E51y27W75WgDoofw== dependencies: - builder-util-runtime "9.2.5" + builder-util-runtime "9.2.10" fs-extra "^10.1.0" js-yaml "^4.1.0" lazy-val "^1.0.5" @@ -6877,17 +6840,17 @@ repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== -replaywebpage@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/replaywebpage/-/replaywebpage-2.2.2.tgz#91fb8d5afd28db1c0e65fc61c214aa2a37b273df" - integrity sha512-gsgRP8JFYIRE5BIyV7IMH9S86iV1CbKWxJPOVnWyA6rZtEy6LcCgd8NFjLZQZotfF2p29jaF0ZWL5OFqrx1K+A== +replaywebpage@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/replaywebpage/-/replaywebpage-2.2.3.tgz#19a87a6bbb2c7ce59afdc263e46563ed427715fe" + integrity sha512-lZa77zygBci949lIeuqZy2Ob+vHTefponpOKMg0vSl6D+SY4QPGczJp0fu1XPJSDZEI3ItBBaHIZ7Y6dTr9rpA== dependencies: "@fortawesome/fontawesome-free" "^5.15.4" "@shoelace-style/shoelace" "~2.15.1" - "@webrecorder/wabac" "^2.20.3" + "@webrecorder/wabac" "^2.20.6" bulma "^0.9.3" electron-log "^4.4.1" - electron-updater "^6.3.2" + electron-updater "^6.3.9" fetch-ndjson "^1.1.6" flexsearch "^0.7.31" keyword-mark-element "^0.2.0"