refactor: use build/public for webpack

install/package.json

@@ -40,7 +40,6 @@
         "bootstrap": "3.4.1",
         "chalk": "4.1.2",
         "chart.js": "2.9.4",
-        "clean-webpack-plugin": "4.0.0",
         "cli-graph": "3.2.2",
         "clipboard": "2.0.10",
         "colors": "1.4.0",

public/src/admin/admin.js

@@ -5,7 +5,7 @@ require('../app');
 // scripts-admin.min contains javascript files
 // from plugins that add files to "acpScripts" block in plugin.json
 // eslint-disable-next-line import/no-unresolved
-require('../../scripts-admin.min');
+require('../../scripts-admin');
 
 (function () {
 	let logoutTimer = 0;

public/src/client.js

@@ -5,4 +5,4 @@ require('./app');
 // scripts-client.min contains javascript files
 // from plugins that add files to "scripts" block in plugin.json
 // eslint-disable-next-line import/no-unresolved
-require('../scripts-client.min');
+require('../scripts-client');

src/meta/js.js

@@ -128,9 +128,9 @@ async function getBundleScriptList(target) {
 }
 
 JS.buildBundle = async function (target, fork) {
-	const filename = `scripts-${target}.min.js`;
+	const filename = `scripts-${target}.js`;
 	const files = await getBundleScriptList(target);
-	const minify = process.env.NODE_ENV !== 'development';
+	const minify = false; // webpack will minify in prod
 	const filePath = path.join(__dirname, '../../build/public', filename);
 
 	await minifier.js.bundle({

src/routes/index.js

@@ -171,7 +171,6 @@ function addCoreRoutes(app, router, middleware, mounts) {
 
 	const statics = [
 		{ route: '/assets', path: path.join(__dirname, '../../build/public') },
-		{ route: '/assets', path: path.join(__dirname, '../../build/webpack') }, // todo: messy; relocate in v3
 		{ route: '/assets', path: path.join(__dirname, '../../public') },
 	];
 	const staticOptions = {

webpack.common.js

@@ -4,8 +4,6 @@ const path = require('path');
 const url = require('url');
 const nconf = require('nconf');
 
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-
 const activePlugins = require('./build/active_plugins.json');
 
 let relativePath = nconf.get('relative_path');
@@ -19,18 +17,21 @@ if (relativePath === undefined) {
 }
 
 module.exports = {
-	plugins: [
-		new CleanWebpackPlugin(), // cleans dist folder
-	],
+	plugins: [],
 	entry: {
 		nodebb: './build/public/src/client.js',
 		admin: './build/public/src/admin/admin.js',
 	},
 	output: {
 		filename: '[name].min.js',
-		chunkFilename: '[name].[contenthash].js',
-		path: path.resolve(__dirname, 'build/webpack'),
+		chunkFilename: '[name].[contenthash].min.js',
+		path: path.resolve(__dirname, 'build/public'),
 		publicPath: `${relativePath}/assets/`,
+		clean: {
+			keep(asset) {
+				return !asset.endsWith('.min.js');
+			},
+		},
 	},
 	watchOptions: {
 		poll: 500,