Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 463fa88

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/client/antd-img-crop-4.12.2
2 parents abf2579 + 555d2cd commit 463fa88

File tree

10 files changed

+1227
-112
lines changed

10 files changed

+1227
-112
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@dnd-kit/sortable": "^6.0.0",
2222
"@dnd-kit/utilities": "^3.1.0",
2323
"@fortawesome/fontawesome-svg-core": "^6.2.0",
24-
"@fortawesome/free-regular-svg-icons": "^6.2.0",
24+
"@fortawesome/free-regular-svg-icons": "^6.4.0",
2525
"@fortawesome/free-solid-svg-icons": "^6.2.0",
2626
"@fortawesome/react-fontawesome": "latest",
2727
"@manaflair/redux-batch": "^1.0.0",
@@ -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: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3083,6 +3083,13 @@ __metadata:
30833083
languageName: node
30843084
linkType: hard
30853085

3086+
"@fortawesome/fontawesome-common-types@npm:6.4.0":
3087+
version: 6.4.0
3088+
resolution: "@fortawesome/fontawesome-common-types@npm:6.4.0"
3089+
checksum: a9b79136caa615352bd921cfe2710516321b402cd76c3f0ae68e579a7e3d7645c5a5c0ecd7516c0b207adeeffd1d2174978638d8c0d3c8c937d66fca4f2ff556
3090+
languageName: node
3091+
linkType: hard
3092+
30863093
"@fortawesome/fontawesome-svg-core@npm:^6.2.0":
30873094
version: 6.2.0
30883095
resolution: "@fortawesome/fontawesome-svg-core@npm:6.2.0"
@@ -3092,12 +3099,12 @@ __metadata:
30923099
languageName: node
30933100
linkType: hard
30943101

3095-
"@fortawesome/free-regular-svg-icons@npm:^6.2.0":
3096-
version: 6.2.0
3097-
resolution: "@fortawesome/free-regular-svg-icons@npm:6.2.0"
3102+
"@fortawesome/free-regular-svg-icons@npm:^6.4.0":
3103+
version: 6.4.0
3104+
resolution: "@fortawesome/free-regular-svg-icons@npm:6.4.0"
30983105
dependencies:
3099-
"@fortawesome/fontawesome-common-types": 6.2.0
3100-
checksum: 1b68a25590b273653c7adfa18bd6ef0ee533710687a46ef21c7b5395deae280a2faaff0b024717d9e54fdaedb8165769f281342704821777f86316223d5264ba
3106+
"@fortawesome/fontawesome-common-types": 6.4.0
3107+
checksum: a52689349b858a73b179532a207f98d9ee0f28b31e22eaffa6ce23cf3bfec8cc52bcd35770a0943a2dd1328bafbfdea6809231abee7a8601796bc0fb9759d25f
31013108
languageName: node
31023109
linkType: hard
31033110

@@ -3140,12 +3147,12 @@ __metadata:
31403147
languageName: node
31413148
linkType: hard
31423149

3143-
"@fullcalendar/interaction@npm:^6.0.3":
3144-
version: 6.0.3
3145-
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"
31463153
peerDependencies:
3147-
"@fullcalendar/core": ~6.0.3
3148-
checksum: 07c3405e2367ec76c3462a7e8c3faf5699e156c615752c419bf7e4ed9cd9acdadc35e965e7794ed30e140c647bc62bb66e1a604e54f5d747716a2f41048859ab
3154+
"@fullcalendar/core": ~6.1.6
3155+
checksum: b7dea490592cdaf902788825ebea122816185657bb37f82dd78ba8129d10fff0c1c45a70d819dd44b5b7088d8b51588899e8e2332652fd939e263160912940dd
31493156
languageName: node
31503157
linkType: hard
31513158

@@ -5206,12 +5213,12 @@ __metadata:
52065213
languageName: node
52075214
linkType: hard
52085215

5209-
"@types/tern@npm:0.22.0":
5210-
version: 0.22.0
5211-
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"
52125219
dependencies:
52135220
"@types/estree": "*"
5214-
checksum: c27a699537951a8396c495dec5251c3ed3a96f2f7d13c0aefc3ceebca2ad5a833a552737b3948bf2cbee7f0a62d3be48958d154238d5f4e4ee62c71eefc5b14b
5221+
checksum: d8fd304f147ed08f1d075f09cb8d440b7f785f69c9ec5c30eadf98132fe3f58f3b1bbbd11283858bb261afac5a2039c1c255f290b0f6e4a47cd6a746f30a6aa8
52155222
languageName: node
52165223
linkType: hard
52175224

@@ -8601,13 +8608,13 @@ __metadata:
86018608
languageName: node
86028609
linkType: hard
86038610

