From 3559fa27be31237f234eb54238eadb770aef8d49 Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Tue, 28 May 2024 04:21:36 -0400 Subject: [PATCH] Fixes TGUI Dev & Minor juke issue (#959) * minor juke issue * https://github.com/tgstation/tgstation/pull/79898 * https://github.com/tgstation/tgstation/pull/82032 --- tgui/packages/tgui-dev-server/util.js | 1 + tgui/webpack.config.js | 1 + tools/build/build.js | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tgui/packages/tgui-dev-server/util.js b/tgui/packages/tgui-dev-server/util.js index 9d07b96c71a0..54d806a629df 100644 --- a/tgui/packages/tgui-dev-server/util.js +++ b/tgui/packages/tgui-dev-server/util.js @@ -19,6 +19,7 @@ export const resolveGlob = (...sections) => { const unsafePaths = globPkg.sync(path.resolve(...sections), { strict: false, silent: true, + windowsPathsNoEscape: true, }); const safePaths = []; for (let path of unsafePaths) { diff --git a/tgui/webpack.config.js b/tgui/webpack.config.js index 05bf4c96f24d..864bbeb25630 100644 --- a/tgui/webpack.config.js +++ b/tgui/webpack.config.js @@ -42,6 +42,7 @@ module.exports = (env = {}, argv) => { filename: '[name].bundle.js', chunkFilename: '[name].bundle.js', chunkLoadTimeout: 15000, + publicPath: '/', }, resolve: { extensions: ['.tsx', '.ts', '.js'], diff --git a/tools/build/build.js b/tools/build/build.js index 2a2226fd3788..fdab9178801a 100755 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -65,6 +65,7 @@ export const DmTarget = new Juke.Target({ ], inputs: [ "_maps/map_files/generic/**", + "maps/**/*.dm", "code/**", "goon/**", "html/**", @@ -100,7 +101,7 @@ export const DmTestTarget = new Juke.Target({ "-trusted", "-verbose", "-params", - "log-directory=ci", + "log-directory=ci" ); Juke.rm("*.test.*"); try { @@ -134,7 +135,7 @@ export const AutowikiTarget = new Juke.Target({ "-trusted", "-verbose", "-params", - "log-directory=ci", + "log-directory=ci" ); Juke.rm("*.test.*"); if (!fs.existsSync("data/autowiki_edits.txt")) {