Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions js/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,22 @@ function loadFile (fileName) {
};
document.getElementsByTagName("body")[0].appendChild(script);
});
case "mjs":
return new Promise((resolve) => {
Log.log(`Load module script: ${fileName}`);
script = document.createElement("script");
script.type = "module";
script.src = fileName;
script.onload = function () {
resolve();
};
script.onerror = function () {
Log.error("Error on loading module script:", fileName);
script.remove();
resolve();
};
document.getElementsByTagName("body")[0].appendChild(script);
});
case "css":
return new Promise((resolve) => {
Log.log(`Load stylesheet: ${fileName}`);
Expand Down
3 changes: 2 additions & 1 deletion js/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,13 @@ function Server (configObj) {
});
}

let directories = ["/config", "/css", "/favicon.svg", "/defaultmodules", "/modules", "/node_modules/animate.css", "/node_modules/@fontsource", "/node_modules/@fortawesome", "/translations", "/tests/configs", "/tests/mocks"];
let directories = ["/config", "/css", "/favicon.svg", "/defaultmodules", "/modules", "/node_modules/animate.css", "/node_modules/@fontsource", "/node_modules/@fortawesome", "/node_modules/suncalc", "/translations", "/tests/configs", "/tests/mocks"];
for (const value of Object.values(vendor)) {
const dirArr = value.split("/");
if (dirArr[0] === "node_modules") directories.push(`/${dirArr[0]}/${dirArr[1]}`);
}
const uniqDirs = [...new Set(directories)];

for (const directory of uniqDirs) {
app.use(directory, express.static(path.resolve(global.root_path + directory)));
}
Expand Down
8 changes: 8 additions & 0 deletions js/suncalc-global.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
* Bridge for SunCalc v2 (ESM-only entry):
* default modules still expect a global `SunCalc` from getScripts()/vendor loading.
* Keep this as a tiny compatibility shim until the module loader is fully ESM-first.
*/
import * as SunCalc from "../node_modules/suncalc/index.js";

globalThis.SunCalc = SunCalc;
2 changes: 1 addition & 1 deletion js/vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const vendor = {
"weather-icons-wind.css": "node_modules/weathericons/css/weather-icons-wind.css",
"font-awesome.css": "css/font-awesome.css",
"nunjucks.js": "node_modules/nunjucks/browser/nunjucks.min.js",
"suncalc.js": "node_modules/suncalc/suncalc.js",
"suncalc.js": "js/suncalc-global.mjs",
"croner.js": "node_modules/croner/dist/croner.umd.js"
};

Expand Down
Loading