Merge 95dbbbcf22 into e026dfdd64

.github/workflows/merge-conflict-labeler.yml

@@ -1,8 +1,13 @@
 name: Merge Conflict Labeler
 
 on:
+  push:
+    branches:
+      - dev/0.15.0
   pull_request_target:
-    types: [ synchronize ]
+    branches:
+      - dev/0.15.0
+    types: [synchronize]
 
 jobs:
   label:
@@ -10,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'tycrek/ass' }}
     steps:
-      - uses: eps1lon/actions-label-merge-conflict@releases/2.x
+      - uses: eps1lon/actions-label-merge-conflict@v3
         if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
         with:
           dirtyLabel: 'merge conflict'

.github/workflows/ts-build.yml

@@ -20,7 +20,7 @@ jobs:
 
       # Set up Node 20
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
 
@@ -44,7 +44,7 @@ jobs:
         
       # Upload archive as an artifact
       - name: Upload archive
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARCHIVE_NAME }}
           path: ${{ env.ARCHIVE_NAME }}.zip

Dockerfile

@@ -3,7 +3,7 @@
 #  - tycrek <t@tycrek.com> (https://tycrek.com/)
 #  - Zusier <zusier@pm.me> (https://github.com/Zusier)
 
-FROM node:20.9.0-alpine
+FROM node:20.12.2-alpine
 WORKDIR /opt/ass-src/
 COPY . ./
 RUN npm i -g pnpm

package.json

@@ -31,52 +31,52 @@
   "bugs": "https://github.com/tycrek/ass/issues",
   "homepage": "https://github.com/tycrek/ass#readme",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.465.0",
+    "@aws-sdk/client-s3": "^3.556.0",
-    "@shoelace-style/shoelace": "^2.12.0",
+    "@shoelace-style/shoelace": "^2.15.0",
     "@tinycreek/postcss-font-magician": "^4.2.0",
-    "@tsconfig/node20": "^20.1.2",
+    "@tsconfig/node20": "^20.1.4",
     "@tycrek/discord-hookr": "^0.1.0",
     "@tycrek/express-postcss": "^0.4.1",
     "@tycrek/joint": "1.0.0-1",
     "@tycrek/log": "^0.7.5",
-    "@xoi/gps-metadata-remover": "^1.1.2",
+    "@xoi/gps-metadata-remover": "^2.0.0",
     "any-shell-escape": "^0.1.1",
-    "autoprefixer": "^10.4.16",
+    "autoprefixer": "^10.4.19",
-    "axios": "^1.6.2",
+    "axios": "^1.6.8",
     "bcrypt": "^5.1.1",
-    "crypto-random-string": "3.3.1",
+    "crypto-random-string": "5.0.0",
-    "cssnano": "^6.0.1",
+    "cssnano": "^6.1.2",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "express-busboy": "^10.1.0",
-    "express-rate-limit": "^7.1.5",
+    "express-rate-limit": "^7.2.0",
-    "express-session": "^1.17.3",
+    "express-session": "^1.18.0",
     "ffmpeg-static": "^5.2.0",
     "fs-extra": "^11.2.0",
     "luxon": "^3.4.4",
     "memorystore": "^1.6.7",
-    "mysql2": "^3.6.5",
+    "mysql2": "^3.9.6",
-    "node-vibrant": "^3.1.6",
+    "node-vibrant": "3.2.1-alpha.1",
-    "pg": "^8.11.3",
+    "pg": "^8.11.5",
     "pug": "^3.0.2",
-    "sharp": "^0.32.6",
+    "sharp": "^0.33.3",
     "shoelace-fontawesome-pug": "^6.4.3",
     "shoelace-pug-loader": "^2.11.0",
-    "tailwindcss": "^3.3.6",
+    "tailwindcss": "^3.4.3",
-    "typescript": "^5.3.2",
+    "typescript": "^5.4.5",
     "william.js": "^1.3.1"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
     "@types/express": "^4.17.21",
     "@types/express-busboy": "^8.0.3",
-    "@types/express-session": "^1.17.10",
+    "@types/express-session": "^1.18.0",
     "@types/ffmpeg-static": "^3.0.3",
     "@types/fs-extra": "^11.0.4",
-    "@types/luxon": "^3.3.6",
+    "@types/luxon": "^3.4.2",
-    "@types/node": "^20.10.3",
+    "@types/node": "^20.12.7",
-    "@types/pg": "^8.10.9",
+    "@types/pg": "^8.11.5",
-    "vitepress": "1.0.0-rc.31",
+    "vitepress": "1.1.3",
-    "vue": "^3.3.10",
+    "vue": "^3.4.23",
-    "wrangler": "^3.18.0"
+    "wrangler": "^3.51.2"
   }
 }