Merge branch 'mc'

data/pm2-docker.json

@@ -2,8 +2,9 @@
 	"apps": [
 		{
 			"name": "ygopro-server",
-			"script": "/ygopro-server/ygopro-server.js",
-			"cwd": "/ygopro-server"
+			"script": "npm",
+			"cwd": "/ygopro-server",
+			"args": "start"
 		},
 		{
 			"name": "windbot",

package-lock.json

@@ -13,7 +13,6 @@
         "axios": "^0.19.2",
         "bunyan": "^1.8.14",
         "challonge": "^2.2.0",
-        "coffeescript": "^2.5.1",
         "deepmerge": "^4.2.2",
         "formidable": "^2.0.1",
         "geoip-country-lite": "^1.0.0",
@@ -38,6 +37,7 @@
         "@types/bunyan": "^1.8.8",
         "@types/node": "^17.0.19",
         "@types/underscore": "^1.11.4",
+        "coffeescript": "^2.6.1",
         "typescript": "^4.5.5"
       }
     },
@@ -596,9 +596,10 @@
       }
     },
     "node_modules/coffeescript": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.5.1.tgz",
-      "integrity": "sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz",
+      "integrity": "sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg==",
+      "dev": true,
       "bin": {
         "cake": "bin/cake",
         "coffee": "bin/coffee"
@@ -3501,9 +3502,10 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "coffeescript": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.5.1.tgz",
-      "integrity": "sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz",
+      "integrity": "sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg==",
+      "dev": true
     },
     "color-convert": {
       "version": "1.9.3",

package.json

@@ -15,7 +15,6 @@
     "axios": "^0.19.2",
     "bunyan": "^1.8.14",
     "challonge": "^2.2.0",
-    "coffeescript": "^2.5.1",
     "deepmerge": "^4.2.2",
     "formidable": "^2.0.1",
     "geoip-country-lite": "^1.0.0",
@@ -39,7 +38,7 @@
   "license": "AGPL-3.0",
   "scripts": {
     "build": "coffee -c *.coffee && tsc",
-    "start": "node ygopro-server.js",
+    "start": "node ygopro-server.js | bunyan",
     "tournament": "node ygopro-tournament.js",
     "pre": "node ygopro-pre.js",
     "updated": "node ygopro-update.js",
@@ -49,6 +48,7 @@
     "@types/bunyan": "^1.8.8",
     "@types/node": "^17.0.19",
     "@types/underscore": "^1.11.4",
+    "coffeescript": "^2.6.1",
     "typescript": "^4.5.5"
   }
 }