simplify: use existing prefix as archivePrefix, fixes #937

update to wabac.js 2.22.15
bump to 2.9.0b1

Author: ikreymer

pywb/static/loadWabac.js

@@ -7,7 +7,6 @@ class WabacReplay
     this.staticPrefix = staticPrefix;
     this.collName = coll;
     this.isRoot = coll === "$root";
-    this.archivePrefix = this.isRoot ? "/" : `/${this.collName}/`;
     this.swScope = swScopePrefix;
     this.adblockUrl = undefined;
 
@@ -51,7 +50,7 @@ class WabacReplay
         baseUrl: this.prefix,
         baseUrlAppendReplay: true,
         noPostToGet: false,
-        archivePrefix: this.archivePrefix,
+        archivePrefix: this.prefix,
         archiveMod: "ir_",
         adblockUrl: this.adblockUrl,
         noPostToGet: true,
@@ -86,6 +85,6 @@ class WabacReplay
   // called by the Vue banner when the timeline is clicked
   load_url(url, ts) {
     const iframe = document.querySelector('#replay_iframe');
-    iframe.src = `${this.swScope}${this.archivePrefix}${ts}mp_/${url}`;
+    iframe.src = `${this.prefix}${ts}mp_/${url}`;
   }
 }

pywb/version.py

@@ -1,4 +1,4 @@
-__version__ = '2.9.0-beta.0'
+__version__ = '2.9.0b1'
 
 if __name__ == '__main__':
     print(__version__)

setup.py

@@ -15,7 +15,7 @@
 root_dir = pathlib.Path(__file__).parent
 
 
-WABAC_SW_URL = "https://cdn.jsdelivr.net/npm/@webrecorder/[email protected].12/dist/sw.js"
+WABAC_SW_URL = "https://cdn.jsdelivr.net/npm/@webrecorder/[email protected].15/dist/sw.js"
 
 def download_wabac_sw():
     print(f"Downloading {WABAC_SW_URL}")