fix bundling

Makefile

@@ -69,7 +69,7 @@ build-css-loader:
 	uglifyjs browser/layout/src/css-loader.js -o browser/layout/partials/css-loader.html
 
 build-bundle:
-	webpack --bail --config build/deploy/webpack.deploy.config.js --define process.env.NODE_ENV="'production'"
+	webpack -p --bail --config build/deploy/webpack.deploy.config.js
 
 build-dist: build-bundle build-css-loader
 	node ./build/deploy/build-auxilliary-files.js

build/deploy/webpack.deploy.config.js

@@ -6,7 +6,6 @@ If you need to add any config which will be shared amongst an n-ui build and an
 app build please add it to the common config.
 */
 
-const webpack = require('webpack');
 const webpackMerge = require('webpack-merge');
 const ExtractCssBlockPlugin = require('extract-css-block-webpack-plugin');
 const commonConfig = require('../webpack.common.config.js');
@@ -22,11 +21,5 @@ module.exports = webpackMerge(commonConfig, {
 	plugins: [
 		// splits one stylesheet into multiple stylesheets based on nUiStylesheetStart/End comments
 		new ExtractCssBlockPlugin(),
-
-		// Minify & Uglify all the JS
-		new webpack.optimize.UglifyJsPlugin({
-			test: /\.min\.js$/,
-			sourceMap: true
-		}),
 	],
 });

server/lib/asset-manager/middleware-factory.js

@@ -33,10 +33,12 @@ module.exports = ({
 
 				getAssetUrl({
 					file: 'font-loader.js',
+					flags: res.locals.flags,
 					isNUi: true
 				}),
 				getAssetUrl({
 					file: 'o-errors.js',
+					flags: res.locals.flags,
 					isNUi: true
 				}),
 				getAssetUrl({