Skip to content

Commit

Permalink
Merge branch 'jhipster:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
BingZi-233 authored Nov 6, 2024
2 parents 0079c8d + a06392f commit 63d965f
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 28 deletions.
61 changes: 40 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"vue-router": "4.4.5"
},
"devDependencies": {
"@eslint/js": "9.13.0",
"@eslint/js": "9.14.0",
"@prettier/plugin-pug": "3.2.0",
"@prettier/plugin-xml": "3.4.1",
"@tikui/core": "6.2.1",
Expand All @@ -66,7 +66,7 @@
"@vitest/coverage-istanbul": "2.1.4",
"@vue/test-utils": "2.4.6",
"cypress": "13.15.1",
"eslint": "9.13.0",
"eslint": "9.14.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "4.1.0",
"eslint-plugin-pug": "1.2.5",
Expand All @@ -85,7 +85,7 @@
"prettier-plugin-packagejson": "2.5.3",
"prettier-plugin-sh": "0.14.0",
"rimraf": "6.0.1",
"sass": "1.80.5",
"sass": "1.80.6",
"serve": "14.2.4",
"sinon": "19.0.2",
"start-server-and-test": "2.0.8",
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/generator/dependencies/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"browser-sync": "3.0.3",
"cssnano": "7.0.6",
"cypress": "13.15.1",
"eslint": "9.13.0",
"eslint": "9.14.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "4.1.0",
"globals": "15.11.0",
Expand All @@ -29,7 +29,7 @@
"i18next-http-backend": "2.6.2",
"jest": "29.7.0",
"jsdom": "25.0.1",
"keycloak-js": "26.0.4",
"keycloak-js": "26.0.5",
"lint-staged": "15.2.10",
"mkdirp": "3.0.1",
"node": "22.11.0",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/generator/dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<jqwik.version>1.9.1</jqwik.version>
<!-- Maven Plugins -->
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
<protobuf-maven-plugin.version>2.6.5</protobuf-maven-plugin.version>
<protobuf-maven-plugin.version>2.6.6</protobuf-maven-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<git-commit-id-plugin.version>9.0.1</git-commit-id-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"react-hook-form": "7.53.1",
"react-i18next": "15.1.0",
"react-scripts": "5.0.1",
"sass": "1.80.5",
"sass": "1.80.6",
"ts-node": "10.9.2"
}
}

0 comments on commit 63d965f

Please sign in to comment.