8604-
"echarts@npm:^5.3.3":
8605-
version: 5.3.3
8606-
resolution: "echarts@npm:5.3.3"
8611+
"echarts@npm:^5.4.2":
8612+
version: 5.4.2
8613+
resolution: "echarts@npm:5.4.2"
86078614
dependencies:
86088615
tslib: 2.3.0
8609-
zrender: 5.3.2
8610-
checksum: d6feb97132418421de56c18ae1e9c103849156cde1aa41804d463cf1904eec1f8994f63c0c2cd87e48574556ab408c7a05eeacb6fea2cae5843dcf8c041de515
8616+
zrender: 5.4.3
8617+
checksum: 933c28dada362314f7c7a5fd4243b44b24f75adb233f7c87541ac9a81734cb380a9683c3f56c8e559dacfddd363879e95a96f0047e33820123cd8f5b95b60f8f
86118618
languageName: node
86128619
linkType: hard
86138620

@@ -14321,7 +14328,7 @@ __metadata:
1432114328
dependencies:
1432214329
"@fullcalendar/core": ^6.0.3
1432314330
"@fullcalendar/daygrid": ^6.0.3
14324-
"@fullcalendar/interaction": ^6.0.3
14331+
"@fullcalendar/interaction": ^6.1.6
1432514332
"@fullcalendar/list": ^6.0.3
1432614333
"@fullcalendar/moment": ^6.1.4
1432714334
"@fullcalendar/react": ^6.0.3
@@ -14467,7 +14474,7 @@ __metadata:
1446714474
"@dnd-kit/sortable": ^6.0.0
1446814475
"@dnd-kit/utilities": ^3.1.0
1446914476
"@fortawesome/fontawesome-svg-core": ^6.2.0
14470-
"@fortawesome/free-regular-svg-icons": ^6.2.0
14477+
"@fortawesome/free-regular-svg-icons": ^6.4.0
1447114478
"@fortawesome/free-solid-svg-icons": ^6.2.0
1447214479
"@fortawesome/react-fontawesome": latest
1447314480
"@manaflair/redux-batch": ^1.0.0
@@ -14495,7 +14502,7 @@ __metadata:
1449514502
copy-to-clipboard: ^3.3.1
1449614503
core-js: ^3.25.2
1449714504
dotenv: ^16.0.3
14498-
echarts: ^5.3.3
14505+
echarts: ^5.4.2
1449914506
eslint: ^8.0.0
1450014507
eslint-config-react-app: ^7.0.1
1450114508
eslint-plugin-only-ascii: ^0.0.0
@@ -14537,7 +14544,7 @@ __metadata:
1453714544
react-signature-canvas: ^1.0.6
1453814545
react-test-renderer: ^18.1.0
1453914546
react-use: ^17.3.2
14540-
really-relaxed-json: ^0.3.1
14547+
really-relaxed-json: ^0.3.2
1454114548
redux-devtools-extension: ^2.13.9
1454214549
redux-saga: ^1.1.3
1454314550
regenerator-runtime: ^0.13.9
@@ -16639,10 +16646,10 @@ __metadata:
1663916646
languageName: node
1664016647
linkType: hard
1664116648

16642-
"really-relaxed-json@npm:^0.3.1":
16643-
version: 0.3.1
16644-
resolution: "really-relaxed-json@npm:0.3.1"
16645-
checksum: 15220eb39be2c2bbec75508651ea1e6b0c6f5d0a56862ccef323341ed7a21fe27ce15d6dd1c35fc9b78cedba9a6aeef433e4bddb7bd4127d640968dcfe478bf9
16649+
"really-relaxed-json@npm:^0.3.2":
16650+
version: 0.3.2
16651+
resolution: "really-relaxed-json@npm:0.3.2"
16652+
checksum: ed5ae25fa19ca8cd1cd28446d51c0965f0cd6ff62979921607d4a9a99ba58176c4fb887e841c94c5598628e61ac84f4b63e03d0b502d436573f3ffd169be50d8
1664616653
languageName: node
1664716654
linkType: hard
1664816655

@@ -18352,7 +18359,7 @@ __metadata:
1835218359
"@types/shelljs": ^0.8.11
1835318360
"@types/styled-components": ^5.1.19
1835418361
"@types/stylis": ^4.0.2
18355-
"@types/tern": 0.22.0
18362+
"@types/tern": 0.23.4
1835618363
"@types/toposort": ^2.0.3
1835718364
"@types/ua-parser-js": ^0.7.36
1835818365
"@welldone-software/why-did-you-render": ^6.2.3
@@ -20101,12 +20108,12 @@ __metadata:
2010120108
languageName: node
2010220109
linkType: hard
2010320110

20104-
"zrender@npm:5.3.2":
20105-
version: 5.3.2
20106-
resolution: "zrender@npm:5.3.2"
20111+
"zrender@npm:5.4.3":
20112+
version: 5.4.3
20113+
resolution: "zrender@npm:5.4.3"
2010720114
dependencies:
2010820115
tslib: 2.3.0
20109-
checksum: 8f7f4c825cb0e21ff897cd9d4fad291dd0c45604546981ec78c1b6b65359875458c05b4d5eef9a1a52f1aa758b0dbfc923df3bd419a1b880a17963d15813a9ff
20116+
checksum: ae89584fbe4256217e500a74183fd5870a2bed7e7b3234cd78fcbc0a1a82da8449596b2019105927069531b567ecf94425fb171abd6cedcbf517e52fdf438722
2011020117
languageName: node
2011120118
linkType: hard
2011220119

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

AltStyle によって変換されたページ (->オリジナル) /