aboutsummaryrefslogtreecommitdiffstats
path: root/mascara
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-10-25 07:53:54 +0800
committerGitHub <noreply@github.com>2017-10-25 07:53:54 +0800
commit1767dceba44f6d173bf3cdb8436d117c7f29b834 (patch)
treee052bcc29f8b05c9ef7f175c5346b5ff28a1e75a /mascara
parentae56b865e8a4d3a6a82a97efeca34b8a592c985b (diff)
parent43b1cb9100e74ab32efe1a59b3320d0aeadedcdf (diff)
downloadtangerine-wallet-browser-1767dceba44f6d173bf3cdb8436d117c7f29b834.tar
tangerine-wallet-browser-1767dceba44f6d173bf3cdb8436d117c7f29b834.tar.gz
tangerine-wallet-browser-1767dceba44f6d173bf3cdb8436d117c7f29b834.tar.bz2
tangerine-wallet-browser-1767dceba44f6d173bf3cdb8436d117c7f29b834.tar.lz
tangerine-wallet-browser-1767dceba44f6d173bf3cdb8436d117c7f29b834.tar.xz
tangerine-wallet-browser-1767dceba44f6d173bf3cdb8436d117c7f29b834.tar.zst
tangerine-wallet-browser-1767dceba44f6d173bf3cdb8436d117c7f29b834.zip
Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
Diffstat (limited to 'mascara')
-rw-r--r--mascara/server/index.js15
1 files changed, 8 insertions, 7 deletions
diff --git a/mascara/server/index.js b/mascara/server/index.js
index 24739b43f..f0d022f7d 100644
--- a/mascara/server/index.js
+++ b/mascara/server/index.js
@@ -1,3 +1,4 @@
+const path = require('path')
const express = require('express')
const createBundle = require('./util').createBundle
const serveBundle = require('./util').serveBundle
@@ -8,22 +9,22 @@ module.exports = 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()
// ui window
serveBundle(server, '/ui.js', uiBundle)
- server.use(express.static(__dirname + '/../ui/', { setHeaders: (res) => res.set('X-Frame-Options', 'DENY') }))
- 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)