From 53be630039b67e864ea8e4e8f23f94fcbf2f8867 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:48:11 +0000 Subject: [PATCH 1/2] chore(deps): update all non-major dependencies --- .github/workflows/approve.yml | 2 +- .github/workflows/cd-for-main.yml | 2 +- .github/workflows/cd-for-pr.yml | 2 +- .github/workflows/cd-for-tag.yml | 2 +- .github/workflows/ci.yml | 8 +- .github/workflows/enable-auto-merge.yml | 2 +- .github/workflows/image-build-and-publish.yml | 2 +- .tool-versions | 4 +- .../cloudflare/envs/main/.terraform.lock.hcl | 58 +++--- .../cloudflare/envs/main/versions.tf | 2 +- .../modules/app/modules/workers/versions.tf | 2 +- .../cloudflare/modules/app/versions.tf | 2 +- package.json | 8 +- pnpm-lock.yaml | 167 +++++++++--------- 14 files changed, 132 insertions(+), 131 deletions(-) diff --git a/.github/workflows/approve.yml b/.github/workflows/approve.yml index 6408be96..29551d2b 100644 --- a/.github/workflows/approve.yml +++ b/.github/workflows/approve.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Generate github token id: generate_token uses: actions/create-github-app-token@v1.11.0 diff --git a/.github/workflows/cd-for-main.yml b/.github/workflows/cd-for-main.yml index d384656b..2426fd33 100644 --- a/.github/workflows/cd-for-main.yml +++ b/.github/workflows/cd-for-main.yml @@ -13,7 +13,7 @@ jobs: - ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Setup asdf uses: asdf-vm/actions/setup@v3.0.2 continue-on-error: true diff --git a/.github/workflows/cd-for-pr.yml b/.github/workflows/cd-for-pr.yml index 4e10035b..623f29c1 100644 --- a/.github/workflows/cd-for-pr.yml +++ b/.github/workflows/cd-for-pr.yml @@ -21,7 +21,7 @@ jobs: - ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Setup asdf uses: asdf-vm/actions/setup@v3.0.2 continue-on-error: true diff --git a/.github/workflows/cd-for-tag.yml b/.github/workflows/cd-for-tag.yml index 119839cc..a31c0ce5 100644 --- a/.github/workflows/cd-for-tag.yml +++ b/.github/workflows/cd-for-tag.yml @@ -19,7 +19,7 @@ jobs: LATEST_TAG: ${{ steps.genelate_latest_tag.outputs.LATEST_TAG }} steps: - name: Check out the repo - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Get current version id: get_version run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43e6ea87..14255b9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Setup asdf uses: asdf-vm/actions/setup@v3.0.2 continue-on-error: true @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Setup asdf uses: asdf-vm/actions/setup@v3.0.2 continue-on-error: true @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Setup asdf uses: asdf-vm/actions/setup@v3.0.2 continue-on-error: true @@ -75,7 +75,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Setup asdf uses: asdf-vm/actions/setup@v3.0.2 continue-on-error: true diff --git a/.github/workflows/enable-auto-merge.yml b/.github/workflows/enable-auto-merge.yml index 06af18b7..491635fa 100644 --- a/.github/workflows/enable-auto-merge.yml +++ b/.github/workflows/enable-auto-merge.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Generate github token id: generate_token uses: actions/create-github-app-token@v1.11.0 diff --git a/.github/workflows/image-build-and-publish.yml b/.github/workflows/image-build-and-publish.yml index fa458516..bcb1fda0 100644 --- a/.github/workflows/image-build-and-publish.yml +++ b/.github/workflows/image-build-and-publish.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Prepare for build id: prepare-for-build run: | diff --git a/.tool-versions b/.tool-versions index 2bf0abe2..93c87e12 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,5 +1,5 @@ nodejs 20.17.0 -pnpm 9.11.0 +pnpm 9.12.0 python 3.11.6 kubectl 1.31.1 -argocd 2.12.3 +argocd 2.12.4 diff --git a/infra/terraform/cloudflare/envs/main/.terraform.lock.hcl b/infra/terraform/cloudflare/envs/main/.terraform.lock.hcl index bf9ec8ac..37841de9 100644 --- a/infra/terraform/cloudflare/envs/main/.terraform.lock.hcl +++ b/infra/terraform/cloudflare/envs/main/.terraform.lock.hcl @@ -2,37 +2,37 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.42.0" + version = "4.43.0" constraints = "~> 4.0" hashes = [ - "h1:+1iz3OcEEYBLeVS07cqRP5Kef0Y0XS8YEj/I1HH9J/A=", - "h1:/XZtSyok+I0hAHqj4hcA2RP4G9uvTABG4oMGC3vlS6o=", - "h1:5Z9Kfc5ufjqbLBXP9lZqQ11PAc4m6aTf/0M6miceOVQ=", - "h1:6cupVsiQundwTt+/lSuiR3s1s1H0JDN1H7USaF/+nDg=", - "h1:FasXNkaO7MNWy6GtuB/QFlnpQ7UuQQNotN1asY/r0Z8=", - "h1:G+5pvEHQlVkPXW6HK1twiWHOV/pavtSpQthZ0wb0HYM=", - "h1:HYhFNiRR1InZGjelCdQmg/KJHL2lFDlaWGSl2KA2fwk=", - "h1:LkMNEQUnYBAx8EFvl1BU/AVG1cs1Xi62kCvTVvYvDZ8=", - "h1:McPTXlnBSEzFGmVJHU7KyoBI3hJRh/eRcFTcijAfO/I=", - "h1:MoqiPtyXewRdNsevZUMqb0rXXpeLUVxNVEzux4AC7y4=", - "h1:RUgEZET04NprAFc4XAJwqqLiwNKaCTQEQEXtIZtNu1E=", - "h1:UCneKnBS53RlyJsdCqCCWrw19GE48tzTyO2u/V5u24c=", - "h1:aGbtjN8I2mLyW7aJ8KVRYuVdYeQCh3Ee8c3ixiijmjM=", - "h1:phTeKoT4aUmPXQO6d7ZbSQ8Cu41dhosACCEiDpRsL/I=", - "zh:1abb93dda2bf73b1656dc63673c752642bfa4c31c8ca1e83cdd278f42fa121c1", - "zh:2b9c90fe4fffaadfeccd0f457bd1354ba2dba920c5525748d8f8f24656d6c7bd", - "zh:710a0cf84406df09705115a62bd6a418188a3b884f615fe7122a6fc51ec59bc0", - "zh:7875b38b281d17a24d89116b33f92b8b24292be160a2c618874a0f674171bd34", + "h1:2kDVLD36BOVgBzI9p0WIQ+xjFfMmjaItA0l8SyZWEPo=", + "h1:2sGJDAwFEgO8+3y+2suYO+yrjNOzSsihad0hbM3+jPg=", + "h1:A1WPQFcdD+7FrFBFrKcx4CiSr75xSmsO93C0e5NBAeQ=", + "h1:BuXs/1ohmF4fWyOErY6vNbm7DaEIfbLSepSiZ2ol9I8=", + "h1:QPh+X19oyo808sqdeJaVqahZcQgcG1jCi3DA5zpjz6U=", + "h1:RI7c7dhSJoIkfou5b8ITRpM5MqsQD3FULj1h/rI4rJk=", + "h1:gdI5JTCPjewdGq1bhGAs+V5qCcmJ73N2gtMfuFybJp4=", + "h1:h4lnJpCIYZ7dsN9IO2mmwNdWNiQYEPoAEUjLF2sZ5kc=", + "h1:jTaExrX/eR7vGT5wayGqH8ZtXS2zyk0WmD3zbAKFIQU=", + "h1:l5NKJUOQJ1mHl1eekeXaxUZ+g+8Yv4aGcIN9vuK6GL4=", + "h1:sNbvm66/2vc8B/khyioOO8eNaU8nb89x693AN7fQheU=", + "h1:tXS4g1yE420AU4mvZ7RrYI+yYTutkRID3l+W0gBH4BM=", + "h1:vA+kES7uqmKA9K0U45IXR94jaTQZCHZLCHqMUeGxKMI=", + "h1:zV131k79+ob9p4jrLDgztDNvZvt8fvrrzpn0nPikBw8=", + "zh:006d111d6eafe6eeb5df2f91bd0ca320f979bd71f8cd8c475f10b2bd94acba55", + "zh:031fbb5cac23a841dc18e270cbfcd3ce9f4ba504edbd3c78931f7ed9827220a8", + "zh:07a72fe8b55afee99529bf4169ab6abfac5eabcd10968c29101925bcd358b09f", + "zh:0d14727d011c2d9df4c3058f527d2409223449ab48b46cbc86922eb553ef77c1", + "zh:155ce1333672d26cd18a5866b0761489d91682beffee58e45c3a1b68e8491d3d", + "zh:35a2a1939a965335b29ebdbfd759d93a97c0f589d9cd218f537dee6f600e3fb9", + "zh:52912fe421e7d911431f77788db2ea13836efd65a2e82385adb52c6a84d4ee90", + "zh:57374318d9194ea1db08884b0541a9055823d5970ad48f9a57547ac231163007", + "zh:5fb942b9e2553c058fe09fe12fb39dd175cd6715bb41c059c1a70df2bfc64dc1", + "zh:63cabd2bda201b09b35a3279d1f813ab71394b9b90fc5cf8962a5eba207803bc", "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:ad28c94908c336ca97feabb02734a2c115eddaa5f4a625f00bfafb3ac65646e4", - "zh:aee7861d44cf1a71a4846e1ffda20992259838ee600ca79d3abc80b43f4ff0f0", - "zh:b1327e8ea04f0df5efc2b8848c358bf0d256716ad5372f91f5960296a1f68677", - "zh:b9ec2310feffef38c1488bed038ad7942c54f930f2166a600b5fc850e377bddf", - "zh:d04178727d7157aae8eb66b4f7318338c89cd685b53c67f5ce41de4160c2d484", - "zh:d76c4bb5a5bfed710fcc8a1d919172cbfcbda0cec177f1d2cb44aff82a862a32", - "zh:ddf3c126b5c98267240f960f8fed381115675793e5b86dd2cbdebeb628efb0cb", - "zh:e3efb3b9409626f15931a81edaeb96e4baf462a24b32dac9d97cc36d1fef1f01", - "zh:e925c963cddf5778829f0b26f72ad8bcbc1aed3510cfa0bd5a9e7cbf4c64a6e8", - "zh:ff78a903b2432fbff7b04e84a23c71425589bad7a4b846e08bc131268b80900f", + "zh:978ee67d3d53970a5c474ab40b00adee97f4153b16804a2b6b7ee205ae69d18a", + "zh:bbafdbef631b5c80570087817b42b16b1a76d556d692853a71c47fb48663cf00", + "zh:be91b3f2a697cbbb41f65aad2600972d0ede1e962a7d8a00bb3177cb77d86666", + "zh:efe168ad4aaa6156ce5a31d4e50e9d54d38ee5a5888412f9e690c0de5d619683", ] } diff --git a/infra/terraform/cloudflare/envs/main/versions.tf b/infra/terraform/cloudflare/envs/main/versions.tf index 8ce375a8..2146cb80 100644 --- a/infra/terraform/cloudflare/envs/main/versions.tf +++ b/infra/terraform/cloudflare/envs/main/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "1.9.6" + required_version = "1.9.7" required_providers { cloudflare = { diff --git a/infra/terraform/cloudflare/modules/app/modules/workers/versions.tf b/infra/terraform/cloudflare/modules/app/modules/workers/versions.tf index 8ce375a8..2146cb80 100644 --- a/infra/terraform/cloudflare/modules/app/modules/workers/versions.tf +++ b/infra/terraform/cloudflare/modules/app/modules/workers/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "1.9.6" + required_version = "1.9.7" required_providers { cloudflare = { diff --git a/infra/terraform/cloudflare/modules/app/versions.tf b/infra/terraform/cloudflare/modules/app/versions.tf index 8ce375a8..2146cb80 100644 --- a/infra/terraform/cloudflare/modules/app/versions.tf +++ b/infra/terraform/cloudflare/modules/app/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = "1.9.6" + required_version = "1.9.7" required_providers { cloudflare = { diff --git a/package.json b/package.json index 14a8ecd6..28de8905 100644 --- a/package.json +++ b/package.json @@ -25,23 +25,23 @@ "@tsconfig/strictest": "2.0.5", "@types/lodash-es": "4.17.12", "@types/node": "20.16.10", - "@vitest/coverage-v8": "2.1.1", + "@vitest/coverage-v8": "2.1.2", "eslint": "9.11.1", "eslint-config-prettier": "9.1.0", "eslint-import-resolver-typescript": "3.6.3", - "eslint-plugin-import": "2.30.0", + "eslint-plugin-import": "2.31.0", "prettier": "3.3.3", "tsx": "4.19.1", "typescript": "5.6.2", "typescript-eslint": "8.8.0", - "vitest": "2.1.1" + "vitest": "2.1.2" }, "dependencies": { "@discordjs/opus": "0.9.0", "@discordjs/voice": "0.17.0", "@t3-oss/env-core": "0.11.1", "chalk": "5.3.0", - "discord.js": "14.16.2", + "discord.js": "14.16.3", "dotenv": "16.4.5", "libsodium-wrappers": "0.7.15", "lodash-es": "4.17.21", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ea1f818..dfbee007 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: 5.3.0 version: 5.3.0 discord.js: - specifier: 14.16.2 - version: 14.16.2 + specifier: 14.16.3 + version: 14.16.3 dotenv: specifier: 16.4.5 version: 16.4.5 @@ -64,8 +64,8 @@ importers: specifier: 20.16.10 version: 20.16.10 '@vitest/coverage-v8': - specifier: 2.1.1 - version: 2.1.1(vitest@2.1.1(@types/node@20.16.10)) + specifier: 2.1.2 + version: 2.1.2(vitest@2.1.2(@types/node@20.16.10)) eslint: specifier: 9.11.1 version: 9.11.1 @@ -74,10 +74,10 @@ importers: version: 9.1.0(eslint@9.11.1) eslint-import-resolver-typescript: specifier: 3.6.3 - version: 3.6.3(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@9.11.1) + version: 3.6.3(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-plugin-import@2.31.0)(eslint@9.11.1) eslint-plugin-import: - specifier: 2.30.0 - version: 2.30.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1) + specifier: 2.31.0 + version: 2.31.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1) prettier: specifier: 3.3.3 version: 3.3.3 @@ -91,8 +91,8 @@ importers: specifier: 8.8.0 version: 8.8.0(eslint@9.11.1)(typescript@5.6.2) vitest: - specifier: 2.1.1 - version: 2.1.1(@types/node@20.16.10) + specifier: 2.1.2 + version: 2.1.2(@types/node@20.16.10) packages: @@ -504,9 +504,6 @@ packages: resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} engines: {node: '>=6.0.0'} - '@jridgewell/sourcemap-codec@1.4.15': - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - '@jridgewell/sourcemap-codec@1.5.0': resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} @@ -834,22 +831,22 @@ packages: resolution: {integrity: sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@vitest/coverage-v8@2.1.1': - resolution: {integrity: sha512-md/A7A3c42oTT8JUHSqjP5uKTWJejzUW4jalpvs+rZ27gsURsMU8DEb+8Jf8C6Kj2gwfSHJqobDNBuoqlm0cFw==} + '@vitest/coverage-v8@2.1.2': + resolution: {integrity: sha512-b7kHrFrs2urS0cOk5N10lttI8UdJ/yP3nB4JYTREvR5o18cR99yPpK4gK8oQgI42BVv0ILWYUSYB7AXkAUDc0g==} peerDependencies: - '@vitest/browser': 2.1.1 - vitest: 2.1.1 + '@vitest/browser': 2.1.2 + vitest: 2.1.2 peerDependenciesMeta: '@vitest/browser': optional: true - '@vitest/expect@2.1.1': - resolution: {integrity: sha512-YeueunS0HiHiQxk+KEOnq/QMzlUuOzbU1Go+PgAsHvvv3tUkJPm9xWt+6ITNTlzsMXUjmgm5T+U7KBPK2qQV6w==} + '@vitest/expect@2.1.2': + resolution: {integrity: sha512-FEgtlN8mIUSEAAnlvn7mP8vzaWhEaAEvhSXCqrsijM7K6QqjB11qoRZYEd4AKSCDz8p0/+yH5LzhZ47qt+EyPg==} - '@vitest/mocker@2.1.1': - resolution: {integrity: sha512-LNN5VwOEdJqCmJ/2XJBywB11DLlkbY0ooDJW3uRX5cZyYCrc4PI/ePX0iQhE3BiEGiQmK4GE7Q/PqCkkaiPnrA==} + '@vitest/mocker@2.1.2': + resolution: {integrity: sha512-ExElkCGMS13JAJy+812fw1aCv2QO/LBK6CyO4WOPAzLTmve50gydOlWhgdBJPx2ztbADUq3JVI0C5U+bShaeEA==} peerDependencies: - '@vitest/spy': 2.1.1 + '@vitest/spy': 2.1.2 msw: ^2.3.5 vite: ^5.0.0 peerDependenciesMeta: @@ -858,20 +855,20 @@ packages: vite: optional: true - '@vitest/pretty-format@2.1.1': - resolution: {integrity: sha512-SjxPFOtuINDUW8/UkElJYQSFtnWX7tMksSGW0vfjxMneFqxVr8YJ979QpMbDW7g+BIiq88RAGDjf7en6rvLPPQ==} + '@vitest/pretty-format@2.1.2': + resolution: {integrity: sha512-FIoglbHrSUlOJPDGIrh2bjX1sNars5HbxlcsFKCtKzu4+5lpsRhOCVcuzp0fEhAGHkPZRIXVNzPcpSlkoZ3LuA==} - '@vitest/runner@2.1.1': - resolution: {integrity: sha512-uTPuY6PWOYitIkLPidaY5L3t0JJITdGTSwBtwMjKzo5O6RCOEncz9PUN+0pDidX8kTHYjO0EwUIvhlGpnGpxmA==} + '@vitest/runner@2.1.2': + resolution: {integrity: sha512-UCsPtvluHO3u7jdoONGjOSil+uON5SSvU9buQh3lP7GgUXHp78guN1wRmZDX4wGK6J10f9NUtP6pO+SFquoMlw==} - '@vitest/snapshot@2.1.1': - resolution: {integrity: sha512-BnSku1WFy7r4mm96ha2FzN99AZJgpZOWrAhtQfoxjUU5YMRpq1zmHRq7a5K9/NjqonebO7iVDla+VvZS8BOWMw==} + '@vitest/snapshot@2.1.2': + resolution: {integrity: sha512-xtAeNsZ++aRIYIUsek7VHzry/9AcxeULlegBvsdLncLmNCR6tR8SRjn8BbDP4naxtccvzTqZ+L1ltZlRCfBZFA==} - '@vitest/spy@2.1.1': - resolution: {integrity: sha512-ZM39BnZ9t/xZ/nF4UwRH5il0Sw93QnZXd9NAZGRpIgj0yvVwPpLd702s/Cx955rGaMlyBQkZJ2Ir7qyY48VZ+g==} + '@vitest/spy@2.1.2': + resolution: {integrity: sha512-GSUi5zoy+abNRJwmFhBDC0yRuVUn8WMlQscvnbbXdKLXX9dE59YbfwXxuJ/mth6eeqIzofU8BB5XDo/Ns/qK2A==} - '@vitest/utils@2.1.1': - resolution: {integrity: sha512-Y6Q9TsI+qJ2CC0ZKj6VBb+T8UPz593N113nnUykqwANqhgf3QkZeHFlusgKLTqrnVHbj/XDKZcDHol+dxVT+rQ==} + '@vitest/utils@2.1.2': + resolution: {integrity: sha512-zMO2KdYy6mx56btx9JvAqAZ6EyS3g49krMPPrgOp1yxGZiA93HumGk+bZ5jIZtOg5/VBYl5eBmGRQHqq4FG6uQ==} '@vladfrangu/async_event_emitter@2.4.6': resolution: {integrity: sha512-RaI5qZo6D2CVS6sTHFKg1v5Ohq/+Bo2LZ5gzUEwZ/WkHhwtGTCB/sVLw8ijOkAUxasZ+WshN/Rzj4ywsABJ5ZA==} @@ -1127,14 +1124,17 @@ packages: resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==} engines: {node: '>=8'} + discord-api-types@0.37.100: + resolution: {integrity: sha512-a8zvUI0GYYwDtScfRd/TtaNBDTXwP5DiDVX7K5OmE+DRT57gBqKnwtOC5Ol8z0mRW8KQfETIgiB8U0YZ9NXiCA==} + discord-api-types@0.37.83: resolution: {integrity: sha512-urGGYeWtWNYMKnYlZnOnDHm8fVRffQs3U0SpE8RHeiuLKb/u92APS8HoQnPTFbnXmY1vVnXjXO4dOxcAn3J+DA==} discord-api-types@0.37.97: resolution: {integrity: sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA==} - discord.js@14.16.2: - resolution: {integrity: sha512-VGNi9WE2dZIxYM8/r/iatQQ+3LT8STW4hhczJOwm+DBeHq66vsKDCk8trChNCB01sMO9crslYuEMeZl2d7r3xw==} + discord.js@14.16.3: + resolution: {integrity: sha512-EPCWE9OkA9DnFFNrO7Kl1WHHDYFXu3CNVFJg63bfU7hVtjZGyhShwZtSBImINQRWxWP2tgo2XI+QhdXx28r0aA==} engines: {node: '>=18'} doctrine@2.1.0: @@ -1228,8 +1228,8 @@ packages: eslint-plugin-import-x: optional: true - eslint-module-utils@2.11.0: - resolution: {integrity: sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==} + eslint-module-utils@2.12.0: + resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==} engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' @@ -1270,12 +1270,12 @@ packages: eslint-import-resolver-webpack: optional: true - eslint-plugin-import@2.30.0: - resolution: {integrity: sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==} + eslint-plugin-import@2.31.0: + resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==} engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 + eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9 peerDependenciesMeta: '@typescript-eslint/parser': optional: true @@ -2387,8 +2387,8 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - vite-node@2.1.1: - resolution: {integrity: sha512-N/mGckI1suG/5wQI35XeR9rsMsPqKXzq1CdUndzVstBj/HvyxxGctwnK6WX43NGt5L3Z5tcRf83g4TITKJhPrA==} + vite-node@2.1.2: + resolution: {integrity: sha512-HPcGNN5g/7I2OtPjLqgOtCRu/qhVvBxTUD3qzitmL0SrG1cWFzxzhMDWussxSbrRYWqnKf8P2jiNhPMSN+ymsQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -2420,15 +2420,15 @@ packages: terser: optional: true - vitest@2.1.1: - resolution: {integrity: sha512-97We7/VC0e9X5zBVkvt7SGQMGrRtn3KtySFQG5fpaMlS+l62eeXRQO633AYhSTC3z7IMebnPPNjGXVGNRFlxBA==} + vitest@2.1.2: + resolution: {integrity: sha512-veNjLizOMkRrJ6xxb+pvxN6/QAWg95mzcRjtmkepXdN87FNfxAss9RKe2far/G9cQpipfgP2taqg0KiWsquj8A==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.1.1 - '@vitest/ui': 2.1.1 + '@vitest/browser': 2.1.2 + '@vitest/ui': 2.1.2 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2825,21 +2825,19 @@ snapshots: '@jridgewell/gen-mapping@0.3.5': dependencies: '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 '@jridgewell/trace-mapping': 0.3.25 '@jridgewell/resolve-uri@3.1.2': {} '@jridgewell/set-array@1.2.1': {} - '@jridgewell/sourcemap-codec@1.4.15': {} - '@jridgewell/sourcemap-codec@1.5.0': {} '@jridgewell/trace-mapping@0.3.25': dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 '@mole-inc/bin-wrapper@8.0.1': dependencies: @@ -3129,7 +3127,7 @@ snapshots: '@typescript-eslint/types': 8.8.0 eslint-visitor-keys: 3.4.3 - '@vitest/coverage-v8@2.1.1(vitest@2.1.1(@types/node@20.16.10))': + '@vitest/coverage-v8@2.1.2(vitest@2.1.2(@types/node@20.16.10))': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -3143,47 +3141,47 @@ snapshots: std-env: 3.7.0 test-exclude: 7.0.1 tinyrainbow: 1.2.0 - vitest: 2.1.1(@types/node@20.16.10) + vitest: 2.1.2(@types/node@20.16.10) transitivePeerDependencies: - supports-color - '@vitest/expect@2.1.1': + '@vitest/expect@2.1.2': dependencies: - '@vitest/spy': 2.1.1 - '@vitest/utils': 2.1.1 + '@vitest/spy': 2.1.2 + '@vitest/utils': 2.1.2 chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.2.11(@types/node@20.16.10))': + '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(vite@5.2.11(@types/node@20.16.10))': dependencies: - '@vitest/spy': 2.1.1 + '@vitest/spy': 2.1.2 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: vite: 5.2.11(@types/node@20.16.10) - '@vitest/pretty-format@2.1.1': + '@vitest/pretty-format@2.1.2': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.1.1': + '@vitest/runner@2.1.2': dependencies: - '@vitest/utils': 2.1.1 + '@vitest/utils': 2.1.2 pathe: 1.1.2 - '@vitest/snapshot@2.1.1': + '@vitest/snapshot@2.1.2': dependencies: - '@vitest/pretty-format': 2.1.1 + '@vitest/pretty-format': 2.1.2 magic-string: 0.30.11 pathe: 1.1.2 - '@vitest/spy@2.1.1': + '@vitest/spy@2.1.2': dependencies: tinyspy: 3.0.0 - '@vitest/utils@2.1.1': + '@vitest/utils@2.1.2': dependencies: - '@vitest/pretty-format': 2.1.1 + '@vitest/pretty-format': 2.1.2 loupe: 3.1.1 tinyrainbow: 1.2.0 @@ -3449,11 +3447,13 @@ snapshots: detect-libc@2.0.3: {} + discord-api-types@0.37.100: {} + discord-api-types@0.37.83: {} discord-api-types@0.37.97: {} - discord.js@14.16.2: + discord.js@14.16.3: dependencies: '@discordjs/builders': 1.9.0 '@discordjs/collection': 1.5.3 @@ -3462,7 +3462,7 @@ snapshots: '@discordjs/util': 1.1.1 '@discordjs/ws': 1.1.1 '@sapphire/snowflake': 3.5.3 - discord-api-types: 0.37.97 + discord-api-types: 0.37.100 fast-deep-equal: 3.1.3 lodash.snakecase: 4.1.1 tslib: 2.7.0 @@ -3636,7 +3636,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@9.11.1): + eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-plugin-import@2.31.0)(eslint@9.11.1): dependencies: '@nolyfill/is-core-module': 1.0.39 debug: 4.3.5 @@ -3648,21 +3648,21 @@ snapshots: is-bun-module: 1.1.0 is-glob: 4.0.3 optionalDependencies: - eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1) transitivePeerDependencies: - '@typescript-eslint/parser' - eslint-import-resolver-node - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 8.8.0(eslint@9.11.1)(typescript@5.6.2) eslint: 9.11.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@9.11.1) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-plugin-import@2.31.0)(eslint@9.11.1) transitivePeerDependencies: - supports-color @@ -3672,11 +3672,11 @@ snapshots: optionalDependencies: '@typescript-eslint/parser': 8.8.0(eslint@9.11.1)(typescript@5.6.2) eslint: 9.11.1 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@9.11.1) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-plugin-import@2.31.0)(eslint@9.11.1) transitivePeerDependencies: - supports-color - eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1): + eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 @@ -3687,7 +3687,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.11.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -3696,6 +3696,7 @@ snapshots: object.groupby: 1.0.3 object.values: 1.2.0 semver: 6.3.1 + string.prototype.trimend: 1.0.8 tsconfig-paths: 3.15.0 optionalDependencies: '@typescript-eslint/parser': 8.8.0(eslint@9.11.1)(typescript@5.6.2) @@ -3773,7 +3774,7 @@ snapshots: estree-walker@3.0.3: dependencies: - '@types/estree': 1.0.5 + '@types/estree': 1.0.6 esutils@2.0.3: {} @@ -4828,7 +4829,7 @@ snapshots: util-deprecate@1.0.2: {} - vite-node@2.1.1(@types/node@20.16.10): + vite-node@2.1.2(@types/node@20.16.10): dependencies: cac: 6.7.14 debug: 4.3.7 @@ -4853,15 +4854,15 @@ snapshots: '@types/node': 20.16.10 fsevents: 2.3.3 - vitest@2.1.1(@types/node@20.16.10): + vitest@2.1.2(@types/node@20.16.10): dependencies: - '@vitest/expect': 2.1.1 - '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.2.11(@types/node@20.16.10)) - '@vitest/pretty-format': 2.1.1 - '@vitest/runner': 2.1.1 - '@vitest/snapshot': 2.1.1 - '@vitest/spy': 2.1.1 - '@vitest/utils': 2.1.1 + '@vitest/expect': 2.1.2 + '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(vite@5.2.11(@types/node@20.16.10)) + '@vitest/pretty-format': 2.1.2 + '@vitest/runner': 2.1.2 + '@vitest/snapshot': 2.1.2 + '@vitest/spy': 2.1.2 + '@vitest/utils': 2.1.2 chai: 5.1.1 debug: 4.3.7 magic-string: 0.30.11 @@ -4872,7 +4873,7 @@ snapshots: tinypool: 1.0.0 tinyrainbow: 1.2.0 vite: 5.2.11(@types/node@20.16.10) - vite-node: 2.1.1(@types/node@20.16.10) + vite-node: 2.1.2(@types/node@20.16.10) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 20.16.10 From d97620c1ea6a82cfde93480b40c869a04e211daa Mon Sep 17 00:00:00 2001 From: na2na-p Date: Thu, 3 Oct 2024 22:36:44 +0900 Subject: [PATCH 2/2] HACK --- .../internal/Voice/internal/Voice.class.ts | 6 ++++-- src/features/library/index.ts | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/features/core/internal/Voice/internal/Voice.class.ts b/src/features/core/internal/Voice/internal/Voice.class.ts index e818514d..dd45197e 100644 --- a/src/features/core/internal/Voice/internal/Voice.class.ts +++ b/src/features/core/internal/Voice/internal/Voice.class.ts @@ -2,6 +2,7 @@ import type { VoiceConnection, ChatInputCommandInteraction, AudioPlayer, + DiscordGatewayAdapterCreator, } from '@/features/library/index.js'; import { isNil, joinVoiceChannel } from '@/features/library/index.js'; import { LogicException } from '@/features/others/Error/LogicException.js'; @@ -73,7 +74,8 @@ export class Voice { const connectedChannel = joinVoiceChannel({ channelId: channel.id, guildId: channel.guild.id, - adapterCreator: channel.guild.voiceAdapterCreator, + // HACK: 型が嘘 + adapterCreator: channel.guild.voiceAdapterCreator as DiscordGatewayAdapterCreator, }); this.connection.push({ guildId: channel.guildId, @@ -95,7 +97,7 @@ export class Voice { const connection = joinVoiceChannel({ channelId: channel.id, guildId: channel.guild.id, - adapterCreator: channel.guild.voiceAdapterCreator, + adapterCreator: channel.guild.voiceAdapterCreator as DiscordGatewayAdapterCreator, }); this.connection.push({ diff --git a/src/features/library/index.ts b/src/features/library/index.ts index 3fbe14cb..1e5c5df5 100644 --- a/src/features/library/index.ts +++ b/src/features/library/index.ts @@ -1,14 +1,15 @@ export { - StreamType, - entersState, - AudioPlayerStatus, - AudioPlayer, - joinVoiceChannel, - getVoiceConnection, - createAudioPlayer, - createAudioResource, - VoiceConnection, + StreamType, + entersState, + AudioPlayerStatus, + AudioPlayer, + joinVoiceChannel, + getVoiceConnection, + createAudioPlayer, + createAudioResource, + VoiceConnection } from '@discordjs/voice'; +export type { DiscordGatewayAdapterCreator } from '@discordjs/voice'; export { default as chalk } from 'chalk'; export { Client,