Skip to content

Commit 1f426db

Browse files
falnyrfalnyr
authored
Merge branch 'main' into dependabot/npm_and_yarn/client/fortawesome/free-regular-svg-icons-6.4.0
2 parents d6ccd48 + c6a9cfa commit 1f426db

File tree

10 files changed

+1213
-105
lines changed

10 files changed

+1213
-105
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"clsx": "^1.2.1",
4343
"copy-to-clipboard": "^3.3.1",
4444
"core-js": "^3.25.2",
45-
"echarts": "^5.3.3",
45+
"echarts": "^5.4.2",
4646
"eslint4b-prebuilt-2": "^7.32.0",
4747
"file-saver": "^2.0.5",
4848
"github-markdown-css": "^5.1.0",
@@ -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: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3147,12 +3147,12 @@ __metadata:
31473147
languageName: node
31483148
linkType: hard
31493149

3150-
"@fullcalendar/interaction@npm:^6.0.3":
3151-
version: 6.0.3
3152-
resolution: "@fullcalendar/interaction@npm:6.0.3"
3150+
"@fullcalendar/interaction@npm:^6.1.6":
3151+
version: 6.1.6
3152+
resolution: "@fullcalendar/interaction@npm:6.1.6"
31533153
peerDependencies:
3154-
"@fullcalendar/core": ~6.0.3
3155-
checksum: 07c3405e2367ec76c3462a7e8c3faf5699e156c615752c419bf7e4ed9cd9acdadc35e965e7794ed30e140c647bc62bb66e1a604e54f5d747716a2f41048859ab
3154+
"@fullcalendar/core": ~6.1.6
3155+
checksum: b7dea490592cdaf902788825ebea122816185657bb37f82dd78ba8129d10fff0c1c45a70d819dd44b5b7088d8b51588899e8e2332652fd939e263160912940dd
31563156
languageName: node
31573157
linkType: hard
31583158

@@ -5213,12 +5213,12 @@ __metadata:
52135213
languageName: node
52145214
linkType: hard
52155215

5216-
"@types/tern@npm:0.22.0":
5217-
version: 0.22.0
5218-
resolution: "@types/tern@npm:0.22.0"
5216+
"@types/tern@npm:0.23.4":
5217+
version: 0.23.4
5218+
resolution: "@types/tern@npm:0.23.4"
52195219
dependencies:
52205220
"@types/estree": "*"
5221-
checksum: c27a699537951a8396c495dec5251c3ed3a96f2f7d13c0aefc3ceebca2ad5a833a552737b3948bf2cbee7f0a62d3be48958d154238d5f4e4ee62c71eefc5b14b
5221+
checksum: d8fd304f147ed08f1d075f09cb8d440b7f785f69c9ec5c30eadf98132fe3f58f3b1bbbd11283858bb261afac5a2039c1c255f290b0f6e4a47cd6a746f30a6aa8
52225222
languageName: node
52235223
linkType: hard
52245224

@@ -8600,13 +8600,13 @@ __metadata:
86008600
languageName: node
86018601
linkType: hard
86028602

8603-
"echarts@npm:^5.3.3":
8604-
version: 5.3.3
8605-
resolution: "echarts@npm:5.3.3"
8603+
"echarts@npm:^5.4.2":
8604+
version: 5.4.2
8605+
resolution: "echarts@npm:5.4.2"
86068606
dependencies:
86078607
tslib: 2.3.0
8608-
zrender: 5.3.2
8609-
checksum: d6feb97132418421de56c18ae1e9c103849156cde1aa41804d463cf1904eec1f8994f63c0c2cd87e48574556ab408c7a05eeacb6fea2cae5843dcf8c041de515
8608+
zrender: 5.4.3
8609+
checksum: 933c28dada362314f7c7a5fd4243b44b24f75adb233f7c87541ac9a81734cb380a9683c3f56c8e559dacfddd363879e95a96f0047e33820123cd8f5b95b60f8f
86108610
languageName: node
86118611
linkType: hard
86128612

