Merge remote-tracking branch 'origin/main' into fail-early-when-core-requirements-not-met

This commit is contained in:
Michael Green 2026-01-18 00:10:53 +11:00
commit 5a0d5762c5
3 changed files with 10 additions and 9 deletions

View File

@ -36,7 +36,8 @@ class EmulatorJS {
"pet": ["vice_xpet"],
"plus4": ["vice_xplus4"],
"vic20": ["vice_xvic"],
"dos": ["dosbox_pure"]
"dos": ["dosbox_pure"],
"intv": ["freeintv"]
};
if (this.isSafari && this.isMobile) {
rv.n64 = rv.n64.reverse();

View File

@ -1,8 +1,8 @@
import path from "path";
import { fileURLToPath } from "url";
import minify from "@node-minify/core";
import terser from "@node-minify/terser";
import cleanCSS from "@node-minify/clean-css";
import { minify } from "@node-minify/core";
import { terser } from "@node-minify/terser";
import { cleanCss } from '@node-minify/clean-css';
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
@ -21,7 +21,7 @@ async function doMinify() {
console.log("Minified JS");
});
await minify({
compressor: cleanCSS,
compressor: cleanCss,
input: path.join(rootPath, "data/emulator.css"),
output: path.join(rootPath, "data/emulator.min.css"),
})

View File

@ -1,6 +1,6 @@
{
"name": "@emulatorjs/emulatorjs",
"version": "4.2.3",
"version": "4.2.4",
"type": "module",
"description": "EmulatorJS is a frontend for RetroArch in the web browser.",
"homepage": "https://emulatorjs.org",
@ -21,9 +21,9 @@
"docs": "jsdoc data/src/*.js -d jsdoc"
},
"dependencies": {
"@node-minify/clean-css": "^9.0.1",
"@node-minify/core": "^9.0.2",
"@node-minify/terser": "^9.0.1",
"@node-minify/clean-css": "^10.2.0",
"@node-minify/core": "^10.2.0",
"@node-minify/terser": "^10.2.0",
"http-server": "^14.1.1",
"node-7z": "^3.0.0"
},