deps: update to wabac.js 2.16.12, use default index html loading (#232)

ikreymer · web-flow · commit 8e715cdf542c · 2023-09-05T18:43:02.000-04:00
wabac.js now serves the correct index for RWP, don't need to inject custom html
bump to 1.8.11, update CHANGELIST
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 ## CHANGES
 
+v1.8.11
+- Loading: Use default html index, avoid custom html injection (via wabac.js 2.16.12)
+- Dependencies: Switch to wabac.js 2.16.12
+
 v1.8.10
 - Regression fix: Fix embed loading from different domain being broken in 1.8.9
 - Dependencies: Switch to wabac.js 2.16.11
diff --git a/_data/package.json b/_data/package.json
@@ -1,15 +1,15 @@
 {
   "name": "replaywebpage",
   "productName": "ReplayWeb.page",
-  "version": "1.8.10",
+  "version": "1.8.11",
   "description": "Serverless Web Archive Replay",
   "repository": "https://github.com/webrecorder/replayweb.page",
   "homepage": "https://replayweb.page/",
   "author": "Webrecorder Software",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@webrecorder/wabac": "^2.16.11",
+    "@webrecorder/wabac": "^2.16.12",
     "bulma": "^0.9.3",
     "electron-log": "^4.4.1",
     "electron-updater": "^5.3.0",
diff --git a/package.json b/package.json
@@ -1,15 +1,15 @@
 {
   "name": "replaywebpage",
   "productName": "ReplayWeb.page",
-  "version": "1.8.10",
+  "version": "1.8.11",
   "description": "Serverless Web Archive Replay",
   "repository": "https://github.com/webrecorder/replayweb.page",
   "homepage": "https://replayweb.page/",
   "author": "Webrecorder Software",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@webrecorder/wabac": "^2.16.11",
+    "@webrecorder/wabac": "^2.16.12",
     "bulma": "^0.9.3",
     "electron-log": "^4.4.1",
     "electron-updater": "^5.3.0",
diff --git a/src/embed.js b/src/embed.js
@@ -1,7 +1,7 @@
 import { LitElement, html, css } from "lit";
 import { ifDefined } from "lit/directives/if-defined.js";
 
-import { wrapCss, rwpLogo, EMBED_INDEX_HTML } from "./misc";
+import { wrapCss, rwpLogo } from "./misc";
 import { SWManager } from "./swmanager";
 
 var scriptSrc = document.currentScript && document.currentScript.src;
@@ -101,10 +101,7 @@ class Embed extends LitElement {
       return;
     }
 
-    const query = new URLSearchParams();
-    query.set("indexHtml", EMBED_INDEX_HTML);
-
-    const name = this.swName + "?" + query.toString();
+    const name = this.swName + "?serveIndex=1";
     const appName = this.appName;
     const scope = this.replaybase;
     const requireSubdomainIframe = this.requireSubdomainIframe;
diff --git a/src/misc.js b/src/misc.js
@@ -11,15 +11,6 @@ import rwpLogo from "../assets/logo.svg";
 const apiPrefix = "./w/api";
 const replayPrefix = "./w";
 
-const EMBED_INDEX_HTML = `
-<!doctype html>
-<html>
-<head><script src="./ui.js"></script></head>
-<body>
-<replay-app-main></replay-app-main>
-</body></html>
-`;
-
 // ===========================================================================
 const allCss = unsafeCSS(allCssRaw);
 function wrapCss(custom) {
@@ -240,6 +231,5 @@ export {
   unsafeCSS,
   unsafeSVG,
   apiPrefix,
-  replayPrefix,
-  EMBED_INDEX_HTML
+  replayPrefix
 };
diff --git a/sw.js b/sw.js
diff --git a/ui.js b/ui.js
diff --git a/yarn.lock b/yarn.lock
@@ -756,10 +756,10 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
   integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
 
-"@webrecorder/wabac@^2.16.11":
-  version "2.16.11"
-  resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.16.11.tgz#721a56daf2696e1619aea9d9d8977111fd7ae8d1"
-  integrity sha512-u2Ge1u07d0EppkwTsXkrmyIfE93/9HzWWJqiEvfCBhXAWyP4DkPCc8hJJlVTDkYrwe04ERiYUP/XNpCojiXd+A==
+"@webrecorder/wabac@^2.16.12":
+  version "2.16.12"
+  resolved "https://registry.yarnpkg.com/@webrecorder/wabac/-/wabac-2.16.12.tgz#cf9ce5490cffcc34f0c1c4a30245276a094d78b2"
+  integrity sha512-lqu9L4Ig2TWzt3t7cKs2CH9epkSt0k09NLx58xzytcHiH2sSEMpk5/ZvBQhNEjjd9Hb2gh3G7Clf7qdXB6b8lA==
   dependencies:
     "@peculiar/asn1-ecc" "^2.3.4"
     "@peculiar/asn1-schema" "^2.3.3"
