Fix web root path confusion

Remove basename in favor of making webRoot absolute.  The distinction
between the two were supposed to be that basename was absolute and did
not have a trailing slash while webRoot was relative and had a traling
slash.  This was not how it ended up working in the code, which lead to
double forward slashes in requests sent out when webRoot was not equal
to './'.
This commit is contained in:
Hornwitser committed 2021-03-17 17:59:35 +01:00
1 parent ceae2b25b5
commit bd53339532
7 files changed
+6 -17

No files matched your search

+2 -3
View File
@@ -7,7 +7,6 @@ import libConfig from "@clusterio/lib/config";
import libPlugin from "@clusterio/lib/plugin";
import { ConsoleTransport, WebConsoleFormat, logger } from "@clusterio/lib/logging";
import basename from "./basename";
import App from "./components/App";
import { Control, ControlConnector } from "./util/websocket";
@@ -28,7 +27,7 @@ async function loadScript(url) {
}
async function loadPlugins() {
let response = await fetch(`${basename}/api/plugins`);
let response = await fetch(`${webRoot}api/plugins`);
let pluginList;
if (response.ok) {
pluginList = await response.json();
@@ -42,7 +41,7 @@ async function loadPlugins() {
await __webpack_init_sharing__("default");
for (let meta of pluginList) {
try {
await loadScript(`${basename}/plugins/${meta.name}/remoteEntry.js`);
await loadScript(`${webRoot}plugins/${meta.name}/remoteEntry.js`);
let container = window[`plugin_${meta.name}`];
if (!container) {
throw new Error(`Plugin did not expose its container via plugin_${meta.name}`);