Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #10586, fix webinstaller folders

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-05-06 12:53:44 -04:00
parent 8838bc200d
commit 1928a18617
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
install/web.js
View File

@@ -58,7 +58,7 @@ web.install = async function (port) {
winston.info(`Launching web installer on port ${port}`); winston.info(`Launching web installer on port ${port}`);
app.use(express.static('public', {})); app.use(express.static('public', {}));
app.use('/assets', express.static(path.join(__dirname, '../build/webpack'), {})); app.use('/assets', express.static(path.join(__dirname, '../build/public'), {}));
app.engine('tpl', (filepath, options, callback) => { app.engine('tpl', (filepath, options, callback) => {
filepath = filepath.replace(/\.tpl$/, '.js'); filepath = filepath.replace(/\.tpl$/, '.js');
@@ -206,15 +206,20 @@ async function launch(req, res) {
} }
const filesToDelete = [ const filesToDelete = [
'installer.css', path.join(__dirname, '../public', 'installer.css'),
'installer.min.js', path.join(__dirname, '../public', 'bootstrap.min.css'),
'bootstrap.min.css', path.join(__dirname, '../build/public', 'installer.min.js'),
]; ];
await Promise.all( try {
filesToDelete.map( await Promise.all(
filename => fs.promises.unlink(path.join(__dirname, '../public', filename)) filesToDelete.map(
) filename => fs.promises.unlink(filename)
); )
);
} catch (err) {
console.log(err.stack);
}
child.unref(); child.unref();
process.exit(0); process.exit(0);
} catch (err) { } catch (err) {

3
webpack.common.js
View File

@@ -29,7 +29,8 @@ module.exports = {
publicPath: `${relativePath}/assets/`, publicPath: `${relativePath}/assets/`,
clean: { clean: {
keep(asset) { keep(asset) {
return !asset.endsWith('.min.js'); return asset === 'installer.min.js' ||
!asset.endsWith('.min.js');
}, },
}, },
}, },