Merge branch 'master' into mascara-deploy

2 files changed, 19 insertions, 13 deletions

diff --git a/mascara/server/index.js b/mascara/server/index.js
index 14e3fa18e..6fb1287cc 100644
--- a/mascara/server/index.js
+++ b/mascara/server/index.js
@@ -1,29 +1,33 @@
+const path = require('path')
 const express = require('express')
 const createBundle = require('./util').createBundle
 const serveBundle = require('./util').serveBundle
+const compression = require('compression')
 
 module.exports = createMetamascaraServer
 
 
-function createMetamascaraServer(){
+function createMetamascaraServer () {
 
   // start bundlers
-  const metamascaraBundle = createBundle(__dirname + '/../src/mascara.js')
-  const proxyBundle = createBundle(__dirname + '/../src/proxy.js')
-  const uiBundle = createBundle(__dirname + '/../src/ui.js')
-  const backgroundBuild = createBundle(__dirname + '/../src/background.js')
+  const metamascaraBundle = createBundle(path.join(__dirname, '/../src/mascara.js'))
+  const proxyBundle = createBundle(path.join(__dirname, '/../src/proxy.js'))
+  const uiBundle = createBundle(path.join(__dirname, '/../src/ui.js'))
+  const backgroundBuild = createBundle(path.join(__dirname, '/../src/background.js'))
 
   // serve bundles
   const server = express()
+  server.use(compression())
+
   // ui window
   serveBundle(server, '/ui.js', uiBundle)
-  server.use(express.static(__dirname+'/../ui/'))
-  server.use(express.static(__dirname+'/../../dist/chrome'))
+  server.use(express.static(path.join(__dirname, '/../ui/'), { setHeaders: (res) => res.set('X-Frame-Options', 'DENY') }))
+  server.use(express.static(path.join(__dirname, '/../../dist/chrome')))
   // metamascara
   serveBundle(server, '/metamascara.js', metamascaraBundle)
   // proxy
   serveBundle(server, '/proxy/proxy.js', proxyBundle)
-  server.use('/proxy/', express.static(__dirname+'/../proxy'))
+  server.use('/proxy/', express.static(path.join(__dirname, '/../proxy')))
   // background
   serveBundle(server, '/background.js', backgroundBuild)
 
diff --git a/mascara/server/util.js b/mascara/server/util.js
index 6e25b35d8..f9692afb6 100644
--- a/mascara/server/util.js
+++ b/mascara/server/util.js
@@ -7,14 +7,14 @@ module.exports = {
 }
 
 
-function serveBundle(server, path, bundle){
-  server.get(path, function(req, res){
+function serveBundle (server, path, bundle) {
+  server.get(path, function (req, res) {
     res.setHeader('Content-Type', 'application/javascript; charset=UTF-8')
     res.send(bundle.latest)
   })
 }
 
-function createBundle(entryPoint){
+function createBundle (entryPoint) {
 
   var bundleContainer = {}
 
@@ -24,14 +24,16 @@ function createBundle(entryPoint){
     packageCache: {},
     plugin: [watchify],
   })
+    .transform('babelify')
+    .transform('uglifyify', { global: true })
 
   bundler.on('update', bundle)
   bundle()
 
   return bundleContainer
 
-  function bundle() {
-    bundler.bundle(function(err, result){
+  function bundle () {
+    bundler.bundle(function (err, result) {
       if (err) {
         console.log(`Bundle failed! (${entryPoint})`)
         console.error(err)