Skip to content

Commit ac87747

Browse files
jtkieseljtkiesel
authored
Merge branch 'main' into refactor/prettier-path-and-comment
2 parents ae983d9 + a1b05b4 commit ac87747

File tree

4 files changed

+52
-43
lines changed

4 files changed

+52
-43
lines changed

‎packages/java-parser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "java-parser",
3-
"version": "2.3.3",
3+
"version": "2.3.4",
44
"description": "Java Parser in JavaScript",
55
"type": "module",
66
"exports": {

‎packages/prettier-plugin-java/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prettier-plugin-java",
3-
"version": "2.6.7",
3+
"version": "2.6.8",
44
"description": "Prettier Java Plugin",
55
"type": "module",
66
"exports": {
@@ -14,7 +14,7 @@
1414
"repository": "https://github.com/jhipster/prettier-java",
1515
"license": "Apache-2.0",
1616
"dependencies": {
17-
"java-parser": "2.3.3"
17+
"java-parser": "2.3.4"
1818
},
1919
"scripts": {
2020
"test": "yarn run test:unit && yarn run test:e2e-core",

‎website/yarn.lock‎

Lines changed: 46 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -431,21 +431,13 @@
431431
"@babel/traverse" "^7.25.9"
432432
"@babel/types" "^7.25.9"
433433

434-
"@babel/helpers@^7.26.0":
435-
version "7.26.0"
436-
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4"
437-
integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==
434+
"@babel/helpers@^7.26.0", "@babel/helpers@^7.26.9":
435+
version "7.27.0"
436+
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.0.tgz#53d156098defa8243eab0f32fa17589075a1b808"
437+
integrity sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==
438438
dependencies:
439-
"@babel/template" "^7.25.9"
440-
"@babel/types" "^7.26.0"
441-
442-
"@babel/helpers@^7.26.9":
443-
version "7.26.9"
444-
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.9.tgz#28f3fb45252fc88ef2dc547c8a911c255fc9fef6"
445-
integrity sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==
446-
dependencies:
447-
"@babel/template" "^7.26.9"
448-
"@babel/types" "^7.26.9"
439+
"@babel/template" "^7.27.0"
440+
"@babel/types" "^7.27.0"
449441

450442
"@babel/parser@^7.25.9", "@babel/parser@^7.26.0":
451443
version "7.26.1"
@@ -461,6 +453,13 @@
461453
dependencies:
462454
"@babel/types" "^7.26.9"
463455

456+
"@babel/parser@^7.27.0":
457+
version "7.27.0"
458+
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.0.tgz#3d7d6ee268e41d2600091cbd4e145ffee85a44ec"
459+
integrity sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==
460+
dependencies:
461+
"@babel/types" "^7.27.0"
462+
464463
"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
465464
version "7.25.9"
466465
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe"
@@ -1255,24 +1254,17 @@
12551254
"@babel/plugin-transform-typescript" "^7.25.9"
12561255

12571256
"@babel/runtime-corejs3@^7.25.9":
1258-
version "7.26.9"
1259-
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.26.9.tgz#8b73bae47453aa3dd2839ac52598581a7dd8332f"
1260-
integrity sha512-5EVjbTegqN7RSJle6hMWYxO4voo4rI+9krITk+DWR+diJgGrjZjrIBnJhjrHYYQsFgI7j1w1QnrvV7YSKBfYGg==
1257+
version "7.27.0"
1258+
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.27.0.tgz#c766df350ec7a2caf3ed64e3659b100954589413"
1259+
integrity sha512-UWjX6t+v+0ckwZ50Y5ShZLnlk95pP5MyW/pon9tiYzl3+18pkTHTFNTKr7rQbfRXPkowt2QAn30o1b6oswszew==
12611260
dependencies:
12621261
core-js-pure "^3.30.2"
12631262
regenerator-runtime "^0.14.0"
12641263

1265-
"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.8.4":
1266-
version "7.26.0"
1267-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
1268-
integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
1269-
dependencies:
1270-
regenerator-runtime "^0.14.0"
1271-
1272-
"@babel/runtime@^7.25.9":
1273-
version "7.26.9"
1274-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.9.tgz#aa4c6facc65b9cb3f87d75125ffd47781b475433"
1275-
integrity sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==
1264+
"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.25.9", "@babel/runtime@^7.8.4":
1265+
version "7.27.0"
1266+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.0.tgz#fbee7cf97c709518ecc1f590984481d5460d4762"
1267+
integrity sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==
12761268
dependencies:
12771269
regenerator-runtime "^0.14.0"
12781270

@@ -1294,6 +1286,15 @@
12941286
"@babel/parser" "^7.26.9"
12951287
"@babel/types" "^7.26.9"
12961288

1289+
"@babel/template@^7.27.0":
1290+
version "7.27.0"
1291+
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.0.tgz#b253e5406cc1df1c57dcd18f11760c2dbf40c0b4"
1292+
integrity sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==
1293+
dependencies:
1294+
"@babel/code-frame" "^7.26.2"
1295+
"@babel/parser" "^7.27.0"
1296+
"@babel/types" "^7.27.0"
1297+
12971298
"@babel/traverse@^7.25.9":
12981299
version "7.25.9"
12991300
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84"
@@ -1336,6 +1337,14 @@
13361337
"@babel/helper-string-parser" "^7.25.9"
13371338
"@babel/helper-validator-identifier" "^7.25.9"
13381339

1340+
"@babel/types@^7.27.0":
1341+
version "7.27.0"
1342+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.0.tgz#ef9acb6b06c3173f6632d993ecb6d4ae470b4559"
1343+
integrity sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==
1344+
dependencies:
1345+
"@babel/helper-string-parser" "^7.25.9"
1346+
"@babel/helper-validator-identifier" "^7.25.9"
1347+
13391348
"@colors/colors@1.5.0":
13401349
version "1.5.0"
13411350
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -4549,9 +4558,9 @@ estree-util-to-js@^2.0.0:
45494558
source-map "^0.7.0"
45504559

45514560
estree-util-value-to-estree@^3.0.1:
4552-
version "3.1.2"
4553-
resolved "https://registry.yarnpkg.com/estree-util-value-to-estree/-/estree-util-value-to-estree-3.1.2.tgz#d2f0e5d350a6c181673eb7299743325b86a9bf5c"
4554-
integrity sha512-S0gW2+XZkmsx00tU2uJ4L9hUT7IFabbml9pHh2WQqFmAbxit++YGZne0sKJbNwkj9Wvg9E4uqWl4nCIFQMmfag==
4561+
version "3.3.3"
4562+
resolved "https://registry.yarnpkg.com/estree-util-value-to-estree/-/estree-util-value-to-estree-3.3.3.tgz#800b03a551b466dd77ed2c574b042a9992546cf2"
4563+
integrity sha512-Db+m1WSD4+mUO7UgMeKkAwdbfNWwIxLt48XF2oFU9emPfXkIu+k5/nlOj313v7wqtAPo0f9REhUvznFrPkG8CQ==
45554564
dependencies:
45564565
"@types/estree" "^1.0.0"
45574566

@@ -5350,9 +5359,9 @@ http-parser-js@>=0.5.1:
53505359
integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
53515360

53525361
http-proxy-middleware@^2.0.3:
5353-
version "2.0.7"
5354-
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
5355-
integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
5362+
version "2.0.9"
5363+
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz#e9e63d68afaa4eee3d147f39149ab84c0c2815ef"
5364+
integrity sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==
53565365
dependencies:
53575366
"@types/http-proxy" "^1.17.8"
53585367
http-proxy "^1.18.1"
@@ -7714,9 +7723,9 @@ prism-react-renderer@^2.3.0:
77147723
clsx "^2.0.0"
77157724

77167725
prismjs@^1.29.0:
7717-
version "1.29.0"
7718-
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
7719-
integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
7726+
version "1.30.0"
7727+
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.30.0.tgz#d9709969d9d4e16403f6f348c63553b19f0975a9"
7728+
integrity sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==
77207729

77217730
process-nextick-args@~2.0.0:
77227731
version "2.0.1"

‎yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,9 +1179,9 @@ asynckit@^0.4.0:
11791179
integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
11801180

11811181
axios@^1.7.4:
1182-
version "1.7.7"
1183-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
1184-
integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
1182+
version "1.8.4"
1183+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447"
1184+
integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
11851185
dependencies:
11861186
follow-redirects "^1.15.6"
11871187
form-data "^4.0.0"

0 commit comments

Comments
 (0)