chore: incrementing version number - v2.0.1

(cherry picked from commit 768427d4bb)
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.1",
     "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) {

public/src/utils.common.js

@@ -274,15 +274,6 @@ const HTMLEntities = Object.freeze({
 
 /* eslint-disable no-redeclare */
 const utils = {
-	generateUUID: function () {
-		/* eslint-disable no-bitwise */
-		return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-			const r = Math.random() * 16 | 0;
-			const v = c === 'x' ? r : ((r & 0x3) | 0x8);
-			return v.toString(16);
-		});
-		/* eslint-enable no-bitwise */
-	},
 	// https://github.com/substack/node-ent/blob/master/index.js
 	decodeHTMLEntities: function (html) {
 		return String(html)

public/src/utils.js

@@ -73,4 +73,12 @@ utils.assertPasswordValidity = (password) => {
 	}
 };
 
+utils.generateUUID = function () {
+	// from https://github.com/tracker1/node-uuid4/blob/master/browser.js
+	const temp_url = URL.createObjectURL(new Blob());
+	const uuid = temp_url.toString();
+	URL.revokeObjectURL(temp_url);
+	return uuid.split(/[:\/]/g).pop().toLowerCase(); // remove prefixes
+};
+
 module.exports = utils;

src/utils.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const crypto = require('crypto');
+
 process.profile = function (operation, start) {
 	console.log('%s took %d milliseconds', operation, process.elapsedTimeSince(start));
 };
@@ -14,4 +16,17 @@ utils.getLanguage = function () {
 	const meta = require('./meta');
 	return meta.config && meta.config.defaultLang ? meta.config.defaultLang : 'en-GB';
 };
+
+utils.generateUUID = function () {
+	// from https://github.com/tracker1/node-uuid4/blob/master/index.js
+	let rnd = crypto.randomBytes(16);
+	/* eslint-disable no-bitwise */
+	rnd[6] = (rnd[6] & 0x0f) | 0x40;
+	rnd[8] = (rnd[8] & 0x3f) | 0x80;
+	/* eslint-enable no-bitwise */
+	rnd = rnd.toString('hex').match(/(.{8})(.{4})(.{4})(.{4})(.{12})/);
+	rnd.shift();
+	return rnd.join('-');
+};
+
 module.exports = utils;

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');
 			},
 		},
 	},