Merge branch 'master' into fix/setting_browser_cache

.github/dependabot.yml

@@ -5,13 +5,28 @@ updates:
     schedule:
       interval: monthly
     open-pull-requests-limit: 10
+    groups:
+      non-majors:
+        update-types:
+          - 'patch'
+          - 'minor'
   - package-ecosystem: docker
     directory: '/'
     schedule:
       interval: monthly
     open-pull-requests-limit: 10
+    groups:
+      non-majors:
+        update-types:
+          - 'patch'
+          - 'minor'
   - package-ecosystem: github-actions
     directory: '/'
     schedule:
       interval: monthly
     open-pull-requests-limit: 10
+    groups:
+      non-majors:
+        update-types:
+          - 'patch'
+          - 'minor'

.github/workflows/codeql.yml

@@ -17,15 +17,15 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         # Override language selection by uncommenting this and choosing your languages
         with:
           languages: javascript
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/main.yml

@@ -86,7 +86,7 @@ jobs:
         with:
           node-version-file: ./.node-version
           cache: npm
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ./public/fonts
           key: font-build-${{ runner.os }}
@@ -145,7 +145,7 @@ jobs:
         with:
           node-version-file: ./.node-version
           cache: npm
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ./public/fonts
           key: font-build-${{ runner.os }}

.github/workflows/master.yml

@@ -9,28 +9,6 @@ env:
   IMAGE_NAME: traq-ui
 
 jobs:
-  build:
-    name: run build
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ./.node-version
-          cache: npm
-      - name: npm ci
-        run: npm ci
-        env:
-          CYPRESS_INSTALL_BINARY: 0
-      - name: run build
-        run: npm run build:with-font
-      - uses: actions/upload-artifact@v3
-        with:
-          name: dist
-          path: ./dist
-
   image:
     name: Build Docker Image
     runs-on: ubuntu-latest
@@ -65,16 +43,12 @@ jobs:
   deploy-staging:
     name: Deploy staging
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [image]
     steps:
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:
           key: ${{ secrets.STAGING_SSH_KEY }}
           known_hosts: ${{ secrets.STAGING_KNOWN_HOSTS }}
-      - uses: actions/download-artifact@v3
-        with:
-          name: dist
-          path: ./dist
       - name: Deploy
-        run: rsync -e ssh --rsync-path='sudo rsync' -rltpzhv --delete ./dist ${{ secrets.STAGING_DEPLOY_USER }}@${{ secrets.STAGING_DEPLOY_HOST }}:${{ secrets.STAGING_DEPLOY_RSYNC_DESTINATION }}
+        run: ssh -o LogLevel=QUIET -t ${{ secrets.STAGING_DEPLOY_USER }}@${{ secrets.STAGING_DEPLOY_HOST }} "sudo sh /srv/traq/deploy.sh traq-frontend"

.node-version

@@ -1 +1 @@
-21.1.0
+20.15.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:21.1.0-alpine as build
+FROM --platform=$BUILDPLATFORM node:20.15.0-alpine as build
 WORKDIR /app
 
 ENV CYPRESS_INSTALL_BINARY=0
@@ -10,7 +10,7 @@ COPY . .
 RUN NODE_ENV=production npm run build:with-font
 
 
-FROM caddy:2.7.5-alpine
+FROM caddy:2.8.4-alpine
 EXPOSE 80
 
 COPY build/docker/Caddyfile /etc/caddy/Caddyfile

build/gen-unicode_emojis.js

@@ -42,7 +42,18 @@ categoryMap['regional'] = {
 }
 
 const unicodeTable = {}
-const altNameTable = {}
+const altNameTable = {
+  0: 'zero',
+  1: 'one',
+  2: 'two',
+  3: 'three',
+  4: 'four',
+  5: 'five',
+  6: 'six',
+  7: 'seven',
+  8: 'eight',
+  9: 'nine'
+}
 Object.entries(emojis).forEach(([key, e]) => {
   if (e.category === 'modifier') return
   if (e.name.endsWith('skin tone')) return