Merge branch 'master' into fix/scroller_bug

Author: Takeno-hito

.github/PULL_REQUEST_TEMPLATE/en.md

@@ -0,0 +1,22 @@
+## Description
+
+## Why do you want to merge this PR?
+
+<!-- If there is a related issue, please write instead. -->
+
+## Verification Steps
+
+## ScreenShots of UI Changes
+
+### Before
+
+### After
+
+## Pre-PR Check-List
+
+- [ ] (If you want to add a feature) The team has agreed to the addition.
+  - If not, just uncheck this and open the PR.
+- [ ] I have confirmed that it works.
+- [ ] I have looked over the code myself, and it seems fine.
+
+## Questions / Memo

.github/dependabot.yml

@@ -6,10 +6,16 @@ updates:
       interval: monthly
     open-pull-requests-limit: 10
     groups:
-      non-majors:
+      types:
+        patterns:
+          - '@types/*'
+      linters-and-formatters:
+        patterns:
+          - '*eslint*'
+          - '*prettier*'
+      patches:
         update-types:
           - 'patch'
-          - 'minor'
   - package-ecosystem: docker
     directory: '/'
     schedule:

.github/pull_request_template.md

@@ -0,0 +1,22 @@
+## 概要
+
+## なぜこの PR を入れたいのか
+
+<!-- issue 番号だけでも OK / close: #123 とか fix: #123 の形で -->
+
+## 動作確認の手順
+
+## UI 変更部分のスクリーンショット
+
+### before
+
+### after
+
+## PR を出す前の確認事項
+
+- [ ] （機能の追加なら）追加することの合意がチームで取れている
+  - 取れていない場合はチェックを外して PR にすれば OK
+- [ ] 動作確認ができている
+- [ ] 自分で一度コードを眺めて自分的に問題はなさそう
+
+## 見てほしいところ・聞きたいことなど

.github/workflows/master.yml

@@ -40,15 +40,14 @@ jobs:
           cache-from: type=registry,ref=ghcr.io/traptitech/${{ env.IMAGE_NAME }}:buildcache
           cache-to: type=registry,ref=ghcr.io/traptitech/${{ env.IMAGE_NAME }}:buildcache,mode=max
 
-  deploy-staging:
-    name: Deploy staging
+  run-manifest-renovate:
+    name: Run Renovate on manifest
     runs-on: ubuntu-latest
     needs: [image]
+    permissions:
+      contents: read
+      actions: write
     steps:
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.STAGING_SSH_KEY }}
-          known_hosts: ${{ secrets.STAGING_KNOWN_HOSTS }}
-      - name: Deploy
-        run: ssh -o LogLevel=QUIET -t ${{ secrets.STAGING_DEPLOY_USER }}@${{ secrets.STAGING_DEPLOY_HOST }} "sudo sh /srv/traq/deploy.sh traq-frontend"
+      - run: 'gh api --method POST -H "Accept: application/vnd.github+json" /repos/traPtitech/manifest/actions/workflows/renovate.yaml/dispatches -f "ref=main"'
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}

.github/workflows/release.yml

@@ -68,3 +68,15 @@ jobs:
             ghcr.io/traptitech/${{ env.IMAGE_NAME }}:latest
             ghcr.io/traptitech/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
           cache-from: type=registry,ref=ghcr.io/traptitech/${{ env.IMAGE_NAME }}:buildcache
+
+  run-manifest-renovate:
+    name: Run Renovate on manifest
+    runs-on: ubuntu-latest
+    needs: [image]
+    permissions:
+      contents: read
+      actions: write
+    steps:
+      - run: 'gh api --method POST -H "Accept: application/vnd.github+json" /repos/traPtitech/manifest/actions/workflows/renovate.yaml/dispatches -f "ref=main"'
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}

.prettierignore

@@ -4,3 +4,4 @@ node_modules
 /patches
 /src/assets/emoji_altname_table.json
 /src/assets/unicode_emojis.json
+/public/new-relic.js

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:23.11.0-alpine AS build
+FROM --platform=$BUILDPLATFORM node:24.3.0-alpine AS build
 WORKDIR /app
 
 ENV CYPRESS_INSTALL_BINARY=0

build/docker/startup.sh

@@ -31,6 +31,23 @@ sed -i -e "s/\"name\":\"traQ\",\"short_name\":\"traQ\"/\"name\":\"$APP_NAME\",\"
 echo "Startup: set theme color to $THEME_COLOR"
 sed -i -e "s/#0D67EA/$THEME_COLOR/g" /usr/share/caddy/index.html
 
+###
+# New Relic 設定
+###
+if [ -n "$NEW_RELIC_LICENSE_KEY" ] && [ -n "$NEW_RELIC_ACCOUNT_ID" ] && [ -n "$NEW_RELIC_TRUST_KEY" ] && [ -n "$NEW_RELIC_AGENT_ID" ] && [ -n "$NEW_RELIC_APPLICATION_ID" ]; then
+  echo "Startup: set up New Relic"
+  sed -i -e "s/LICENSE_KEY_PLACEHOLDER/$NEW_RELIC_LICENSE_KEY/g" /usr/share/caddy/new-relic.js
+  sed -i -e "s/ACCOUNT_ID_PLACEHOLDER/$NEW_RELIC_ACCOUNT_ID/g" /usr/share/caddy/new-relic.js
+  sed -i -e "s/TRUST_KEY_PLACEHOLDER/$NEW_RELIC_TRUST_KEY/g" /usr/share/caddy/new-relic.js
+  sed -i -e "s/AGENT_ID_PLACEHOLDER/$NEW_RELIC_AGENT_ID/g" /usr/share/caddy/new-relic.js
+  sed -i -e "s/APPLICATION_ID_PLACEHOLDER/$NEW_RELIC_APPLICATION_ID/g" /usr/share/caddy/new-relic.js
+  CACHE_KEY=$(md5sum /usr/share/caddy/new-relic.js | cut -d ' ' -f 1)
+  mv /usr/share/caddy/new-relic.js /usr/share/caddy/new-relic-$CACHE_KEY.js
+  sed -i -e "s/<!-- <script src=\"\/new-relic-{hash}.js\"><\/script> -->/<script src=\"\/new-relic-$CACHE_KEY.js\"><\/script>/" /usr/share/caddy/index.html
+else
+  echo "Startup: New Relic is not configured"
+fi
+
 ###
 # サーバー起動
 ###

build/gen-mplus.js

@@ -99,7 +99,7 @@ const downloadAndtransform = async (url, filename) => {
       hinting: false
     })
     await fs.writeFile(path.join(rootPath, filename), writeBuffer)
-  } catch (e) {
+  } catch (_) {
     await fs.writeFile(path.join(rootPath, filename), readBuffer)
     console.warn(
       `Failed to remove font hinting. Outputted original. ${filename}`

codecov.yml

@@ -3,3 +3,8 @@ coverage:
     project:
       default:
         informational: true
+    patch:
+      default:
+        informational: true
+github_checks:
+  annotations: false