Skip to content

Commit bcd48e0

Browse files
committed
Merge branch 'master' of https://github.com/traPtitech/traQ_S-UI into optimize/effect-scope
2 parents 142c21a + fe50445 commit bcd48e0

582 files changed

Lines changed: 7164 additions & 3930 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717

1818
# Initializes the CodeQL tools for scanning.
1919
- name: Initialize CodeQL
20-
uses: github/codeql-action/init@v3
20+
uses: github/codeql-action/init@v4
2121
# Override language selection by uncommenting this and choosing your languages
2222
with:
2323
languages: javascript
2424

2525
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
2626
# If this step fails, then you should remove it and run the build manually (see below)
2727
- name: Autobuild
28-
uses: github/codeql-action/autobuild@v3
28+
uses: github/codeql-action/autobuild@v4
2929

3030
- name: Perform CodeQL Analysis
31-
uses: github/codeql-action/analyze@v3
31+
uses: github/codeql-action/analyze@v4

.github/workflows/main.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: checkout
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616
- name: setup Node
17-
uses: actions/setup-node@v5
17+
uses: actions/setup-node@v6
1818
with:
1919
node-version-file: ./.node-version
2020
cache: npm
@@ -26,9 +26,9 @@ jobs:
2626
needs: [packages]
2727
steps:
2828
- name: checkout
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030
- name: setup Node
31-
uses: actions/setup-node@v5
31+
uses: actions/setup-node@v6
3232
with:
3333
node-version-file: ./.node-version
3434
cache: npm
@@ -44,9 +44,9 @@ jobs:
4444
needs: [packages]
4545
steps:
4646
- name: checkout
47-
uses: actions/checkout@v5
47+
uses: actions/checkout@v6
4848
- name: setup Node
49-
uses: actions/setup-node@v5
49+
uses: actions/setup-node@v6
5050
with:
5151
node-version-file: ./.node-version
5252
cache: npm
@@ -62,9 +62,9 @@ jobs:
6262
needs: [packages]
6363
steps:
6464
- name: checkout
65-
uses: actions/checkout@v5
65+
uses: actions/checkout@v6
6666
- name: setup Node
67-
uses: actions/setup-node@v5
67+
uses: actions/setup-node@v6
6868
with:
6969
node-version-file: ./.node-version
7070
cache: npm
@@ -80,9 +80,9 @@ jobs:
8080
needs: [packages]
8181
steps:
8282
- name: checkout
83-
uses: actions/checkout@v5
83+
uses: actions/checkout@v6
8484
- name: setup Node
85-
uses: actions/setup-node@v5
85+
uses: actions/setup-node@v6
8686
with:
8787
node-version-file: ./.node-version
8888
cache: npm
@@ -104,9 +104,9 @@ jobs:
104104
needs: [packages]
105105
steps:
106106
- name: checkout
107-
uses: actions/checkout@v5
107+
uses: actions/checkout@v6
108108
- name: setup Node
109-
uses: actions/setup-node@v5
109+
uses: actions/setup-node@v6
110110
with:
111111
node-version-file: ./.node-version
112112
cache: npm
@@ -116,7 +116,7 @@ jobs:
116116
CYPRESS_INSTALL_BINARY: 0
117117
- name: run test:unit
118118
run: npm run test:unit
119-
- uses: actions/upload-artifact@v4
119+
- uses: actions/upload-artifact@v5
120120
with:
121121
name: coverage
122122
path: ./coverage
@@ -126,8 +126,8 @@ jobs:
126126
needs: [test-unit]
127127
steps:
128128
- name: checkout
129-
uses: actions/checkout@v5
130-
- uses: actions/download-artifact@v5.0.0
129+
uses: actions/checkout@v6
130+
- uses: actions/download-artifact@v6.0.0
131131
with:
132132
name: coverage
133133
path: ./coverage
@@ -141,9 +141,9 @@ jobs:
141141
if: (github.repository_owner == 'traPtitech' && github.actor != 'dependabot[bot]')
142142
steps:
143143
- name: checkout
144-
uses: actions/checkout@v5
144+
uses: actions/checkout@v6
145145
- name: setup Node
146-
uses: actions/setup-node@v5
146+
uses: actions/setup-node@v6
147147
with:
148148
node-version-file: ./.node-version
149149
cache: npm
@@ -161,7 +161,7 @@ jobs:
161161
env:
162162
CYPRESS_username: ${{ secrets.traQ_username }}
163163
CYPRESS_password: ${{ secrets.traQ_password }}
164-
- uses: actions/upload-artifact@v4
164+
- uses: actions/upload-artifact@v5
165165
with:
166166
name: failed-screenshots
167167
path: ./tests/e2e/screenshots

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Build Docker Image
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717

