refactor(server): move index.js and app.js to /server

Author: ginkoid

.nycrc.json

@@ -1,5 +1,5 @@
 {
   "all": true,
-  "include": ["dist/server/**/*.js", "dist/index.js", "dist/app.js"],
+  "include": ["dist/server/**/*.js"],
   "excludeAfterRemap": false
 }

Dockerfile

@@ -15,7 +15,7 @@ COPY public ./public
 COPY preact.config.js ./
 
 COPY server ./server
-COPY tsconfig.json index.js app.js ./
+COPY tsconfig.json ./
 
 RUN yarn && yarn build && rm -rf node_modules
 
@@ -28,4 +28,4 @@ EXPOSE 8000
 COPY . .
 
 
-CMD ["node", "dist/index.js"]
+CMD ["node", "dist/server/index.js"]

package.json

@@ -1,23 +1,22 @@
 {
   "name": "rctf",
   "version": "0.0.0",
-  "main": "index.js",
   "license": "MIT",
   "private": true,
   "scripts": {
     "lint": "tsc --noEmit && eslint --ext .js,.ts .",
-    "start": "node dist/index.js",
+    "start": "node dist/server/index.js",
     "migrate": "node-pg-migrate --database-url-var=RCTF_DATABASE_URL",
     "build:client": "sh client/build.sh",
     "build:ts": "tsc && yarn copy-static",
     "build": "yarn build:ts && yarn build:client",
     "watch:client": "preact watch --src client/src --template client/index.html",
-    "watch:server": "nodemon dist/index.js",
+    "watch:server": "nodemon dist/server/index.js",
     "watch:ts": "tsc -w",
     "dev": "yarn build:ts && concurrently -k -t \"HH:mm:ss.SSS\" -p \"[{time}]\" -c \"cyan,green,red\" \"yarn:watch:*\"",
     "test": "yarn build && nyc --skip-full ava",
     "test:report": "nyc --skip-full --reporter=lcov ava",
-    "copy-static": "cpy 'server/**/*' '.rdeploy' '!**/*.ts' dist/ --no-overwrite --parents"
+    "copy-static": "sh -c \"cpy 'server/**/*' '.rdeploy' '!**/*.ts' dist/ --no-overwrite --parents\""
   },
   "husky": {
     "hooks": {

server/.eslintrc.js

@@ -1,8 +1,8 @@
 const path = require('path')
 const express = require('express')
-const { enableCORS, serveDownloads } = require('./server/util')
+const { enableCORS, serveDownloads } = require('./util')
 
-require('./server/leaderboard').startUpdater()
+require('./leaderboard').startUpdater()
 
 const app = express()
 
@@ -20,9 +20,9 @@ app.use(express.raw({
   type: 'application/json'
 }))
 
-app.use('/api/v1', require('./server/api'))
+app.use('/api/v1', require('./api'))
 
-const staticPath = path.join(__dirname, '/build')
+const staticPath = path.join(__dirname, '../build')
 app.use(express.static(staticPath, { extensions: ['html'] }))
 app.use(serveDownloads('/static/files'))
 app.use((req, res, next) => {

app.js renamed to server/app.js

@@ -11,7 +11,7 @@ test.serial('PORT env flag', async t => {
   const old = process.env.PORT
   process.env.PORT = PORT
 
-  require(path.join(__dirname, '/../../dist/index'))
+  require(path.join(__dirname, '/../../dist/server/index'))
 
   const resp = await got(`http://localhost:${PORT}`)
   t.true(resp.body !== undefined)
@@ -23,12 +23,12 @@ test.serial('TEST_COMPRESSION env flag', async t => {
   const old = process.env.TEST_COMPRESSION
   process.env.TEST_COMPRESSION = '1'
 
-  const resp = await request(reloadModule(path.join(__dirname, '/../../dist/app')))
+  const resp = await request(reloadModule(path.join(__dirname, '/../../dist/server/app')))
     .get('/favicon.ico')
     .expect('Content-Encoding', /gzip/)
 
   t.true(resp.body !== undefined)
 
   process.env.TEST_COMPRESSION = old
-  reloadModule(path.join(__dirname, '/../../dist/app'))
+  reloadModule(path.join(__dirname, '/../../dist/server/app'))
 })

index.js renamed to server/index.js

@@ -1,6 +1,6 @@
 const test = require('ava')
 const request = require('supertest')
-const app = require('../../dist/app')
+const app = require('../../dist/server/app')
 const { removeUserByEmail } = require('../../dist/server/database').auth
 
 const config = require('../../dist/config/server')

test/integration/app.js

@@ -1,6 +1,6 @@
 const test = require('ava')
 const request = require('supertest')
-const app = require('../../dist/app')
+const app = require('../../dist/server/app')
 const { v4: uuidv4 } = require('uuid')
 const auth = require('../../dist/server/auth')
 const config = require('../../dist/config/server')

test/integration/auth.js

@@ -1,6 +1,6 @@
 const test = require('ava')
 const request = require('supertest')
-const app = require('../../dist/app')
+const app = require('../../dist/server/app')
 
 const { responseList } = require('../../dist/server/responses')
 

test/integration/challenges.js

@@ -1,6 +1,6 @@
 const test = require('ava')
 const request = require('supertest')
-const app = require('../../dist/app')
+const app = require('../../dist/server/app')
 const { v4: uuidv4 } = require('uuid')
 
 const config = require('../../dist/config/server')

test/integration/leaderboard.js

@@ -1,6 +1,6 @@
 const test = require('ava')
 const request = require('supertest')
-const app = require('../../dist/app')
+const app = require('../../dist/server/app')
 const { v4: uuidv4 } = require('uuid')
 
 const db = require('../../dist/server/database')

test/integration/profile.js

@@ -1,6 +1,6 @@
 const test = require('ava')
 const request = require('supertest')
-const app = require('../../dist/app')
+const app = require('../../dist/server/app')
 const config = require('../../dist/config/server')
 const { v4: uuidv4 } = require('uuid')
 

test/integration/submit.js

@@ -13,6 +13,6 @@
     "baseUrl": "."
   },
   "include": [
-    "src/**/*", "index.js", "app.js"
+    "server/**/*"
   ]
 }