Skip to content

Commit 0786dbc

Browse files
falnyrfalnyr
authored
Merge branch 'main' into dependabot/npm_and_yarn/client/echarts-5.4.2
2 parents 9cfc361 + 35188a1 commit 0786dbc

File tree

10 files changed

+1202
-94
lines changed

10 files changed

+1202
-94
lines changed

‎.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
uses: SonarSource/sonarcloud-github-action@master
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
27-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
27+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@types/shelljs": "^0.8.11",
3939
"@types/styled-components": "^5.1.19",
4040
"@types/stylis": "^4.0.2",
41-
"@types/tern": "0.22.0",
41+
"@types/tern": "0.23.4",
4242
"@types/toposort": "^2.0.3",
4343
"@types/ua-parser-js": "^0.7.36",
4444
"@welldone-software/why-did-you-render": "^6.2.3",

‎client/packages/openblocks-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"@fullcalendar/core": "^6.0.3",
88
"@fullcalendar/daygrid": "^6.0.3",
9-
"@fullcalendar/interaction": "^6.0.3",
9+
"@fullcalendar/interaction": "^6.1.6",
1010
"@fullcalendar/list": "^6.0.3",
1111
"@fullcalendar/moment": "^6.1.4",
1212
"@fullcalendar/react": "^6.0.3",

‎client/packages/openblocks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"react-signature-canvas": "^1.0.6",
8080
"react-test-renderer": "^18.1.0",
8181
"react-use": "^17.3.2",
82-
"really-relaxed-json": "^0.3.1",
82+
"really-relaxed-json": "^0.3.2",
8383
"redux-devtools-extension": "^2.13.9",
8484
"redux-saga": "^1.1.3",
8585
"regenerator-runtime": "^0.13.9",

‎client/yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3140,12 +3140,12 @@ __metadata:
31403140
languageName: node
31413141
linkType: hard
31423142

3143-
"@fullcalendar/interaction@npm:^6.0.3":
3144-
version: 6.0.3
3145-
resolution: "@fullcalendar/interaction@npm:6.0.3"
3143+
"@fullcalendar/interaction@npm:^6.1.6":
3144+
version: 6.1.6
3145+
resolution: "@fullcalendar/interaction@npm:6.1.6"
31463146
peerDependencies:
3147-
"@fullcalendar/core": ~6.0.3
3148-
checksum: 07c3405e2367ec76c3462a7e8c3faf5699e156c615752c419bf7e4ed9cd9acdadc35e965e7794ed30e140c647bc62bb66e1a604e54f5d747716a2f41048859ab
3147+
"@fullcalendar/core": ~6.1.6
3148+
checksum: b7dea490592cdaf902788825ebea122816185657bb37f82dd78ba8129d10fff0c1c45a70d819dd44b5b7088d8b51588899e8e2332652fd939e263160912940dd
31493149
languageName: node
31503150
linkType: hard
31513151

@@ -5206,12 +5206,12 @@ __metadata:
52065206
languageName: node
52075207
linkType: hard
52085208

5209-
"@types/tern@npm:0.22.0":
5210-
version: 0.22.0
5211-
resolution: "@types/tern@npm:0.22.0"
5209+
"@types/tern@npm:0.23.4":
5210+
version: 0.23.4
5211+
resolution: "@types/tern@npm:0.23.4"
52125212
dependencies:
52135213
"@types/estree": "*"
5214-
checksum: c27a699537951a8396c495dec5251c3ed3a96f2f7d13c0aefc3ceebca2ad5a833a552737b3948bf2cbee7f0a62d3be48958d154238d5f4e4ee62c71eefc5b14b
5214+
checksum: d8fd304f147ed08f1d075f09cb8d440b7f785f69c9ec5c30eadf98132fe3f58f3b1bbbd11283858bb261afac5a2039c1c255f290b0f6e4a47cd6a746f30a6aa8
52155215
languageName: node
52165216
linkType: hard
52175217

@@ -14313,7 +14313,7 @@ __metadata:
1431314313
dependencies:
1431414314
"@fullcalendar/core": ^6.0.3
1431514315
"@fullcalendar/daygrid": ^6.0.3
14316-
"@fullcalendar/interaction": ^6.0.3
14316+
"@fullcalendar/interaction": ^6.1.6
1431714317
"@fullcalendar/list": ^6.0.3
1431814318
"@fullcalendar/moment": ^6.1.4
1431914319
"@fullcalendar/react": ^6.0.3
@@ -14529,7 +14529,7 @@ __metadata:
1452914529
react-signature-canvas: ^1.0.6
1453014530
react-test-renderer: ^18.1.0
1453114531
react-use: ^17.3.2
14532-
really-relaxed-json: ^0.3.1
14532+
really-relaxed-json: ^0.3.2
1453314533
redux-devtools-extension: ^2.13.9
1453414534
redux-saga: ^1.1.3
1453514535
regenerator-runtime: ^0.13.9
@@ -16631,10 +16631,10 @@ __metadata:
1663116631
languageName: node
1663216632
linkType: hard
1663316633

