diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml index e89b6ae..603ef1a 100644 --- a/.github/workflows/branch-deploy.yml +++ b/.github/workflows/branch-deploy.yml @@ -21,7 +21,7 @@ jobs: steps: - name: branch-deploy id: branch-deploy - uses: github/branch-deploy@v8.2.0 + uses: github/branch-deploy@v8.2.1 with: admins: the-hideout/core-contributors admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ab3f79..b594fe4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # validate JSON and YAML files - name: json-yaml-validate - uses: GrantBirki/json-yaml-validate@v2.5.0 + uses: GrantBirki/json-yaml-validate@v2.6.0 with: comment: "true" exclude_file: ".github/config/exclude.txt" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 85baadc..ac7f7b1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: steps: - name: deployment check - uses: github/branch-deploy@v8.2.0 + uses: github/branch-deploy@v8.2.1 id: deployment-check with: merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy @@ -51,7 +51,7 @@ jobs: RAILWAY_TOKEN: ${{ secrets.RAILWAY_TOKEN }} - name: create sentry release - uses: getsentry/action-release@c1b57ce473178fd036cf1133b163b6324c0064a8 # pin@v1.6.0 + uses: getsentry/action-release@e769183448303de84c5a06aaaddf9da7be26d6c7 # pin@v1.7.0 env: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_ORG: tarkov-dev diff --git a/.github/workflows/unlock-on-merge.yml b/.github/workflows/unlock-on-merge.yml index 2050ec6..a4902c9 100644 --- a/.github/workflows/unlock-on-merge.yml +++ b/.github/workflows/unlock-on-merge.yml @@ -14,7 +14,7 @@ jobs: steps: - name: unlock on merge - uses: github/branch-deploy@v8.2.0 + uses: github/branch-deploy@v8.2.1 id: unlock-on-merge with: unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow diff --git a/package-lock.json b/package-lock.json index 2cb031e..b7d5735 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,24 +10,24 @@ "license": "GNU General Public License v3.0", "dependencies": { "@discordjs/rest": "^2.2.0", - "@sentry/node": "^7.81.1", - "@sentry/tracing": "^7.81.1", + "@sentry/node": "^7.99.0", + "@sentry/tracing": "^7.99.0", "ascii-table": "^0.0.9", "cheerio": "^1.0.0-rc.12", "cron": "^2.4.0", "cross-env": "^7.0.3", "discord-api-types": "^0.37.67", "discord.js": "^14.14.1", - "dotenv": "^16.3.1", + "dotenv": "^16.4.1", "got": "^13.0.0", - "i18next": "^23.7.6", - "moment": "^2.29.4", - "nodemon": "^3.0.1", + "i18next": "^23.8.2", + "moment": "^2.30.1", + "nodemon": "^3.0.3", "turndown": "^7.1.2", - "uuid": "^9.0.0" + "uuid": "^9.0.1" }, "devDependencies": { - "@railway/cli": "^3.4.0" + "@railway/cli": "^3.5.2" }, "engines": { "node": "18.*" @@ -161,9 +161,9 @@ "dev": true }, "node_modules/@railway/cli": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/@railway/cli/-/cli-3.4.0.tgz", - "integrity": "sha512-pNNzJaiKvfm1TqhXLNGTahoX1CGa6DnmoFiUZHMi+L8M24PyRHgeQrLpnTMPw262xopgnJ6/7zsNhgxg18raig==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/@railway/cli/-/cli-3.5.2.tgz", + "integrity": "sha512-N1F1RMP8RaiNBS0qBfbc1wBROyz4jD9LRyQRHEZTz4Xlg4Rj7O3yyMi36oROfVxk50MGEDKK8Bx/GR3qBUWE1A==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -210,70 +210,69 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.81.1.tgz", - "integrity": "sha512-E5xm27xrLXL10knH2EWDQsQYh5nb4SxxZzJ3sJwDGG9XGKzBdlp20UUhKqx00wixooVX9uCj3e4Jg8SvNB1hKg==", + "version": "7.99.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.99.0.tgz", + "integrity": "sha512-z3JQhHjoM1KdM20qrHwRClKJrNLr2CcKtCluq7xevLtXHJWNAQQbafnWD+Aoj85EWXBzKt9yJMv2ltcXJ+at+w==", "dependencies": { - "@sentry/core": "7.81.1", - "@sentry/types": "7.81.1", - "@sentry/utils": "7.81.1" + "@sentry/core": "7.99.0", + "@sentry/types": "7.99.0", + "@sentry/utils": "7.99.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.81.1.tgz", - "integrity": "sha512-tU37yAmckOGCw/moWKSwekSCWWJP15O6luIq+u7wal22hE88F3Vc5Avo8SeF3upnPR+4ejaOFH+BJTr6bgrs6Q==", + "version": "7.99.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz", + "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==", "dependencies": { - "@sentry/types": "7.81.1", - "@sentry/utils": "7.81.1" + "@sentry/types": "7.99.0", + "@sentry/utils": "7.99.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.81.1.tgz", - "integrity": "sha512-bKS3Mb95bar8AUEZSLKQ/RTSfFXo5sCSPNiBr5dDFuVljDFdkLq6NE3svG5bisrbENqfi0bqWsB4GZ7NHRTPbA==", + "version": "7.99.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.99.0.tgz", + "integrity": "sha512-34wYtLddnPcQ8qvKq62AfxowaMFw+GMUZGv7fIs9FxeBqqqn6Ckl0gFCTADudIIBQ3rSbmN7sHJIXdyiQv+pcw==", "dependencies": { - "@sentry-internal/tracing": "7.81.1", - "@sentry/core": "7.81.1", - "@sentry/types": "7.81.1", - "@sentry/utils": "7.81.1", - "https-proxy-agent": "^5.0.0" + "@sentry-internal/tracing": "7.99.0", + "@sentry/core": "7.99.0", + "@sentry/types": "7.99.0", + "@sentry/utils": "7.99.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/tracing": { - "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.81.1.tgz", - "integrity": "sha512-of9WMu0XgEBl9onTEk8SMaxj4BUadaUvHH96T1OpRMjdyuCM/3u2mjCkh3ekINr3Fu/uT2kJ/kO3goUxfcdXIQ==", + "version": "7.99.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.99.0.tgz", + "integrity": "sha512-Cf622gSeamiSsi0JEj3PTXnq019OymaCrGf91x1d6OPyJ5jAXdlNuhw7NkqCEw8euIhhULuS81l5nGfBrgjj9Q==", "dependencies": { - "@sentry-internal/tracing": "7.81.1" + "@sentry-internal/tracing": "7.99.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.81.1.tgz", - "integrity": "sha512-dvJvGyctiaPMIQqa46k56Re5IODWMDxiHJ1UjBs/WYDLrmWFPGrEbyJ8w8CYLhYA+7qqrCyIZmHbWSTRIxstHw==", + "version": "7.99.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz", + "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.81.1.tgz", - "integrity": "sha512-gq+MDXIirHKxNZ+c9/lVvCXd6y2zaZANujwlFggRH2u9SRiPaIXVilLpvMm4uJqmqBMEcY81ArujExtHvkbCqg==", + "version": "7.99.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz", + "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==", "dependencies": { - "@sentry/types": "7.81.1" + "@sentry/types": "7.99.0" }, "engines": { "node": ">=8" @@ -336,17 +335,6 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -724,9 +712,9 @@ } }, "node_modules/dotenv": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", - "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "version": "16.4.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz", + "integrity": "sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==", "engines": { "node": ">=12" }, @@ -930,22 +918,10 @@ "node": ">=10.19.0" } }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/i18next": { - "version": "23.7.6", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.7.6.tgz", - "integrity": "sha512-O66BhXBw0fH4bEJMA0/klQKPEbcwAp5wjXEL803pdAynNbg2f4qhLIYlNHJyE7icrL6XmSZKPYaaXwy11kJ6YQ==", + "version": "23.8.2", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.8.2.tgz", + "integrity": "sha512-Z84zyEangrlERm0ZugVy4bIt485e/H8VecGUZkZWrH7BDePG6jT73QdL9EA1tRTTVVMpry/MgWIP1FjEn0DRXA==", "funding": [ { "type": "individual", @@ -1139,9 +1115,9 @@ } }, "node_modules/moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "engines": { "node": "*" } @@ -1189,12 +1165,12 @@ } }, "node_modules/nodemon": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.1.tgz", - "integrity": "sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.3.tgz", + "integrity": "sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==", "dependencies": { "chokidar": "^3.5.2", - "debug": "^3.2.7", + "debug": "^4", "ignore-by-default": "^1.0.1", "minimatch": "^3.1.2", "pstree.remy": "^1.1.8", @@ -1215,14 +1191,6 @@ "url": "https://opencollective.com/nodemon" } }, - "node_modules/nodemon/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dependencies": { - "ms": "^2.1.1" - } - }, "node_modules/nopt": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", @@ -1502,9 +1470,13 @@ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "node_modules/uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "bin": { "uuid": "dist/bin/uuid" } diff --git a/package.json b/package.json index e9d5c4a..84ac43e 100644 --- a/package.json +++ b/package.json @@ -17,28 +17,28 @@ "start": "node index.mjs", "dev": "cross-env NODE_ENV=development NEW_RELIC_ENABLED=false nodemon --ignore cache/ -r dotenv/config index.mjs", "dev-commands": "cross-env NODE_ENV=ci node deploy-commands-dev.mjs", - "deploy": "railway up" + "deploy": "railway up --service stash" }, "type": "module", "dependencies": { "@discordjs/rest": "^2.2.0", - "@sentry/node": "^7.81.1", - "@sentry/tracing": "^7.81.1", + "@sentry/node": "^7.99.0", + "@sentry/tracing": "^7.99.0", "ascii-table": "^0.0.9", "cheerio": "^1.0.0-rc.12", "cron": "^2.4.0", "cross-env": "^7.0.3", "discord-api-types": "^0.37.67", "discord.js": "^14.14.1", - "dotenv": "^16.3.1", + "dotenv": "^16.4.1", "got": "^13.0.0", - "i18next": "^23.7.6", - "moment": "^2.29.4", - "nodemon": "^3.0.1", + "i18next": "^23.8.2", + "moment": "^2.30.1", + "nodemon": "^3.0.3", "turndown": "^7.1.2", - "uuid": "^9.0.0" + "uuid": "^9.0.1" }, "devDependencies": { - "@railway/cli": "^3.4.0" + "@railway/cli": "^3.5.2" } }