Merge branch 'master' into dependabot/npm_and_yarn/array-shuffle-2.0.0

This commit is contained in:
Max Isom 2020-12-03 16:09:09 -05:00
commit f7d3e72864
No known key found for this signature in database
GPG key ID: 25C9B1A7F6798880
3 changed files with 26 additions and 15 deletions

View file

@ -28,6 +28,11 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Limit concurrent builds to 1
uses: softprops/turnstyle@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push - name: Build and push
id: docker_build id: docker_build
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2

View file

@ -32,7 +32,7 @@
"@types/node": "^14.14.10", "@types/node": "^14.14.10",
"@types/node-emoji": "^1.8.1", "@types/node-emoji": "^1.8.1",
"@types/spotify-web-api-node": "^4.0.2", "@types/spotify-web-api-node": "^4.0.2",
"@types/validator": "^13.1.0", "@types/validator": "^13.1.1",
"@types/ws": "^7.4.0", "@types/ws": "^7.4.0",
"@typescript-eslint/eslint-plugin": "^4.9.0", "@typescript-eslint/eslint-plugin": "^4.9.0",
"@typescript-eslint/parser": "^4.9.0", "@typescript-eslint/parser": "^4.9.0",
@ -41,7 +41,7 @@
"eslint-config-xo-typescript": "^0.36.0", "eslint-config-xo-typescript": "^0.36.0",
"husky": "^4.3.0", "husky": "^4.3.0",
"nodemon": "^2.0.6", "nodemon": "^2.0.6",
"ts-node": "^9.0.0", "ts-node": "^9.1.0",
"typescript": "^4.1.2" "typescript": "^4.1.2"
}, },
"eslintConfig": { "eslintConfig": {
@ -91,6 +91,6 @@
"sqlite3": "^5.0.0", "sqlite3": "^5.0.0",
"unique-random-array": "^2.0.0", "unique-random-array": "^2.0.0",
"youtube.ts": "^0.1.9", "youtube.ts": "^0.1.9",
"ytdl-core": "^4.1.1" "ytdl-core": "^4.1.2"
} }
} }

View file

@ -207,10 +207,10 @@
dependencies: dependencies:
"@types/spotify-api" "*" "@types/spotify-api" "*"
"@types/validator@^13.1.0": "@types/validator@^13.1.1":
version "13.1.0" version "13.1.1"
resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.1.0.tgz#3d776127dbce7dd31fc06f86d3428b072e631eba" resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.1.1.tgz#8d220ae4851a1e745764c7ca72294b6d46aeb533"
integrity sha512-gHUHI6pJaANIO2r6WcbT7+WMgbL9GZooR4tWpuBOETpDIqFNxwaJluE+6rj6VGYe8k6OkfhbHz2Fkm8kl06Igw== integrity sha512-/39uXOKe1KV4ElXb8cp0RVyeRn9X1QRwllComMMql+FQ9nhmTx0Yhw+kJtccPSShsjma+KXjW/TiXyGUNqNn+w==
"@types/ws@^7.4.0": "@types/ws@^7.4.0":
version "7.4.0" version "7.4.0"
@ -737,6 +737,11 @@ cosmiconfig@^7.0.0:
path-type "^4.0.0" path-type "^4.0.0"
yaml "^1.10.0" yaml "^1.10.0"
create-require@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
cross-spawn@^7.0.2: cross-spawn@^7.0.2:
version "7.0.3" version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@ -2885,12 +2890,13 @@ tough-cookie@~2.5.0:
psl "^1.1.28" psl "^1.1.28"
punycode "^2.1.1" punycode "^2.1.1"
ts-node@^9.0.0: ts-node@^9.1.0:
version "9.0.0" version "9.1.0"
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.0.tgz#95eae4c6d0f94f2545884078e1eb1b14d2155639"
integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== integrity sha512-0yqcL4sgruCvM+w64LiAfNJo6+lHfCYc5Ajj4yiLNkJ9oZ2HWaa+Kso7htYOOxVQ7+csAjdUjffOe9PIqC4pMg==
dependencies: dependencies:
arg "^4.1.0" arg "^4.1.0"
create-require "^1.1.0"
diff "^4.0.1" diff "^4.0.1"
make-error "^1.1.1" make-error "^1.1.1"
source-map-support "^0.5.17" source-map-support "^0.5.17"
@ -3147,10 +3153,10 @@ youtube.ts@^0.1.9:
axios "^0.19.0" axios "^0.19.0"
ytdl-core "^4.0.3" ytdl-core "^4.0.3"
ytdl-core@^4.0.3, ytdl-core@^4.1.1: ytdl-core@^4.0.3, ytdl-core@^4.1.2:
version "4.1.1" version "4.1.2"
resolved "https://registry.yarnpkg.com/ytdl-core/-/ytdl-core-4.1.1.tgz#191fabf472c44f969fe3eca15cb4d1c094e46282" resolved "https://registry.yarnpkg.com/ytdl-core/-/ytdl-core-4.1.2.tgz#ae94258202f3aaf557ef9c542f3f5bbc6a62b972"
integrity sha512-T2VIS64sHKdLLqvuTV7S4WyoUCZLdR7HOP/9jX1CyXKYUjKLFP9UpVIFH0ZUvFSmK48eNFErWLOO5dGouwqztQ== integrity sha512-eQMM6HF/Ddh2/n+6sheLyhWR4qvt3oYQyZqJ54X9vqUcIA2FzmN2YpP1ioSuJj0xrCPhk0fnXHu2EGrRvEf/Ig==
dependencies: dependencies:
html-entities "^1.3.1" html-entities "^1.3.1"
m3u8stream "^0.8.3" m3u8stream "^0.8.3"