babel

.gitignore

@@ -18,5 +18,8 @@ test/.devKeys
 *.log
 .env
 
+# Build
+dist
+
 data/*
 !data/nginx

.mocharc.json

@@ -1,3 +0,0 @@
-{
-  "require": ["esm"]
-}

Dockerfile

@@ -9,6 +9,7 @@ RUN npm ci
 
 # Bundle app source
 COPY . .
+RUN npm run build
 
 EXPOSE 3000
-CMD ["node", "-r", "esm", "src/server"]
+CMD ["npm", "run", "server"]

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - "4040:4040"
   worker:
     build: .
-    command: node -r esm src/worker
+    command: npm run worker
     restart: unless-stopped
     depends_on:
       - db

package.json

@@ -3,59 +3,66 @@
   "version": "1.0.0",
   "description": "replacement for comma.ai backend and useradmin dashboard. can be combined with a modified cabana instance.",
   "homepage": "https://github.com/RetroPilot/retropilot-server",
-  "main": "src/server/index.js",
+  "main": "dist/server/index.js",
   "scripts": {
-    "test": "mocha",
+    "lint": "eslint src --ext .js",
-    "start": "node -r esm src/server",
+    "test": "mocha --require @babel/register",
-    "lint": "eslint . --ext .js",
+    "build": "babel src -d dist",
-    "lint:fix": "eslint . --ext .js --fix"
+    "dev": "nodemon --watch src --exec \"npm run build && npm run server\"",
+    "dev:worker": "nodemon --watch src --exec \"npm run build && npm run worker\"",
+    "server": "node dist/server",
+    "worker": "node dist/worker"
   },
   "dependencies": {
+    "@babel/cli": "^7.17.6",
+    "@babel/core": "^7.17.8",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/register": "^7.17.7",
     "@commaai/log_reader": "^0.9.0",
-    "@sendgrid/client": "^7.4.3",
+    "@sendgrid/client": "^7.6.2",
     "2fa-util": "^1.1.1",
-    "body-parser": "^1.19.1",
+    "body-parser": "^1.19.2",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "chai-http": "^4.3.0",
-    "cookie": "^0.4.1",
+    "cookie": "^0.4.2",
-    "cookie-parser": "^1.4.5",
+    "cookie-parser": "^1.4.6",
     "cookies": "^0.8.0",
     "cors": "^2.8.5",
     "crypto": "^1.0.1",
     "directory-tree": "^2.2.9",
     "dotenv": "^16.0.0",
-    "esm": "^3.2.25",
+    "express": "^4.17.3",
-    "express": "^4.17.1",
+    "express-fileupload": "^1.3.1",
-    "express-fileupload": "^1.2.1",
+    "express-rate-limit": "^6.3.0",
-    "express-rate-limit": "^5.5.0",
     "express-ws": "^5.0.2",
-    "fast-folder-size": "^1.3.0",
+    "fast-folder-size": "^1.6.1",
     "ffprobe": "^1.1.2",
     "ffprobe-static": "^3.0.0",
     "file-chunked": "^1.0.4",
-    "google-auth-library": "^7.11.0",
+    "google-auth-library": "^7.14.0",
     "htmlspecialchars": "^1.0.5",
     "jsonwebtoken": "^8.5.1",
-    "log4js": "^6.3.0",
+    "log4js": "^6.4.3",
-    "mocha": "^8.4.0",
+    "multer": "^1.4.4",
-    "multer": "^1.4.2",
+    "nodemailer": "^6.7.3",
-    "nodemailer": "^6.6.0",
+    "pg": "^8.7.3",
-    "pg": "^8.7.1",
     "sanitize": "^2.1.0",
-    "sequelize": "^6.6.5",
+    "sequelize": "^6.17.0",
     "simple-oauth2": "^4.3.0",
-    "sqlite": "^4.0.22",
+    "sqlite": "^4.0.25",
     "sqlite3": "^5.0.2",
-    "supertest": "^6.1.3",
+    "supertest": "^6.2.2",
     "uuid": "^8.3.2",
     "websocket": "^1.0.34",
-    "ws": "^8.2.3",
+    "ws": "^8.5.0",
     "yup": "^0.32.11"
   },
   "devDependencies": {
-    "eslint": "^8.6.0",
+    "eslint": "^8.11.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-no-floating-promise": "^1.0.2"
+    "eslint-plugin-no-floating-promise": "^1.0.2",
+    "mocha": "^9.2.2",
+    "nodemon": "^2.0.15"
   }
 }