16634-
"really-relaxed-json@npm:^0.3.1":
16635-
version: 0.3.1
16636-
resolution: "really-relaxed-json@npm:0.3.1"
16637-
checksum: 15220eb39be2c2bbec75508651ea1e6b0c6f5d0a56862ccef323341ed7a21fe27ce15d6dd1c35fc9b78cedba9a6aeef433e4bddb7bd4127d640968dcfe478bf9
16634+
"really-relaxed-json@npm:^0.3.2":
16635+
version: 0.3.2
16636+
resolution: "really-relaxed-json@npm:0.3.2"
16637+
checksum: ed5ae25fa19ca8cd1cd28446d51c0965f0cd6ff62979921607d4a9a99ba58176c4fb887e841c94c5598628e61ac84f4b63e03d0b502d436573f3ffd169be50d8
1663816638
languageName: node
1663916639
linkType: hard
1664016640

@@ -18344,7 +18344,7 @@ __metadata:
1834418344
"@types/shelljs": ^0.8.11
1834518345
"@types/styled-components": ^5.1.19
1834618346
"@types/stylis": ^4.0.2
18347-
"@types/tern": 0.22.0
18347+
"@types/tern": 0.23.4
1834818348
"@types/toposort": ^2.0.3
1834918349
"@types/ua-parser-js": ^0.7.36
1835018350
"@welldone-software/why-did-you-render": ^6.2.3

‎server/api-service/openblocks-plugins/graphqlPlugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>org.springframework.boot</groupId>
109109
<artifactId>spring-boot-starter-webflux</artifactId>
110-
<version>2.5.5</version>
110+
<version>2.5.12</version>
111111
<scope>test</scope>
112112
</dependency>
113113
<dependency>

‎server/api-service/openblocks-plugins/snowflakePlugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>net.snowflake</groupId>
3131
<artifactId>snowflake-jdbc</artifactId>
32-
<version>3.13.27</version>
32+
<version>3.13.29</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.openblocks</groupId>

‎server/node-service/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"copyfiles": "^2.4.1",
2222
"jest": "^29.3.1",
2323
"nock": "^13.3.0",
24-
"nodemon": "^2.0.20",
24+
"nodemon": "^2.0.22",
2525
"postman-to-openapi": "^3.0.1",
2626
"svgo": "^3.0.2",
2727
"ts-jest": "^29.0.3",
@@ -33,7 +33,7 @@
3333
"@aws-sdk/client-dynamodb": "^3.266.1",
3434
"@aws-sdk/client-lambda": "^3.272.0",
3535
"@aws-sdk/client-s3": "^3.238.0",
36-
"@aws-sdk/s3-request-presigner": "^3.241.0",
36+
"@aws-sdk/s3-request-presigner": "^3.321.1",
3737
"@google-cloud/bigquery": "^6.1.0",
3838
"@google-cloud/storage": "^6.9.3",
3939
"@supabase/supabase-js": "^2.10.0",
@@ -42,7 +42,7 @@
4242
"@types/jsonpath": "^0.2.0",
4343
"@types/lodash": "^4.14.190",
4444
"@types/morgan": "^1.9.3",
45-
"@types/node": "^18.11.18",
45+
"@types/node": "^18.16.3",
4646
"@types/node-fetch": "^2.6.2",
4747
"axios": "^1.2.0",
4848
"base64-arraybuffer": "^1.0.2",
@@ -60,12 +60,12 @@
6060
"node-fetch": "2",
6161
"openapi-types": "^12.1.0",
6262
"openblocks-core": "^0.0.7",
63-
"openblocks-sdk": "0.0.38",
63+
"openblocks-sdk": "0.0.40",
6464
"pino": "^8.11.0",
6565
"prom-client": "^14.2.0",
6666
"proxy-agent": "^5.0.0",
6767
"stylis": "^4.1.3",
68-
"swagger-client": "^3.18.5",
68+
"swagger-client": "^3.19.7",
6969
"typescript": "^4.9.3",
7070
"yaml": "^2.2.2"
7171
},

0 commit comments

Comments
 (0)