Merge branch 'main' into develop

0.5.1
2024-03-14 17:36:46 +00:00 · 2024-03-14 17:36:26 +00:00 · 2024-03-14 17:35:59 +00:00 · 2024-03-14 17:31:53 +00:00
5 changed files with 15 additions and 38 deletions
--- a/.dev.env
+++ b/.dev.env
@ -7,7 +7,7 @@
 # any secret values.

 BOT_TOKEN=
-BOT_VER=0.5.0
+BOT_VER=0.5.1
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060
--- a/.prod.env
+++ b/.prod.env
@ -7,7 +7,7 @@
 # any secret values.

 BOT_TOKEN=
-BOT_VER=0.5.0
+BOT_VER=0.5.1
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=1093810443589529631
--- a/.stage.env
+++ b/.stage.env
@ -7,7 +7,7 @@
 # any secret values.

 BOT_TOKEN=
-BOT_VER=0.5.0
+BOT_VER=0.5.1
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=1147976642942214235
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "card-drop",
-  "version": "0.5.0",
+  "version": "0.5.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "card-drop",
-      "version": "0.5.0",
+      "version": "0.5.1",
      "license": "MIT",
      "dependencies": {
        "@discordjs/rest": "^2.0.0",
@ -2643,28 +2643,6 @@
        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
      }
    },
-    "node_modules/babel-plugin-jest-hoist/node_modules/@babel/parser": {
-      "version": "7.23.0",
-      "license": "MIT",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/babel-plugin-jest-hoist/node_modules/@babel/template": {
-      "version": "7.22.5",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
    "node_modules/babel-preset-current-node-syntax": {
      "version": "1.0.1",
      "license": "MIT",
@ -5941,9 +5919,9 @@
      }
    },
    "node_modules/ip": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
+      "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==",
      "optional": true,
      "peer": true
    },
@ -10957,8 +10935,9 @@
      }
    },
    "node_modules/undici": {
-      "version": "5.27.2",
-      "license": "MIT",
+      "version": "5.28.3",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz",
+      "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==",
      "dependencies": {
        "@fastify/busboy": "^2.0.0"
      },
@ -11135,10 +11114,6 @@
        "node": ">=10.12.0"
      }
    },
-    "node_modules/v8-to-istanbul/node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "license": "MIT"
-    },
    "node_modules/vali-date": {
      "version": "1.0.0",
      "dev": true,
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "card-drop",
-  "version": "0.5.0",
+  "version": "0.5.1",
  "main": "./dist/bot.js",
  "typings": "./dist",
  "scripts": {
@ -43,7 +43,9 @@
    "ts-jest": "^29.0.0",
    "typeorm": "0.3.20"
  },
-  "resolutions": {},
+  "overrides": {
+    "undici": "^5.28.3"
+  },
  "devDependencies": {
    "@types/node": "^20.0.0",
    "@typescript-eslint/eslint-plugin": "^6.16.0",
Author	SHA1	Message	Date
Ethan Lane	42dfe2d047	Merge branch 'main' into develop All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2024-03-14 17:36:46 +00:00
Ethan Lane	370730cbea	0.5.1 All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2024-03-14 17:36:26 +00:00
Ethan Lane	e0479127ac	0.5.1	2024-03-14 17:35:59 +00:00
Ethan Lane	c7e064bb6c	Fix vulnerabilities with undici and ip All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details	2024-03-14 17:31:53 +00:00