From cbfee0ac7e9ac705ba1a8b5bffa2c5ed4511b70d Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Mar 2018 18:07:38 -0700 Subject: mascara - server - server bundles before static assets + serve dist/mascara instead of chrome --- mascara/server/index.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'mascara/server') diff --git a/mascara/server/index.js b/mascara/server/index.js index 0f9b047a7..2ad8af242 100644 --- a/mascara/server/index.js +++ b/mascara/server/index.js @@ -15,22 +15,21 @@ function createMetamascaraServer () { const uiBundle = createBundle(path.join(__dirname, '/../src/ui.js')) const backgroundBuild = createBundle(path.join(__dirname, '/../src/background.js')) - // serve bundles + // setup server const server = express() server.use(compression()) - // ui window - serveBundle(server, '/scripts/ui.js', uiBundle) - 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 + // serve bundles serveBundle(server, '/metamascara.js', metamascaraBundle) - // proxy + serveBundle(server, '/scripts/ui.js', uiBundle) serveBundle(server, '/scripts/proxy.js', proxyBundle) - server.use('/', express.static(path.join(__dirname, '/../proxy'))) - // background serveBundle(server, '/scripts/background.js', backgroundBuild) + // serve assets + server.use(express.static(path.join(__dirname, '/../ui/'), { setHeaders: (res) => res.set('X-Frame-Options', 'DENY') })) + server.use(express.static(path.join(__dirname, '/../../dist/mascara'))) + server.use(express.static(path.join(__dirname, '/../proxy'))) + return server } -- cgit