Skip to content

Commit 3607a1b

Browse files
GZTimeWalkerGZTimeWalker
committed
Merge branch 'work' into ci/test-satori
2 parents 3821bf0 + 95839df commit 3607a1b

File tree

13 files changed

+548
-595
lines changed

13 files changed

+548
-595
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
All notable changes to [**GZCTF**](https://github.com/GZTimeWalker/GZCTF) will be documented in this file.
44

5+
---
6+
## [1.4.1](https://github.com/GZTimeWalker/GZCTF/compare/v1.4.0..v1.4.1) - 2025-06-11
7+
8+
### ⛰️ Features
9+
10+
- **(frontend)** use shiki instead of prismjs - ([5376ab](https://github.com/GZTimeWalker/GZCTF/commit/5376ab)) by **GZTime**
11+
12+
### 🐛 Bug Fixes
13+
14+
- **(post_card)** format time as `lll` on mobile - ([e6b735](https://github.com/GZTimeWalker/GZCTF/commit/e6b735)) by **GZTime**
15+
516
---
617
## [1.4.0](https://github.com/GZTimeWalker/GZCTF/compare/v1.3.3..v1.4.0) - 2025-06-02
718

‎src/Directory.Packages.props

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<PackageVersion Include="FluentStorage.AWS" Version="5.5.0" />
1313
<PackageVersion Include="FluentStorage.Azure.Blobs" Version="5.3.0" />
1414
<PackageVersion Include="KubernetesClient" Version="17.0.4" />
15-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.5" />
16-
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="9.0.5" />
17-
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="9.0.5" />
18-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
19-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="9.0.5" />
20-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.5" />
21-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="9.5.0" />
15+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.6" />
16+
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="9.0.6" />
17+
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="9.0.6" />
18+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
19+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="9.0.6" />
20+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.6" />
21+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="9.6.0" />
2222
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
2323
<PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.3" />
2424
<PackageVersion Include="NPOI" Version="2.7.3" />
@@ -36,30 +36,30 @@
3636
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.11.0-beta.1" />
3737
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
3838
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.12.0-beta.1" />
39-
<PackageVersion Include="Scalar.AspNetCore" Version="2.4.13" />
39+
<PackageVersion Include="Scalar.AspNetCore" Version="2.4.22" />
4040
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
4141
<PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
4242
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
4343
<PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
4444
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
4545
<PackageVersion Include="Serilog.Sinks.File.Archive" Version="1.0.6" />
4646
<PackageVersion Include="MailKit" Version="4.12.1" />
47-
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.5" />
48-
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.5" />
49-
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.5" />
47+
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.6" />
48+
<PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.6" />
49+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.6" />
5050
<PackageVersion Include="MemoryPack" Version="1.21.4" />
51-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
52-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.5" />
51+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
52+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.6" />
5353
<PackageVersion Include="Serilog.Sinks.Grafana.Loki" Version="8.3.1" />
54-
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.9" />
54+
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.10" />
5555
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.1" />
5656
<PackageVersion Include="PacketDotNet" Version="1.4.8" />
5757
<PackageVersion Include="SharpPcap" Version="6.3.1" />
58-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.5" />
59-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.5" />
58+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.6" />
59+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.6" />
6060
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
6161
<PackageVersion Include="xunit" Version="2.9.3" />
62-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
62+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
6363
<PackageVersion Include="xunit.runner.console" Version="2.9.3" />
6464
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
6565
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />

‎src/GZCTF.Test/GZCTF.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<IsPackable>false</IsPackable>
66
<CollectCoverage>true</CollectCoverage>
77
<Configurations>Debug;Release</Configurations>
8-
<ReleaseVersion>1.4.0</ReleaseVersion>
8+
<ReleaseVersion>1.4.1</ReleaseVersion>
99
<EnablePreviewFeatures>True</EnablePreviewFeatures>
1010
<WarningLevel>4</WarningLevel>
1111
</PropertyGroup>

‎src/GZCTF.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ Global
3939
SolutionGuid = {643F6AF8-C22F-4E8E-9AB2-504B7C560CD6}
4040
EndGlobalSection
4141
GlobalSection(MonoDevelopProperties) = preSolution
42-
version = 1.4.0
42+
version = 1.4.1
4343
EndGlobalSection
4444
EndGlobal

‎src/GZCTF/ClientApp/package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gzctf-client",
3-
"version": "1.4.0",
3+
"version": "1.4.1",
44
"private": true,
55
"type": "module",
66
"scripts": {
@@ -14,16 +14,16 @@
1414
"dependencies": {
1515
"@babel/core": "^7.27.4",
1616
"@emotion/react": "^11.14.0",
17-
"@mantine/carousel": "^8.1.0",
18-
"@mantine/colors-generator": "^8.1.0",
19-
"@mantine/core": "^8.1.0",
20-
"@mantine/dates": "^8.1.0",
21-
"@mantine/dropzone": "^8.1.0",
22-
"@mantine/emotion": "^8.1.0",
23-
"@mantine/form": "^8.1.0",
24-
"@mantine/hooks": "^8.1.0",
25-
"@mantine/modals": "^8.1.0",
26-
"@mantine/notifications": "^8.1.0",
17+
"@mantine/carousel": "^8.1.1",
18+
"@mantine/colors-generator": "^8.1.1",
19+
"@mantine/core": "^8.1.1",
20+
"@mantine/dates": "^8.1.1",
21+
"@mantine/dropzone": "^8.1.1",
22+
"@mantine/emotion": "^8.1.1",
23+
"@mantine/form": "^8.1.1",
24+
"@mantine/hooks": "^8.1.1",
25+
"@mantine/modals": "^8.1.1",
26+
"@mantine/notifications": "^8.1.1",
2727
"@marsidev/react-turnstile": "^1.1.0",
2828
"@mdi/js": "^7.4.47",
2929
"@mdi/react": "^1.6.1",
@@ -39,7 +39,7 @@
3939
"embla-carousel-react": "^8.6.0",
4040
"fast-average-color": "^9.5.0",
4141
"i18next": "^25.2.1",
42-
"i18next-browser-languagedetector": "^8.1.0",
42+
"i18next-browser-languagedetector": "^8.2.0",
4343
"i18next-resources-to-backend": "^1.2.1",
4444
"katex": "^0.16.22",
4545
"lz-string": "^1.5.0",
@@ -48,38 +48,38 @@
4848
"react": "^19.1.0",
4949
"react-dom": "^19.1.0",
5050
"react-error-boundary": "^6.0.0",
51-
"react-i18next": "^15.5.2",
51+
"react-i18next": "^15.5.3",
5252
"react-pdf": "^9.2.1",
5353
"react-router": "^7.6.2",
54-
"shiki": "^3.6.0",
54+
"shiki": "^3.7.0",
5555
"swr": "^2.3.3"
5656
},
5757
"devDependencies": {
58-
"@shikijs/transformers": "^3.6.0",
58+
"@shikijs/transformers": "^3.7.0",
5959
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
6060
"@types/chroma-js": "^3.1.1",
6161
"@types/katex": "^0.16.7",
62-
"@types/node": "^24.0.0",
62+
"@types/node": "^24.0.3",
6363
"@types/prismjs": "^1.26.5",
64-
"@types/react": "^19.1.7",
64+
"@types/react": "^19.1.8",
6565
"@types/react-dom": "^19.1.6",
66-
"@vitejs/plugin-react": "^4.5.2",
67-
"axios": "^1.9.0",
66+
"@vitejs/plugin-react-oxc": "^0.2.3",
67+
"axios": "^1.10.0",
6868
"babel-plugin-prismjs": "^2.1.0",
6969
"form-data": "~4.0.3",
7070
"globals": "^16.2.0",
7171
"lodash": "^4.17.21",
72-
"oxlint": "^1.0.0",
73-
"postcss": "^8.5.4",
72+
"oxlint": "^1.2.0",
73+
"postcss": "^8.5.6",
7474
"postcss-preset-mantine": "^1.17.0",
7575
"postcss-simple-vars": "^7.0.1",
7676
"prettier": "~3.5.3",
7777
"prettier-plugin-sort-json": "^4.1.1",
78-
"rollup": "^4.42.0",
79-
"swagger-typescript-api": "^13.2.1",
78+
"rollup": "^4.44.0",
79+
"swagger-typescript-api": "^13.2.3",
8080
"tslib": "^2.8.1",
8181
"typescript": "5.8.3",
82-
"vite": "npm:rolldown-vite@^6.3.18",
82+
"vite": "npm:rolldown-vite@^6.3.21",
8383
"vite-plugin-banner": "^0.8.1",
8484
"vite-plugin-optimize-css-modules": "^1.2.0",
8585
"vite-plugin-pages": "^0.33.0",
@@ -89,7 +89,7 @@
8989
"pnpm": {
9090
"overrides": {
9191
"canvas": "npm:dry-uninstall",
92-
"vite": "npm:rolldown-vite@latest"
92+
"vite": "npm:rolldown-vite"
9393
},
9494
"onlyBuiltDependencies": [
9595
"esbuild"

0 commit comments

Comments
 (0)