Skip to content

Commit f28f45b

Browse files
authored
Merge branch 'dev' into feat/v6
2 parents c90f16f + b45a19f commit f28f45b

File tree

4 files changed

+82
-24
lines changed

4 files changed

+82
-24
lines changed

.github/workflows/trivy.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Trivy Scanner
2+
3+
permissions:
4+
contents: read
5+
security-events: write
6+
on:
7+
push:
8+
branches:
9+
- main
10+
- dev
11+
pull_request:
12+
jobs:
13+
trivy-scan:
14+
name: Use Trivy
15+
runs-on: ubuntu-24.04
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
20+
- name: Run Trivy scanner in repo mode
21+
uses: aquasecurity/trivy-action@0.33.1
22+
with:
23+
scan-type: "fs"
24+
ignore-unfixed: true
25+
format: "sarif"
26+
output: "trivy-results.sarif"
27+
severity: "CRITICAL,HIGH,UNKNOWN"
28+
scanners: vuln,secret,misconfig,license
29+
github-pat: ${{ secrets.GITHUB_TOKEN }}
30+
31+
- name: Upload Trivy scan results to GitHub Security tab
32+
uses: github/codeql-action/upload-sarif@v3
33+
with:
34+
sarif_file: "trivy-results.sarif"

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @jmgasper @kkartunov

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@types/codemirror": "5.60.15",
3434
"amazon-s3-uri": "^0.1.1",
3535
"apexcharts": "^3.36.0",
36-
"axios": "^1.7.9",
36+
"axios": "^1.12.0",
3737
"browser-cookies": "^1.2.0",
3838
"city-timezones": "^1.2.1",
3939
"classnames": "^2.3.2",

yarn.lock

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5732,27 +5732,26 @@ axe-core@^4.10.0:
57325732
resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz#04145965ac7894faddbac30861e5d8f11bfd14fc"
57335733
integrity sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==
57345734

5735-
axios@*, axios@^1.7.4, axios@^1.7.9:
5736-
version "1.12.2"
5737-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.12.2.tgz#6c307390136cf7a2278d09cec63b136dfc6e6da7"
5738-
integrity sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==
5735+
axios@*, axios@^1.12.0, axios@^1.7.4:
5736+
version "1.12.0"
5737+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.12.0.tgz#11248459be05a5ee493485628fa0e4323d0abfc3"
5738+
integrity sha512-oXTDccv8PcfjZmPGlWsPSwtOJCZ/b6W5jAMCNcfwJbCzDckwG0jrYJFaWH1yvivfCXjVzV/SPDEhMB3Q+DSurg==
57395739
dependencies:
57405740
follow-redirects "^1.15.6"
57415741
form-data "^4.0.4"
57425742
proxy-from-env "^1.1.0"
57435743

5744-
axios@^0.27.2:
5745-
version "0.27.2"
5746-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
5747-
integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
5744+
axios@^0.25.0:
5745+
version "0.25.0"
5746+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
5747+
integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
57485748
dependencies:
5749-
follow-redirects "^1.14.9"
5750-
form-data "^4.0.0"
5749+
follow-redirects "^1.14.7"
57515750

5752-
axobject-query@^4.1.0:
5753-
version "4.1.0"
5754-
resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
5755-
integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
5751+
axobject-query@^2.2.0:
5752+
version "2.2.0"
5753+
resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
5754+
integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
57565755

57575756
babel-core@^7.0.0-bridge.0:
57585757
version "7.0.0-bridge.0"
@@ -8292,7 +8291,7 @@ es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
82928291
dependencies:
82938292
es-errors "^1.3.0"
82948293

8295-
es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:
8294+
es-set-tostringtag@^2.1.0:
82968295
version "2.1.0"
82978296
resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
82988297
integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
@@ -8302,6 +8301,16 @@ es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:
83028301
has-tostringtag "^1.0.2"
83038302
hasown "^2.0.2"
83048303

8304+
es-shim-unscopables@^1.0.0:
8305+
version "1.0.0"
8306+
resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
8307+
integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
8308+
dependencies:
8309+
es-errors "^1.3.0"
8310+
get-intrinsic "^1.2.6"
8311+
has-tostringtag "^1.0.2"
8312+
hasown "^2.0.2"
8313+
83058314
es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0:
83068315
version "1.1.0"
83078316
resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz#438df35520dac5d105f3943d927549ea3b00f4b5"
@@ -9455,15 +9464,15 @@ flux-standard-action@^2.0.3:
94559464
lodash.isplainobject "^4.0.6"
94569465
lodash.isstring "^4.0.1"
94579466

9458-
follow-redirects@^1.0.0, follow-redirects@^1.14.9, follow-redirects@^1.15.2, follow-redirects@^1.15.6:
9459-
version "1.15.11"
9460-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
9461-
integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
9467+
follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.15.6:
9468+
version "1.15.9"
9469+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
9470+
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
94629471

9463-
for-each@^0.3.3, for-each@^0.3.5:
9464-
version "0.3.5"
9465-
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
9466-
integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
9472+
for-each@^0.3.3:
9473+
version "0.3.3"
9474+
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
9475+
integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
94679476
dependencies:
94689477
is-callable "^1.2.7"
94699478

@@ -10000,13 +10009,27 @@ has-symbols@^1.0.1, has-symbols@^1.0.3, has-symbols@^1.1.0:
1000010009
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
1000110010
integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
1000210011

10012+
has-tostringtag@^1.0.0:
10013+
version "1.0.0"
10014+
resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
10015+
integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
10016+
dependencies:
10017+
has-symbols "^1.0.2"
10018+
1000310019
has-tostringtag@^1.0.2:
1000410020
version "1.0.2"
1000510021
resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
1000610022
integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
1000710023
dependencies:
1000810024
has-symbols "^1.0.3"
1000910025

10026+
has@^1.0.3:
10027+
version "1.0.3"
10028+
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
10029+
integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
10030+
dependencies:
10031+
has-symbols "^1.0.3"
10032+
1001010033
hasha@^5.0.0:
1001110034
version "5.2.2"
1001210035
resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"

0 commit comments

Comments
 (0)