@@ -14320,7 +14320,7 @@ __metadata:
1432014320
dependencies:
1432114321
"@fullcalendar/core": ^6.0.3
1432214322
"@fullcalendar/daygrid": ^6.0.3
14323-
"@fullcalendar/interaction": ^6.0.3
14323+
"@fullcalendar/interaction": ^6.1.6
1432414324
"@fullcalendar/list": ^6.0.3
1432514325
"@fullcalendar/moment": ^6.1.4
1432614326
"@fullcalendar/react": ^6.0.3
@@ -14494,7 +14494,7 @@ __metadata:
1449414494
copy-to-clipboard: ^3.3.1
1449514495
core-js: ^3.25.2
1449614496
dotenv: ^16.0.3
14497-
echarts: ^5.3.3
14497+
echarts: ^5.4.2
1449814498
eslint: ^8.0.0
1449914499
eslint-config-react-app: ^7.0.1
1450014500
eslint-plugin-only-ascii: ^0.0.0
@@ -14536,7 +14536,7 @@ __metadata:
1453614536
react-signature-canvas: ^1.0.6
1453714537
react-test-renderer: ^18.1.0
1453814538
react-use: ^17.3.2
14539-
really-relaxed-json: ^0.3.1
14539+
really-relaxed-json: ^0.3.2
1454014540
redux-devtools-extension: ^2.13.9
1454114541
redux-saga: ^1.1.3
1454214542
regenerator-runtime: ^0.13.9
@@ -16638,10 +16638,10 @@ __metadata:
1663816638
languageName: node
1663916639
linkType: hard
1664016640

16641-
"really-relaxed-json@npm:^0.3.1":
16642-
version: 0.3.1
16643-
resolution: "really-relaxed-json@npm:0.3.1"
16644-
checksum: 15220eb39be2c2bbec75508651ea1e6b0c6f5d0a56862ccef323341ed7a21fe27ce15d6dd1c35fc9b78cedba9a6aeef433e4bddb7bd4127d640968dcfe478bf9
16641+
"really-relaxed-json@npm:^0.3.2":
16642+
version: 0.3.2
16643+
resolution: "really-relaxed-json@npm:0.3.2"
16644+
checksum: ed5ae25fa19ca8cd1cd28446d51c0965f0cd6ff62979921607d4a9a99ba58176c4fb887e841c94c5598628e61ac84f4b63e03d0b502d436573f3ffd169be50d8
1664516645
languageName: node
1664616646
linkType: hard
1664716647

@@ -18351,7 +18351,7 @@ __metadata:
1835118351
"@types/shelljs": ^0.8.11
1835218352
"@types/styled-components": ^5.1.19
1835318353
"@types/stylis": ^4.0.2
18354-
"@types/tern": 0.22.0
18354+
"@types/tern": 0.23.4
1835518355
"@types/toposort": ^2.0.3
1835618356
"@types/ua-parser-js": ^0.7.36
1835718357
"@welldone-software/why-did-you-render": ^6.2.3
@@ -20100,12 +20100,12 @@ __metadata:
2010020100
languageName: node
2010120101
linkType: hard
2010220102

20103-
"zrender@npm:5.3.2":
20104-
version: 5.3.2
20105-
resolution: "zrender@npm:5.3.2"
20103+
"zrender@npm:5.4.3":
20104+
version: 5.4.3
20105+
resolution: "zrender@npm:5.4.3"
2010620106
dependencies:
2010720107
tslib: 2.3.0
20108-
checksum: 8f7f4c825cb0e21ff897cd9d4fad291dd0c45604546981ec78c1b6b65359875458c05b4d5eef9a1a52f1aa758b0dbfc923df3bd419a1b880a17963d15813a9ff
20108+
checksum: ae89584fbe4256217e500a74183fd5870a2bed7e7b3234cd78fcbc0a1a82da8449596b2019105927069531b567ecf94425fb171abd6cedcbf517e52fdf438722
2010920109
languageName: node
2011020110
linkType: hard
2011120111

‎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)