Merge branch 'GZTimeWalker:develop' into develop

kengwang · Nov 10, 2024 · 92e953b · 92e953b
2 parents c3ff53f + 9975366
commit 92e953b
Show file tree

Hide file tree

Showing 3 changed files with 150 additions and 150 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -18,7 +18,7 @@
         </PackageVersion>
         <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10"/>
         <PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.5"/>
-        <PackageVersion Include="NPOI" Version="2.7.1"/>
+        <PackageVersion Include="NPOI" Version="2.7.2"/>
         <PackageVersion Include="NSwag.AspNetCore" Version="14.1.0"/>
         <PackageVersion Include="NSwag.MSBuild" Version="14.1.0">
             <PrivateAssets>all</PrivateAssets>
@@ -71,4 +71,4 @@
         <PackageVersion Include="coverlet.msbuild" Version="6.0.2"/>
         <PackageVersion Include="ZstdSharp.Port" Version="0.8.1"/>
     </ItemGroup>
-</Project>
+</Project>
diff --git a/src/GZCTF/ClientApp/package.json b/src/GZCTF/ClientApp/package.json
@@ -40,8 +40,8 @@
     "i18next-browser-languagedetector": "^8.0.0",
     "katex": "^0.16.11",
     "lz-string": "^1.5.0",
-    "marked": "^14.1.4",
-    "marked-highlight": "^2.2.0",
+    "marked": "^15.0.0",
+    "marked-highlight": "^2.2.1",
     "pdfjs-dist": "4.4.168",
     "prismjs": "^1.29.0",
     "react": "^18.3.1",
@@ -74,27 +74,27 @@
     "axios": "^1.7.7",
     "babel-plugin-prismjs": "^2.1.0",
     "eslint": "^9.14.0",
-    "eslint-plugin-oxlint": "^0.11.0",
+    "eslint-plugin-oxlint": "^0.11.1",
     "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-react-hooks": "5.0.0",
     "form-data": "~4.0.1",
     "globals": "^15.12.0",
     "lodash": "^4.17.21",
-    "oxlint": "^0.11.0",
+    "oxlint": "^0.11.1",
     "postcss": "^8.4.47",
     "postcss-preset-mantine": "^1.17.0",
     "postcss-simple-vars": "^7.0.1",
     "prettier": "~3.3.3",
     "prettier-plugin-sort-json": "^4.0.0",
-    "rollup": "^4.24.4",
+    "rollup": "^4.25.0",
     "swagger-typescript-api": "^13.0.22",
     "tslib": "^2.8.1",
     "typescript": "5.6.3",
     "vite": "^5.4.10",
     "vite-plugin-pages": "^0.32.3",
     "vite-plugin-prismjs": "^0.0.11",
     "vite-plugin-webfont-dl": "^3.9.5",
-    "vite-tsconfig-paths": "^5.1.0"
+    "vite-tsconfig-paths": "^5.1.1"
   },
   "pnpm": {
     "overrides": {