dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

created server/bin/ for server entrypoints

Browse source 
- added server/bin/test.js for the frontend test runner
This commit is contained in:
Danny Coates 2018-06-22 13:32:24 -07:00
parent dafe4884fc
commit c157e4d31c
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
7 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/dev.js → server/bin/dev.js
View file

@ -1,15 +1,15 @@
const assets = require('../common/assets');
const locales = require('../common/locales');
const routes = require('./routes');
const pages = require('./routes/pages');
const tests = require('../test/frontend/routes');
const assets = require('../../common/assets');
const locales = require('../../common/locales');
const routes = require('../routes');
const pages = require('../routes/pages');
const tests = require('../../test/frontend/routes');
const express = require('express');
const expressWs = require('express-ws');
const config = require('./config');
const config = require('../config');
const wsapp = express();
expressWs(wsapp, null, { perMessageDeflate: false });
wsapp.ws('/api/ws', require('./routes/ws'));
wsapp.ws('/api/ws', require('../routes/ws'));
wsapp.listen(8081, config.listen_address);
module.exports = function(app, devServer) {

10
server/prod.js → server/bin/prod.js
View file

@ -1,9 +1,9 @@
const express = require('express');
const path = require('path');
const Raven = require('raven');
const config = require('./config');
const routes = require('./routes');
const pages = require('./routes/pages');
const config = require('../config');
const routes = require('../routes');
const pages = require('../routes/pages');
const expressWs = require('express-ws');
if (config.sentry_dsn) {
@ -12,11 +12,11 @@ if (config.sentry_dsn) {
const app = express();
expressWs(app, null, { perMessageDeflate: false });
app.ws('/api/ws', require('./routes/ws'));
app.ws('/api/ws', require('../routes/ws'));
routes(app);
app.use(
express.static(path.resolve(__dirname, '../dist/'), {
express.static(path.resolve(__dirname, '../../dist/'), {
setHeaders: function(res) {
res.set('Cache-Control', 'public, max-age=31536000, immutable');
res.removeHeader('Pragma');

18
server/bin/test.js Normal file
View file

@ -0,0 +1,18 @@
const assets = require('../../common/assets');
const locales = require('../../common/locales');
const routes = require('../routes');
const pages = require('../routes/pages');
const tests = require('../../test/frontend/routes');
const expressWs = require('express-ws');
module.exports = function(app, devServer) {
assets.setMiddleware(devServer.middleware);
locales.setMiddleware(devServer.middleware);
expressWs(app, null, { perMessageDeflate: false });
app.ws('/api/ws', require('../routes/ws'));
routes(app);
tests(app);
// webpack-dev-server routes haven't been added yet
// so wait for next tick to add 404 handler
process.nextTick(() => app.use(pages.notfound));
};