1818
- name: Set up QEMU
1919
uses: docker/setup-qemu-action@v3

.github/workflows/preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set PR_NUMBER env
1919
run: echo "PR_NUMBER=${{ github.event.number }}" >> $GITHUB_ENV
2020

21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
with:
2323
ref: ${{ github.event.pull_request.head.sha }}
2424
persist-credentials: false

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
make-dist:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v5
18-
- uses: actions/setup-node@v5
17+
- uses: actions/checkout@v6
18+
- uses: actions/setup-node@v6
1919
with:
2020
node-version-file: ./.node-version
2121
cache: npm
@@ -42,7 +42,7 @@ jobs:
4242
- name: Set IMAGE_TAG env
4343
run: echo IMAGE_TAG=$(echo ${GITHUB_REF:11}) >> $GITHUB_ENV
4444

45-
- uses: actions/checkout@v5
45+
- uses: actions/checkout@v6
4646

4747
- name: Set up QEMU
4848
uses: docker/setup-qemu-action@v3

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.DS_Store
22
node_modules
33
/dist
4+
.certs
45

56
# local env files
67
.env.local

.prettierrc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
{
2+
"plugins": ["@trivago/prettier-plugin-sort-imports"],
3+
"importOrder": [
4+
"<BUILTIN_MODULES>",
5+
"^@traptitech",
6+
"^vue",
7+
"<THIRD_PARTY_MODULES>",
8+
"^/@/",
9+
"^[./]"
10+
],
11+
"importOrderSeparation": true,
12+
"importOrderSortSpecifiers": true,
13+
"importOrderGroupNamespaceSpecifiers": true,
214
"printWidth": 80,
315
"tabWidth": 2,
416
"useTabs": false,
@@ -11,7 +23,6 @@
1123
"bracketSameLine": false,
1224
"arrowParens": "avoid",
1325
"rangeStart": 0,
14-
"filepath": "none",
1526
"requirePragma": false,
1627
"insertPragma": false,
1728
"proseWrap": "preserve",

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM node:24.9.0-alpine AS build
1+
FROM --platform=$BUILDPLATFORM node:25.1.0-alpine AS build
22
WORKDIR /app
33

44
ENV CYPRESS_INSTALL_BINARY=0

build/gen-localhost-certs.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash -eu
2+
3+
SCRIPT_DIR=$(dirname "$0")
4+
cd "$SCRIPT_DIR/.."
5+
6+
mkdir -p .certs
7+
8+
docker run --rm \
9+
--mount type=bind,source=./.certs,target=/certs \
10+
alpine/mkcert@sha256:a8f4f5af61908b4c79c2e9d1e5f23e747f29de174649209ebafcab03d4f6d5fd \
11+
-key-file ./certs/localhost.key \
12+
-cert-file ./certs/localhost.crt \
13+
localhost

build/gen-mplus.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
/* eslint-env node */
22
/* eslint-disable no-console */
3-
import axios from 'axios'
4-
import postcss from 'postcss'
5-
import { createFont, woff2 } from 'fonteditor-core'
63
import fs from 'fs/promises'
4+
import { Buffer } from 'node:buffer'
75
import path from 'path'
8-
import zlib from 'zlib'
6+
import process from 'process'
97
import util from 'util'
8+
import zlib from 'zlib'
9+
10+
import axios from 'axios'
11+
import browserslist from 'browserslist'
1012
import esbuild from 'esbuild'
1113
import { resolveToEsbuildTarget } from 'esbuild-plugin-browserslist'
12-
import browserslist from 'browserslist'
13-
import { Buffer } from 'node:buffer'
14-
import process from 'process'
14+
import { createFont, woff2 } from 'fonteditor-core'
15+
import postcss from 'postcss'
1516

1617
const brotliCompress = util.promisify(zlib.brotliCompress)
1718

0 commit comments

Comments
 (0)