#181834892 Fix test and compile TS files into JS for server in /server/build directory

Author: Uptaker

Dockerfile

@@ -23,7 +23,7 @@ COPY --from=build /app/build build
 COPY *.json ./
 RUN npm ci --production
 
-COPY --from=build /app/server ./server/
+COPY --from=build /app/server/build ./server/
 
 EXPOSE 8999
 

package.json

@@ -2,10 +2,9 @@
   "scripts": {
     "start": "vite",
     "build": "vite build",
-    "build:server": "tsc -m commonjs --target esnext --esModuleInterop true server/*.ts",
-    "run:server": "npm run build:server && node server/server",
-    "test": "web-test-runner \"src/**/*.test.ts\"",
-    "test:server": "web-test-runner \"server/**/*.test.ts\""
+    "build:server": "tsc -m commonjs --target esnext --esModuleInterop true --outDir server/build server/*.ts",
+    "run:server": "npm run build:server && node server/build/server",
+    "test": "web-test-runner \"src/**/*.test.ts\" \"server/**/*.test.ts\""
   },
   "dependencies": {
     "cookie-parser": "^1.4.6",

server/Logger.test.ts

@@ -1,28 +1,29 @@
-import Logger from './Logger'
-import sinon, {stub} from 'sinon'
+import logger from './Logger'
+import {spy, stub} from 'sinon'
 import {expect} from 'chai'
 
-const date = Date.parse('9 April 2020 16:30:00 GMT')
+describe('Logger', () => {
+  const date = Date.parse('9 April 2020 16:30:00 GMT+3')
+
   beforeEach(() => {
     stub(Date, 'now').returns(date)
   })
 
-describe('Logger', () => {
   it('outputs error', async () => {
-    const log = sinon.spy(console, 'error')
-    Logger.error('an error')
-    expect(log.calledWith('[2020-3-1 16:30] [ERROR] an error')).to.be.true
+    const log = spy(console, 'error')
+    logger.error('an error')
+    expect(log).calledWith('[2020-04-09 16:30] [ERROR] an error')
   })
 
   it('outputs info log', async () => {
-    const log = sinon.spy(console, 'info')
-    Logger.info('an info log')
-    expect(log.calledWith('[2020-3-1 16:30] [INFO] an info log')).to.be.true
+    const log = spy(console, 'info')
+    logger.info('an info log')
+    expect(log).calledWith('[2020-04-09 16:30] [INFO] an info log')
   })
 
   it('outputs regular log', async () => {
-    const log = sinon.spy(console, 'log')
-    Logger.log('some kind of log')
-    expect(log.calledWith('[2020-3-1 16:30] some kind of log')).to.be.true
+    const log = spy(console, 'log')
+    logger.log('some kind of log')
+    expect(log).calledWith('[2020-04-09 16:30] some kind of log')
   })
 })

server/Logger.ts

@@ -15,7 +15,8 @@ class Logger {
     const date = new Date(Date.now())
     return `[${date.getFullYear()}-` +
       `${(date.getMonth() + 1) >= 10 ? date.getMonth() + 1 : `0${date.getMonth() + 1}`}-` +
-      `${date.getDate()} ${date.getHours()}:` +
+      `${(date.getDate() >= 10) ? date.getDate() : `0${date.getDate()}` } ` +
+      `${date.getHours()}:` +
       `${(date.getMinutes() >= 10) ? date.getMinutes() : `0${date.getMinutes()}`}]`
   }
 }

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "@tsconfig/svelte/tsconfig.json",
-  "include": ["src", "types"],
+  "include": ["src", "server", "types"],
   "exclude": ["e2e"],
   "compilerOptions": {
     "module": "esnext",