Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
BenSegal855 committed Dec 2, 2023
2 parents ef67982 + 5784783 commit 8961771
Show file tree
Hide file tree
Showing 24 changed files with 3,095 additions and 2,465 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/buildAndDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
environment: prod
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Docker Login
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/buildCheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Build and Lint Check

on:
push:
pull_request:
workflow_dispatch:

jobs:
build-check:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install dependencies
run: yarn
- name: Build
run: yarn build
- name: Lint
run: yarn lint
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.0.cjs

This file was deleted.

875 changes: 875 additions & 0 deletions .yarn/releases/yarn-3.7.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ enableGlobalCache: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.0.cjs
yarnPath: .yarn/releases/yarn-3.7.0.cjs
65 changes: 33 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,33 @@
"node": "16.*"
},
"dependencies": {
"@discordjs/collection": "1.5.1",
"@octokit/rest": "19.0.11",
"@sapphire/decorators": "6.0.1",
"@sapphire/discord-utilities": "3.0.3",
"@sapphire/discord.js-utilities": "6.1.0",
"@discordjs/collection": "2.0.0",
"@octokit/rest": "20.0.2",
"@sapphire/decorators": "6.0.2",
"@sapphire/discord-utilities": "3.2.0",
"@sapphire/discord.js-utilities": "7.1.2",
"@sapphire/fetch": "2.4.1",
"@sapphire/framework": "4.4.4",
"@sapphire/pieces": "3.6.3",
"@sapphire/plugin-editable-commands": "3.0.2",
"@sapphire/plugin-logger": "3.0.4",
"@sapphire/plugin-subcommands": "4.0.1",
"@sapphire/framework": "^4.7.2",
"@sapphire/pieces": "3.10.0",
"@sapphire/plugin-editable-commands": "3.1.0",
"@sapphire/plugin-logger": "3.0.7",
"@sapphire/plugin-subcommands": "^5.0.0",
"@sapphire/stopwatch": "1.5.0",
"@sapphire/time-utilities": "1.7.9",
"@sapphire/type": "2.4.0",
"@sapphire/utilities": "3.11.2",
"axios": "1.4.0",
"@sapphire/time-utilities": "1.7.10",
"@sapphire/type": "2.4.1",
"@sapphire/utilities": "3.13.0",
"@skyra/env-utilities": "^1.2.1",
"axios": "1.6.2",
"canvas": "2.11.2",
"chart.js": "3.9.1",
"chartjs-node-canvas": "4.1.6",
"chartjs-plugin-datalabels": "2.2.0",
"colorette": "2.0.20",
"common-tags": "1.8.2",
"discord.js": "14.11.0",
"dotenv-cra": "3.0.3",
"discord.js": "14.14.1",
"module-alias": "2.2.3",
"mongodb": "4.16.0",
"node-cron": "3.0.2",
"mongodb": "4.17.1",
"node-cron": "3.0.3",
"parse-duration": "1.1.0",
"pdf2json": "^3.0.3",
"pretty-ms": "7.0.1",
Expand All @@ -46,26 +46,27 @@
"@lib": "dist/lib"
},
"devDependencies": {
"@sapphire/ts-config": "4.0.0",
"@types/common-tags": "1.8.1",
"@types/node": "17.0.23",
"@types/node-cron": "3.0.7",
"@types/ws": "8.5.4",
"@typescript-eslint/eslint-plugin": "5.59.9",
"@typescript-eslint/parser": "5.59.9",
"eslint": "8.42.0",
"eslint-plugin-deprecation": "1.4.1",
"@sapphire/ts-config": "^5.0.0",
"@types/common-tags": "1.8.4",
"@types/node": "17.0.45",
"@types/node-cron": "3.0.11",
"@types/ws": "8.5.10",
"@typescript-eslint/eslint-plugin": "6.13.1",
"@typescript-eslint/parser": "6.13.1",
"eslint": "8.55.0",
"eslint-plugin-deprecation": "1.5.0",
"npm-run-all": "4.1.5",
"rimraf": "4.4.1",
"tsc-watch": "6.0.4",
"tslib": "2.5.3",
"typescript": "5.1.3"
"tslib": "2.6.2",
"typescript": "5.3.2"
},
"scripts": {
"build": "rimraf dist && tsc",
"build": "tsc --noEmit false",
"build:clean": "run-s clean build",
"watch": "tsc -w",
"start": "node dist/index.js",
"dev": "run-s build start",
"dev": "run-s build:clean start",
"watch:start": "tsc-watch --onSuccess \"node ./dist/index.js\"",
"lint:fix": "eslint src --ext .ts --fix",
"lint": "eslint src --ext .ts",
Expand All @@ -74,5 +75,5 @@
"clean:purge": "rimraf node_modules dist yarn.lock package-lock.json",
"updeps": "yarn clean:purge && yarn install"
},
"packageManager": "yarn@3.6.0"
"packageManager": "yarn@3.7.0"
}
Loading

0 comments on commit 8961771

Please sign in to comment.