Optimise bundle build and server side add compression

Dockerfile

@@ -3,16 +3,15 @@ FROM node:slim
 MAINTAINER Vault-UI Contributors
 
 ADD package.json /tmp/package.json
-RUN cd /tmp && npm install --silent
-RUN mkdir -p /app/ && cp -a /tmp/node_modules /app/
+RUN cd /tmp && npm install --silent && mkdir -p /app/ && mv /tmp/node_modules /app/
 
 RUN npm install --silent -g webpack
 
 ADD . /app
 WORKDIR /app
 
-RUN webpack && npm run build
+RUN npm run build
 
 EXPOSE 8000
 
-CMD ["npm", "run", "serve"]
+CMD ["npm", "run", "serve"]

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "nodemon ./server.js --exec babel-node --presets es2015,stage-2",
-    "build": "babel ./server.js -d . --presets es2015,stage-2",
+    "build": "webpack --config=webpack.min.config.js",
     "serve": "nodemon ./server.js"
   },
   "repository": {
@@ -53,6 +53,7 @@
     "autoprefixer": "^6.5.3",
     "axios": "^0.15.2",
     "body-parser": "^1.15.2",
+    "compression": "^1.6.2",
     "copy-to-clipboard": "^3.0.5",
     "express": "^4.14.0",
     "hbs": "^4.0.1",

server.js

@@ -6,6 +6,7 @@ var path = require('path');
 var axios = require('axios');
 var _ = require('lodash');
 var routeHandler = require('./src/routeHandler');
+var compression = require('compression');
 
 var PORT = 8000;
 var VAULT_URL_DEFAULT = process.env.VAULT_URL_DEFAULT || "";
@@ -15,7 +16,7 @@ var VAULT_SUPPLIED_TOKEN_HEADER = process.env.VAULT_SUPPLIED_TOKEN_HEADER
 var app = express();
 app.set('view engine', 'html');
 app.engine('html', require('hbs').__express);
-app.use('/assets', express.static('dist'));
+app.use('/assets', compression(), express.static('dist'));
 
 // parse application/x-www-form-urlencoded
 app.use(bodyParser.urlencoded({ extended: false }));

webpack.config.js

@@ -14,7 +14,7 @@ module.exports = {
         publicPath: '/assets/',
         filename: 'bundle.js'
     },
-//    devtool: 'source-map',
+    devtool: 'eval',
     module: {
         loaders: [{
             test: /\.jsx?$/,
@@ -39,19 +39,6 @@ module.exports = {
     },
     postcss: [ autoprefixer({ browsers: ['last 2 versions'] }) ],
     plugins: [
-        // new webpack.DefinePlugin({
-        //     'process.env': {
-        //        'NODE_ENV': JSON.stringify('production')
-        //     }
-        //   }),
-        // new webpack.optimize.UglifyJsPlugin({
-        //     compress: {
-        //         warnings: false,
-        //         screw_ie8: true
-        //     },
-        //     comments: false,
-        //     sourceMap: false
-        // }),
         new ExtractTextPlugin("styles.css"),
         new webpack.IgnorePlugin(/regenerator|nodent|js-beautify/, /ajv/)
     ]

webpack.min.config.js

@@ -0,0 +1,23 @@
+var config = require('./webpack.config');
+var webpack = require('webpack');
+
+var reactprodmode = new webpack.DefinePlugin({
+    'process.env': {
+        'NODE_ENV': JSON.stringify('production')
+    }
+});
+config.plugins.push(reactprodmode);
+
+var uglify = new webpack.optimize.UglifyJsPlugin({
+    minimize: true,
+    comments: false,
+    sourceMap: false,
+    compress: {
+        warnings: false,
+    }
+});
+config.plugins.push(uglify);
+
+delete config.devtool;
+
+module.exports = config;