fallout2ce/fallout2-ce-ems
0
0
Fork 0
mirror of https://github.com/fallout2-ce/fallout2-ce-ems.git synced 2026-07-27 16:47:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

[renovate][cleanup]

Browse Source
This commit is contained in:
Roman Turchin
2025-05-06 21:32:14 -05:00
parent e60710c3b1
commit e27506a689
9 changed files with 62 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+49 -49
View File
@@ -13,8 +13,8 @@
"@ant-design/icons": "6.0.0",
"@emotion/react": "11.14.0",
"@emotion/styled": "11.14.0",
"@mui/lab": "7.0.0-beta.11",
"@mui/material": "7.0.2",
"@mui/lab": "7.0.0-beta.12",
"@mui/material": "7.1.0",
"@types/node": "22.15.8",
"@types/react-dom": "19.1.3",
"@vitejs/plugin-react": "1.3.2",
@@ -1111,9 +1111,9 @@
}
},
"node_modules/@mui/core-downloads-tracker": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.0.2.tgz",
"integrity": "sha512-TfeFU9TgN1N06hyb/pV/63FfO34nijZRMqgHk0TJ3gkl4Fbd+wZ73+ZtOd7jag6hMmzO9HSrBc6Vdn591nhkAg==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-7.1.0.tgz",
"integrity": "sha512-E0OqhZv548Qdc0PwWhLVA2zmjJZSTvaL4ZhoswmI8NJEC1tpW2js6LLP827jrW9MEiXYdz3QS6+hask83w74yQ==",
"dev": true,
"license": "MIT",
"funding": {
@@ -1122,16 +1122,16 @@
}
},
"node_modules/@mui/lab": {
"version": "7.0.0-beta.11",
"resolved": "https://registry.npmjs.org/@mui/lab/-/lab-7.0.0-beta.11.tgz",
"integrity": "sha512-VJDEUgiRsjo8V2xDvBEE9Cfs1cSlwzp9UFmD3KzIg6emFMqz9BfYh+9cFI4iQWaoz3Agm3q6bVKlhlX6xw6sVQ==",
"version": "7.0.0-beta.12",
"resolved": "https://registry.npmjs.org/@mui/lab/-/lab-7.0.0-beta.12.tgz",
"integrity": "sha512-685MmzByCy3Vmb7xI6J8qOQm4l7yqfVTOLwxVmNV1EHBKuJiMuoX4/2vAAEGfNbDeEfWQsp7aBWanYpSWe1iRA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.27.0",
"@mui/system": "^7.0.2",
"@mui/types": "^7.4.1",
"@mui/utils": "^7.0.2",
"@babel/runtime": "^7.27.1",
"@mui/system": "^7.1.0",
"@mui/types": "^7.4.2",
"@mui/utils": "^7.1.0",
"clsx": "^2.1.1",
"prop-types": "^15.8.1"
},
@@ -1145,8 +1145,8 @@
"peerDependencies": {
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@mui/material": "^7.0.2",
"@mui/material-pigment-css": "^7.0.2",
"@mui/material": "^7.1.0",
"@mui/material-pigment-css": "^7.1.0",
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -1167,17 +1167,17 @@
}
},
"node_modules/@mui/material": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-7.0.2.tgz",
"integrity": "sha512-rjJlJ13+3LdLfobRplkXbjIFEIkn6LgpetgU/Cs3Xd8qINCCQK9qXQIjjQ6P0FXFTPFzEVMj0VgBR1mN+FhOcA==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-7.1.0.tgz",
"integrity": "sha512-ahUJdrhEv+mCp4XHW+tHIEYzZMSRLg8z4AjUOsj44QpD1ZaMxQoVOG2xiHvLFdcsIPbgSRx1bg1eQSheHBgvtg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.27.0",
"@mui/core-downloads-tracker": "^7.0.2",
"@mui/system": "^7.0.2",
"@mui/types": "^7.4.1",
"@mui/utils": "^7.0.2",
"@babel/runtime": "^7.27.1",
"@mui/core-downloads-tracker": "^7.1.0",
"@mui/system": "^7.1.0",
"@mui/types": "^7.4.2",
"@mui/utils": "^7.1.0",
"@popperjs/core": "^2.11.8",
"@types/react-transition-group": "^4.4.12",
"clsx": "^2.1.1",
@@ -1196,7 +1196,7 @@
"peerDependencies": {
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@mui/material-pigment-css": "^7.0.2",
"@mui/material-pigment-css": "^7.1.0",
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -1217,14 +1217,14 @@
}
},
"node_modules/@mui/private-theming": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.0.2.tgz",
"integrity": "sha512-6lt8heDC9wN8YaRqEdhqnm0cFCv08AMf4IlttFvOVn7ZdKd81PNpD/rEtPGLLwQAFyyKSxBG4/2XCgpbcdNKiA==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.1.0.tgz",
"integrity": "sha512-4Kck4jxhqF6YxNwJdSae1WgDfXVg0lIH6JVJ7gtuFfuKcQCgomJxPvUEOySTFRPz1IZzwz5OAcToskRdffElDA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.27.0",
"@mui/utils": "^7.0.2",
"@babel/runtime": "^7.27.1",
"@mui/utils": "^7.1.0",
"prop-types": "^15.8.1"
},
"engines": {
@@ -1245,13 +1245,13 @@
}
},
"node_modules/@mui/styled-engine": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.0.2.tgz",
"integrity": "sha512-11Bt4YdHGlh7sB8P75S9mRCUxTlgv7HGbr0UKz6m6Z9KLeiw1Bm9y/t3iqLLVMvSHYB6zL8X8X+LmfTE++gyBw==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.1.0.tgz",
"integrity": "sha512-m0mJ0c6iRC+f9hMeRe0W7zZX1wme3oUX0+XTVHjPG7DJz6OdQ6K/ggEOq7ZdwilcpdsDUwwMfOmvO71qDkYd2w==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.27.0",
"@babel/runtime": "^7.27.1",
"@emotion/cache": "^11.13.5",
"@emotion/serialize": "^1.3.3",
"@emotion/sheet": "^1.4.0",
@@ -1280,17 +1280,17 @@
}
},
"node_modules/@mui/system": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-7.0.2.tgz",
"integrity": "sha512-yFUraAWYWuKIISPPEVPSQ1NLeqmTT4qiQ+ktmyS8LO/KwHxB+NNVOacEZaIofh5x1NxY8rzphvU5X2heRZ/RDA==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/@mui/system/-/system-7.1.0.tgz",
"integrity": "sha512-iedAWgRJMCxeMHvkEhsDlbvkK+qKf9me6ofsf7twk/jfT4P1ImVf7Rwb5VubEA0sikrVL+1SkoZM41M4+LNAVA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.27.0",
"@mui/private-theming": "^7.0.2",
"@mui/styled-engine": "^7.0.2",
"@mui/types": "^7.4.1",
"@mui/utils": "^7.0.2",
"@babel/runtime": "^7.27.1",
"@mui/private-theming": "^7.1.0",
"@mui/styled-engine": "^7.1.0",
"@mui/types": "^7.4.2",
"@mui/utils": "^7.1.0",
"clsx": "^2.1.1",
"csstype": "^3.1.3",
"prop-types": "^15.8.1"
@@ -1321,13 +1321,13 @@
}
},
"node_modules/@mui/types": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.1.tgz",
"integrity": "sha512-gUL8IIAI52CRXP/MixT1tJKt3SI6tVv4U/9soFsTtAsHzaJQptZ42ffdHZV3niX1ei0aUgMvOxBBN0KYqdG39g==",
"version": "7.4.2",
"resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.2.tgz",
"integrity": "sha512-edRc5JcLPsrlNFYyTPxds+d5oUovuUxnnDtpJUbP6WMeV4+6eaX/mqai1ZIWT62lCOe0nlrON0s9HDiv5en5bA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.27.0"
"@babel/runtime": "^7.27.1"
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -1339,14 +1339,14 @@
}
},
"node_modules/@mui/utils": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.0.2.tgz",
"integrity": "sha512-72gcuQjPzhj/MLmPHLCgZjy2VjOH4KniR/4qRtXTTXIEwbkgcN+Y5W/rC90rWtMmZbjt9svZev/z+QHUI4j74w==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.1.0.tgz",
"integrity": "sha512-/OM3S8kSHHmWNOP+NH9xEtpYSG10upXeQ0wLZnfDgmgadTAk5F4MQfFLyZ5FCRJENB3eRzltMmaNl6UtDnPovw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.27.0",
"@mui/types": "^7.4.1",
"@babel/runtime": "^7.27.1",
"@mui/types": "^7.4.2",
"@types/prop-types": "^15.7.14",
"clsx": "^2.1.1",
"prop-types": "^15.8.1",
package.json
+2 -2
View File
@@ -16,8 +16,8 @@
"@ant-design/icons": "6.0.0",
"@emotion/react": "11.14.0",
"@emotion/styled": "11.14.0",
"@mui/lab": "7.0.0-beta.11",
"@mui/material": "7.0.2",
"@mui/lab": "7.0.0-beta.12",
"@mui/material": "7.1.0",
"@types/node": "22.15.8",
"@types/react-dom": "19.1.3",
"@vitejs/plugin-react": "1.3.2",
src/pages/Launcher.tsx
+4 -6
View File
@@ -92,7 +92,10 @@ export default () => {
canvas: canvas.current,
pushMessage,
reportDownloadProgress,
onExit: (code) => console.info('ExitCode', code)
onExit: (code) => {
console.info('ExitCode', code)
if (import.meta.env.PROD) location.reload();
}
}).then(setInstance)
.catch((e) => pushMessage(`WASM module start failed ${e}`))
}, [canvas])
@@ -118,11 +121,6 @@ export default () => {
setInitialized(true);
instance.FS.writeFile(`${instance?.ENV.HOME}/f2_res.ini`, f2_resIni, { encoding: 'utf8' });
instance.FS.chdir(`${instance?.ENV.HOME}`);
instance.onExit = code => {
instance.print(`Exit ${code}. You need to reload page to re-init wasm module`);
setShowConsole(true);
instance?.['_emscripten_exit_pointerlock']?.();
}
}
})()
}, [instance])
src/pages/error/40X.tsx
-49
View File
@@ -1,49 +0,0 @@
import { Link } from 'react-router-dom';
import { Box, Button, Grid, Stack, Typography } from '@mui/material';
import { useTranslation } from 'react-i18next';
export default () => {
const { t } = useTranslation();
const error404 = new URL('../../assets/images/error/404.png', import.meta.url).href;
const TwoCone = new URL('../../assets/images/error/TwoCone.png', import.meta.url).href;
return (
<>
<Grid
container
spacing={10}
direction="column"
alignItems="center"
justifyContent="center"
sx={{ minHeight: '90vh', pt: 1.5, pb: 1, overflow: 'hidden' }}
>
<Grid item xs={12}>
<Stack direction="row">
<Grid item>
<Box sx={{ width: { xs: 250, sm: 590 }, height: { xs: 130, sm: 300 } }}>
<img src={error404} alt="mantis" style={{ width: '100%', height: '100%' }} />
</Box>
</Grid>
<Grid item sx={{ position: 'relative' }}>
<Box sx={{ position: 'absolute', top: 60, left: -40, width: { xs: 130, sm: 390 }, height: { xs: 115, sm: 330 } }}>
<img src={TwoCone} alt="mantis" style={{ width: '100%', height: '100%' }} />
</Box>
</Grid>
</Stack>
</Grid>
<Grid item xs={12}>
<Stack spacing={2} justifyContent="center" alignItems="center">
<Typography variant="h1">{t('error.Page Not Found')}</Typography>
<Typography color="textSecondary" align="center" sx={{ width: { xs: '73%', sm: '61%' } }}>
{t('error.The page you are looking was moved, removed, renamed, or might never exist!')}
</Typography>
<Button component={Link} to={`${import.meta.env.BASE_URL}`} variant="contained">
{t('error.Back To Home')}
</Button>
</Stack>
</Grid>
</Grid>
</>
)
}
src/pages/error/50X.tsx
-38
View File
@@ -1,38 +0,0 @@
import { Link } from 'react-router-dom';
import { useTheme } from '@mui/material/styles';
import { Box, Button, Grid, Stack, Typography, useMediaQuery } from '@mui/material';
import { useTranslation } from "react-i18next";
export default () => {
const theme = useTheme();
const matchDownSM = useMediaQuery(theme.breakpoints.down('sm'));
const { t } = useTranslation();
const error500 = new URL('../../assets/images/error/500.png', import.meta.url).href;
return (
<>
<Grid container direction="column" alignItems="center" justifyContent="center" sx={{ minHeight: '90vh' }}>
<Grid item xs={12}>
<Box sx={{ width: { xs: 350, sm: 396 } }}>
<img src={error500} alt="mantis" style={{ height: '100%', width: '100%' }} />
</Box>
</Grid>
<Grid item xs={12}>
<Stack justifyContent="center" alignItems="center">
<Typography align="center" variant={matchDownSM ? 'h2' : 'h1'}>
{t('error.Internal Server Error')}
</Typography>
<Typography color="textSecondary" variant="body2" align="center" sx={{ width: { xs: '73%', sm: '70%' }, mt: 1 }}>
{t('error.Server error 500. we fixing the problem. please try again at a later stage.')}
</Typography>
<Button component={Link} to={`${import.meta.env.BASE_URL}`} variant="contained" sx={{ textTransform: 'none', mt: 4 }}>
{t('error.Back To Home')}
</Button>
</Stack>
</Grid>
</Grid>
</>
);
}
src/pages/fetchSaves.ts
+3 -3
View File
@@ -3,13 +3,13 @@ import { Uint8ArrayReader, Uint8ArrayWriter, ZipWriter } from '@zip.js/zip.js';
export default async (instance?: Module) => {
if (!instance) return;
const reducer: ({path, node}: {path: string, node: FSNode}) => ({[path: string]: Int8Array}) = ({ path, node }) =>
Object.entries(node.contents).reduce((acc, [name, node]) => ({
const reducer: ({path, node}: {path: string, node: FSNode}) => ({[path: string]: Int8Array}) =
({ path, node }) => Object.entries(node.contents).reduce((acc, [name, node]) => ({
...acc,
...(ArrayBuffer.isView(node.contents)
? { [`${path}/${name}`]: node.contents }
: reducer({ path: `${path}/${name}`, node }))
}), {} as ReturnType<typeof reducer>);
}), <ReturnType<typeof reducer>>{});
const zip = new ZipWriter(new Uint8ArrayWriter(), { bufferedWrite: true });
for(let [path, content] of Object.entries(reducer(instance.FS.lookupPath(`data/SAVEGAME`)))) {
await zip.add(path, new Uint8ArrayReader(new Uint8Array(content.buffer)))
src/pages/module.ts
+2 -2
View File
@@ -4,7 +4,7 @@ import wasm from '../assets/module/fallout2-ce.wasm?url'
import fallout2ce from '../assets/module/fallout2-ce';
export const ModuleInstance = ({ ENV, reportDownloadProgress, pushMessage, canvas }: ModuleInitParams) => {
export const ModuleInstance = ({ ENV, reportDownloadProgress, pushMessage, canvas, onExit }: ModuleInitParams) => {
let module: Partial<Module>;
@@ -15,7 +15,7 @@ export const ModuleInstance = ({ ENV, reportDownloadProgress, pushMessage, canva
preInit: [() => { Object.assign(module?.ENV ?? {}, ENV) }],
preRun: [],
noInitialRun: true,
onExit: code => console.log('exit code: '+code),
onExit,
locateFile: (path: string) => {
if (path.endsWith('wasm')) return wasm;
throw(`Unknown file[${path}] is requested by fallout2-ce.js module; known urls are: ${[wasm]}`);
src/routes/MainRoutes.tsx
-11
View File
@@ -2,9 +2,6 @@ import Loadable from '../components/Loadable';
import MainLayout from '../layouts/MainLayout';
import { lazy } from 'react';
const NotFoundError = Loadable(lazy(() => import('../pages/error/40X')));
const UnexpectedError = Loadable(lazy(() => import('../pages/error/50X')));
const Launcher = Loadable(lazy(() => import('../pages/Launcher')));
export default {
@@ -17,14 +14,6 @@ export default {
path: '',
element: <Launcher />
},
{
path: '*',
element: <NotFoundError />
},
{
path: 'error',
element: <UnexpectedError />
}
]
}
]
src/types/Module.ts
+2 -2
View File
@@ -38,7 +38,7 @@ export type Module = {
callMain: (args?: any[]) => void
} & Record<string, any>
type FSNode = {
export type FSNode = {
node_ops: {}
stream_ops: {};
readMode: number
@@ -47,7 +47,7 @@ type FSNode = {
contents: {
[name: string]: FSNode
}
} | Int8Array
/* unix timestamps */
atime: number