Get tests passing again

modules/server.js

@@ -1,59 +1,8 @@
-import express from 'express';
-
-import serveFile from './actions/serveFile';
-import serveMainPage from './actions/serveMainPage';
-import serveStats from './actions/serveStats';
-
-import cors from './middleware/cors';
-import fetchPackage from './middleware/fetchPackage';
-import findFile from './middleware/findFile';
-import logger from './middleware/logger';
-import redirectLegacyURLs from './middleware/redirectLegacyURLs';
-import staticFiles from './middleware/staticFiles';
-import validatePackageURL from './middleware/validatePackageURL';
-import validatePackageName from './middleware/validatePackageName';
-import validateQuery from './middleware/validateQuery';
-
-import createRouter from './utils/createRouter';
+import createServer from './createServer.js';
 
+const server = createServer();
 const port = process.env.PORT || '8080';
 
-const app = express();
-
-app.disable('x-powered-by');
-app.enable('trust proxy');
-
-app.use(logger);
-app.use(cors);
-app.use(staticFiles);
-
-// Special startup request from App Engine
-// https://cloud.google.com/appengine/docs/standard/nodejs/how-instances-are-managed
-app.get('/_ah/start', (req, res) => {
-  res.status(200).end();
-});
-
-app.get('/', serveMainPage);
-
-app.use(redirectLegacyURLs);
-
-app.use(
-  '/api',
-  createRouter(app => {
-    app.get('/stats', serveStats);
-  })
-);
-
-app.get(
-  '*',
-  validatePackageURL,
-  validatePackageName,
-  validateQuery,
-  fetchPackage,
-  findFile,
-  serveFile
-);
-
-app.listen(port, () => {
+server.listen(port, () => {
   console.log('Server listening on port %s, Ctrl+C to quit', port);
 });