From 599ef86bd4d0020c4d5afbb1b99ccdc6e274c865 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 7 Mar 2021 01:36:14 +0100 Subject: [PATCH] [MIRROR] Fix tgui reloading (#3960) * Fix tgui reloading (#57499) * Fix tgui reloading Co-authored-by: Aleksej Komarov --- .gitignore | 3 +++ tgui/packages/tgui-dev-server/reloader.js | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f9db4f307b3..9334eb8f7bf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ #Ignore byond config folder. /cfg/**/* +# Ignore compiled linux libs in the root folder, e.g. librust_g.so +/*.so + #Ignore compiled files and other files generated during compilation. *.mdme *.dmb diff --git a/tgui/packages/tgui-dev-server/reloader.js b/tgui/packages/tgui-dev-server/reloader.js index d41e298f7d1..9bc40d64842 100644 --- a/tgui/packages/tgui-dev-server/reloader.js +++ b/tgui/packages/tgui-dev-server/reloader.js @@ -67,7 +67,7 @@ export const findCacheRoot = async () => { const onCacheRootFound = cacheRoot => { logger.log(`found cache at '${cacheRoot}'`); - // Plant dummy + // Plant a dummy fs.closeSync(fs.openSync(cacheRoot + '/dummy', 'w')); }; @@ -94,12 +94,12 @@ export const reloadByondCache = async bundleDir => { const garbage = await resolveGlob(cacheDir, './*.+(bundle|chunk|hot-update).*'); try { for (let file of garbage) { - fs.unlink(file); + fs.unlinkSync(file); } // Copy assets for (let asset of assets) { const destination = resolvePath(cacheDir, basename(asset)); - fs.copyFile(asset, destination); + fs.writeFileSync(destination, fs.readFileSync(asset)); } logger.log(`copied ${assets.length} files to '${cacheDir}'`); }