fix: #10586, fix webinstaller folders

(cherry picked from commit f23c3ff5b2)
Signed-off-by: Misty Release Bot <deploy@nodebb.org>

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "2.0.0-beta.1",
+    "version": "2.0.0",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -61,6 +61,7 @@
         "express-session": "1.17.2",
         "express-useragent": "1.0.15",
         "file-loader": "6.2.0",
+        "fs-extra": "10.1.0",
         "graceful-fs": "4.2.10",
         "helmet": "5.0.2",
         "html-to-text": "8.2.0",

install/web.js

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

webpack.common.js

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