Skip to content

S
srvpro
Commit 103429ba authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents 155224ee 2779e40b
Pipeline #10040 passed with stages
          in 62 minutes and 25 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 14 additions and 11 deletions
          data/pm2-docker.json
          View file @ 103429ba
          ...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
          "apps": [ "apps": [
          { {
          "name": "ygopro-server", "name": "ygopro-server",
          "script": "/ygopro-server/ygopro-server.js", "script": "npm",
          "cwd": "/ygopro-server" "cwd": "/ygopro-server",
          "args": "start"
          }, },
          { {
          "name": "windbot", "name": "windbot",
          ......
          package-lock.json
          View file @ 103429ba
          ...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
          "axios": "^0.19.2", "axios": "^0.19.2",
          "bunyan": "^1.8.14", "bunyan": "^1.8.14",
          "challonge": "^2.2.0", "challonge": "^2.2.0",
          "coffeescript": "^2.5.1",
          "deepmerge": "^4.2.2", "deepmerge": "^4.2.2",
          "formidable": "^2.0.1", "formidable": "^2.0.1",
          "geoip-country-lite": "^1.0.0", "geoip-country-lite": "^1.0.0",
          ...@@ -38,6 +37,7 @@ ...@@ -38,6 +37,7 @@
          "@types/bunyan": "^1.8.8", "@types/bunyan": "^1.8.8",
          "@types/node": "^17.0.19", "@types/node": "^17.0.19",
          "@types/underscore": "^1.11.4", "@types/underscore": "^1.11.4",
          "coffeescript": "^2.6.1",
          "typescript": "^4.5.5" "typescript": "^4.5.5"
          } }
          }, },
          ...@@ -596,9 +596,10 @@ ...@@ -596,9 +596,10 @@
          } }
          }, },
          "node_modules/coffeescript": { "node_modules/coffeescript": {
          "version": "2.5.1", "version": "2.6.1",
          "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.5.1.tgz", "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz",
          "integrity": "sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ==", "integrity": "sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg==",
          "dev": true,
          "bin": { "bin": {
          "cake": "bin/cake", "cake": "bin/cake",
          "coffee": "bin/coffee" "coffee": "bin/coffee"
          ...@@ -3501,9 +3502,10 @@ ...@@ -3501,9 +3502,10 @@
          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
          }, },
          "coffeescript": { "coffeescript": {
          "version": "2.5.1", "version": "2.6.1",
          "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.5.1.tgz", "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz",
          "integrity": "sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ==" "integrity": "sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg==",
          "dev": true
          }, },
          "color-convert": { "color-convert": {
          "version": "1.9.3", "version": "1.9.3",
          ......
          package.json
          View file @ 103429ba
          ...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
          "axios": "^0.19.2", "axios": "^0.19.2",
          "bunyan": "^1.8.14", "bunyan": "^1.8.14",
          "challonge": "^2.2.0", "challonge": "^2.2.0",
          "coffeescript": "^2.5.1",
          "deepmerge": "^4.2.2", "deepmerge": "^4.2.2",
          "formidable": "^2.0.1", "formidable": "^2.0.1",
          "geoip-country-lite": "^1.0.0", "geoip-country-lite": "^1.0.0",
          ...@@ -39,7 +38,7 @@ ...@@ -39,7 +38,7 @@
          "license": "AGPL-3.0", "license": "AGPL-3.0",
          "scripts": { "scripts": {
          "build": "coffee -c *.coffee && tsc", "build": "coffee -c *.coffee && tsc",
          "start": "node ygopro-server.js", "start": "node ygopro-server.js | bunyan",
          "tournament": "node ygopro-tournament.js", "tournament": "node ygopro-tournament.js",
          "pre": "node ygopro-pre.js", "pre": "node ygopro-pre.js",
          "updated": "node ygopro-update.js", "updated": "node ygopro-update.js",
          ...@@ -49,6 +48,7 @@ ...@@ -49,6 +48,7 @@
          "@types/bunyan": "^1.8.8", "@types/bunyan": "^1.8.8",
          "@types/node": "^17.0.19", "@types/node": "^17.0.19",
          "@types/underscore": "^1.11.4", "@types/underscore": "^1.11.4",
          "coffeescript": "^2.6.1",
          "typescript": "^4.5.5" "typescript": "^4.5.5"
          } }
          } }
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment