Skip to content

Commit d7e0021

Browse files
authored
Fix loading incorrect root, remove prefix: (fix for kiwix zimit) (#104)
* loaders (fixes openzim/zimit#154) - don't set collections.root if already set, avoiding overriding previously set root - remove 'proxy:' prefix for backwards compatibility * add provide process for webpack * bump to 2.15.0
1 parent 409d9d3 commit d7e0021

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

dist/sw.js

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@webrecorder/wabac",
3-
"version": "2.15.0-beta.0",
3+
"version": "2.15.0",
44
"main": "index.js",
55
"type": "module",
66
"license": "AGPL-3.0-or-later",

src/loaders.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class CollectionLoader
193193
const name = data.name;
194194
const config = data.config;
195195

196-
if (data.config.root) {
196+
if (data.config.root && !this.root) {
197197
this.root = name;
198198
}
199199

@@ -435,10 +435,10 @@ class WorkerLoader extends CollectionLoader
435435
config.dbname = "db:" + name;
436436

437437
if (file.sourceUrl.startsWith("proxy:")) {
438-
config.sourceUrl = file.sourceUrl;
438+
config.sourceUrl = file.sourceUrl.slice("proxy:".length);
439439
config.extraConfig = data.extraConfig;
440440
if (!config.extraConfig.prefix) {
441-
config.extraConfig.prefix = file.sourceUrl.slice("proxy:".length);
441+
config.extraConfig.prefix = config.sourceUrl;
442442
}
443443
config.topTemplateUrl = data.topTemplateUrl;
444444
config.metadata = {};

webpack.config.cjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ module.exports = {
5757
},
5858
),
5959

60+
new webpack.ProvidePlugin({
61+
process: "process/browser",
62+
}),
63+
6064
new webpack.BannerPlugin(`[name].js is part of Webrecorder project. Copyright (C) 2020-${new Date().getFullYear()}, Webrecorder Software. Licensed under the Affero General Public License v3.`),
6165
],
6266
};

0 commit comments

Comments
 (0)