generator-jhipster 8.2.1 → 8.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/environment-builder.mjs +3 -3
- package/dist/cli/jhipster-command.mjs +1 -2
- package/dist/cli/jhipster.cjs +0 -0
- package/dist/generators/angular/command.js +5 -0
- package/dist/generators/angular/generator.js +36 -9
- package/dist/generators/angular/index.js +1 -0
- package/dist/generators/angular/needle-api/needle-client-angular.js +3 -3
- package/dist/generators/angular/resources/package.json +13 -10
- package/dist/generators/angular/support/index.js +0 -1
- package/dist/generators/angular/support/translate-angular.js +142 -8
- package/dist/generators/angular/templates/package.json.ejs +0 -10
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs +18 -26
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +18 -25
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +10 -15
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +31 -46
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs +7 -8
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +20 -31
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.html.ejs +7 -12
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs +9 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +5 -9
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +12 -12
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +36 -36
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +33 -33
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +13 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.html.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs +2 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +26 -26
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +16 -18
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +1 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +20 -34
- package/dist/generators/angular/templates/src/main/webapp/app/app.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/tracker/tracker.service.ts.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +25 -25
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs +14 -14
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.spec.ts.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs +1 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +17 -24
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +14 -15
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.spec.ts.ejs +1 -5
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/footer/footer.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +11 -18
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +21 -21
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +11 -12
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs +1 -2
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.ts.ejs +1 -1
- package/dist/generators/app/generator.js +4 -4
- package/dist/generators/base/generator.js +21 -2
- package/dist/generators/base/shared-data.js +1 -2
- package/dist/generators/base/support/basename.js +1 -2
- package/dist/generators/base/support/needles.js +3 -5
- package/dist/generators/base/support/string.js +2 -2
- package/dist/generators/base-application/generator.js +4 -4
- package/dist/generators/base-application/support/entity.js +1 -2
- package/dist/generators/base-application/support/enum.js +2 -2
- package/dist/generators/base-application/support/prepare-entity.js +1 -1
- package/dist/generators/base-application/support/prepare-field.js +5 -6
- package/dist/generators/base-application/support/relationship.js +1 -2
- package/dist/generators/base-application/support/task-type-inference.js +6 -0
- package/dist/generators/base-core/generator.js +83 -14
- package/dist/generators/base-workspaces/internal/deployments.js +2 -2
- package/dist/generators/base-workspaces/internal/docker-dependencies.js +2 -2
- package/dist/generators/bootstrap/generator.js +4 -5
- package/dist/generators/bootstrap/internal/transform-utils.js +4 -0
- package/dist/generators/bootstrap/support/eslint-transform.js +2 -1
- package/dist/generators/bootstrap/support/java-unused-imports-transform.js +2 -1
- package/dist/generators/bootstrap/support/prettier-worker.js +2 -4
- package/dist/generators/bootstrap-application/generator.js +3 -4
- package/dist/generators/bootstrap-application-base/generator.js +4 -5
- package/dist/generators/bootstrap-application-base/utils.js +3 -3
- package/dist/generators/bootstrap-application-client/generator.js +2 -3
- package/dist/generators/bootstrap-application-server/generator.js +21 -15
- package/dist/generators/bootstrap-workspaces/generator.js +1 -2
- package/dist/generators/ci-cd/command.js +1 -2
- package/dist/generators/ci-cd/generator.js +3 -3
- package/dist/generators/client/command.js +1 -2
- package/dist/generators/client/generator.js +12 -12
- package/dist/generators/client/needle-api/needle-client-vue.js +2 -2
- package/dist/generators/client/resources/package.json +4 -4
- package/dist/generators/client/templates/src/main/webapp/index.html.ejs +1 -1
- package/dist/generators/common/generator.js +5 -5
- package/dist/generators/common/resources/package.json +1 -1
- package/dist/generators/cucumber/generator.js +17 -10
- package/dist/generators/cucumber/templates/buildSrc/src/main/groovy/jhipster.cucumber-conventions.gradle.ejs +1 -5
- package/dist/generators/cypress/generator.js +2 -3
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/administration/administration.cy.ts.ejs +10 -0
- package/dist/generators/docker/generator.js +4 -6
- package/dist/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs +0 -32
- package/dist/generators/docker/utils.js +2 -3
- package/dist/generators/docker-compose/generator.js +4 -5
- package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +0 -32
- package/dist/generators/entities/generator.js +4 -4
- package/dist/generators/entity/generator.js +10 -9
- package/dist/generators/entity/prompts.js +12 -12
- package/dist/generators/feign-client/generator.js +3 -4
- package/dist/generators/gatling/generator.js +2 -3
- package/dist/generators/generate-blueprint/files.js +1 -0
- package/dist/generators/generate-blueprint/generator.js +3 -4
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs +3 -2
- package/dist/generators/generate-blueprint/templates/generators/generator/command.mjs.ejs +19 -1
- package/dist/generators/generate-blueprint/templates/vitest.test-setup.ts.ejs +6 -0
- package/dist/generators/generator-constants.js +5 -2
- package/dist/generators/git/generator.js +3 -5
- package/dist/generators/gradle/command.js +32 -0
- package/dist/generators/gradle/constants.js +0 -1
- package/dist/generators/gradle/files.js +2 -8
- package/dist/generators/gradle/generator.js +85 -13
- package/dist/generators/gradle/generators/code-quality/generator.js +86 -0
- package/dist/generators/{java/cleanup.js → gradle/generators/code-quality/index.js} +1 -5
- package/dist/generators/gradle/generators/jib/generator.js +64 -0
- package/dist/generators/gradle/generators/jib/index.js +19 -0
- package/dist/generators/gradle/generators/node-gradle/generator.js +64 -0
- package/dist/generators/gradle/generators/node-gradle/index.js +19 -0
- package/dist/generators/gradle/generators/node-gradle/templates/buildSrc/src/main/groovy/jhipster.node-gradle-conventions.gradle.ejs +101 -0
- package/dist/generators/gradle/index.js +1 -0
- package/dist/generators/gradle/internal/needles.js +9 -3
- package/dist/generators/gradle/templates/buildSrc/build.gradle.ejs +3 -2
- package/dist/generators/gradle/templates/buildSrc/gradle/libs.versions.toml.ejs +8 -1
- package/dist/generators/gradle/templates/gradle/wrapper/{gradle-wrapper.properties.ejs → gradle-wrapper.properties} +1 -1
- package/dist/generators/heroku/generator.js +3 -3
- package/dist/generators/init/generator.js +3 -4
- package/dist/generators/init/resources/.node-version +1 -0
- package/dist/generators/java/command.js +2 -38
- package/dist/generators/java/generator.js +5 -260
- package/dist/generators/java/generators/bootstrap/command.js +35 -0
- package/dist/generators/java/generators/bootstrap/generator.js +178 -0
- package/dist/generators/java/generators/bootstrap/index.js +20 -0
- package/dist/generators/java/generators/build-tool/command.js +42 -0
- package/dist/generators/java/generators/build-tool/generator.js +143 -0
- package/dist/generators/java/generators/build-tool/index.js +20 -0
- package/dist/generators/java/generators/code-quality/command.js +5 -0
- package/dist/generators/java/generators/code-quality/generator.js +91 -0
- package/dist/generators/java/generators/code-quality/index.js +20 -0
- package/dist/generators/java/generators/domain/command.js +30 -0
- package/dist/generators/java/{entity-files.js → generators/domain/entity-files.js} +1 -1
- package/dist/generators/java/generators/domain/generator.js +153 -0
- package/dist/generators/java/generators/domain/index.js +20 -0
- package/dist/generators/java/generators/jib/command.js +5 -0
- package/dist/generators/java/generators/jib/generator.js +97 -0
- package/dist/generators/java/generators/jib/index.js +20 -0
- package/dist/generators/{server → java/generators/jib}/templates/src/main/docker/jib/entrypoint.sh.ejs +2 -0
- package/dist/generators/java/generators/node/command.js +5 -0
- package/dist/generators/java/generators/node/generator.js +97 -0
- package/dist/generators/java/generators/node/index.js +20 -0
- package/dist/generators/java/support/index.js +1 -0
- package/dist/generators/jdl/generator.js +6 -9
- package/dist/generators/kubernetes/generator.js +1 -1
- package/dist/generators/kubernetes/kubernetes-base.js +3 -3
- package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs +0 -32
- package/dist/generators/kubernetes-helm/generator.js +1 -1
- package/dist/generators/kubernetes-knative/generator.js +1 -1
- package/dist/generators/languages/entity-files.js +3 -2
- package/dist/generators/languages/generator.js +7 -10
- package/dist/generators/languages/support/translate.js +34 -9
- package/dist/generators/languages/translation-data.js +4 -5
- package/dist/generators/liquibase/generator.js +68 -25
- package/dist/generators/liquibase/support/maven-plugin.js +6 -0
- package/dist/generators/liquibase/templates/gradle/liquibase.gradle.ejs +3 -6
- package/dist/generators/maven/generator.js +14 -6
- package/dist/generators/maven/generators/code-quality/command.js +5 -0
- package/dist/generators/maven/generators/code-quality/generator.js +268 -0
- package/dist/generators/maven/generators/code-quality/index.js +20 -0
- package/dist/generators/maven/generators/frontend-plugin/command.js +5 -0
- package/dist/generators/maven/generators/frontend-plugin/generator.js +295 -0
- package/dist/generators/maven/generators/frontend-plugin/index.js +20 -0
- package/dist/generators/maven/generators/jib/command.js +5 -0
- package/dist/generators/maven/generators/jib/generator.js +136 -0
- package/dist/generators/maven/generators/jib/index.js +20 -0
- package/dist/generators/maven/internal/xml-store.js +1 -2
- package/dist/generators/maven/support/dependabot-maven.js +12 -2
- package/dist/generators/maven/support/pom-store.js +1 -2
- package/dist/generators/project-name/generator.js +9 -11
- package/dist/generators/react/generator.js +25 -6
- package/dist/generators/react/needle-api/needle-client-react.js +2 -2
- package/dist/generators/react/resources/package.json +18 -15
- package/dist/generators/react/templates/package.json.ejs +1 -7
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/tracker/tracker.tsx.ejs +2 -2
- package/dist/generators/server/command.js +2 -34
- package/dist/generators/server/generator.js +20 -154
- package/dist/generators/server/jdl/application-definition.js +1 -2
- package/dist/generators/server/prompts.js +4 -46
- package/dist/generators/server/resources/Dockerfile +7 -7
- package/dist/generators/server/resources/build.gradle +1 -0
- package/dist/generators/server/resources/gradle/libs.versions.toml +25 -7
- package/dist/generators/server/resources/pom.xml +4 -22
- package/dist/generators/server/support/prepare-field.js +1 -2
- package/dist/generators/server/templates/build.gradle.ejs +29 -143
- package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs +1 -1
- package/dist/generators/server/templates/gradle.properties.ejs +0 -7
- package/dist/generators/server/templates/pom.xml.ejs +23 -444
- package/dist/generators/server/templates/settings.gradle.ejs +0 -4
- package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +15 -3
- package/dist/generators/server/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs +4 -1
- package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs +15 -4
- package/dist/generators/server/templates/src/test/java/_package_/IntegrationTest.java.ejs +0 -2
- package/dist/generators/server/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs +71 -46
- package/dist/generators/server/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs +0 -3
- package/dist/generators/server/templates/src/test/resources/config/application.yml.ejs +1 -1
- package/dist/generators/spring-boot/command.js +31 -2
- package/dist/generators/spring-boot/entity-files.js +2 -2
- package/dist/generators/spring-boot/files.js +3 -38
- package/dist/generators/spring-boot/generator.js +98 -37
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +105 -105
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +2 -2
- package/dist/generators/spring-cache/generator.js +11 -6
- package/dist/generators/spring-cache/internal/dependencies.js +5 -0
- package/dist/generators/spring-cache/resources/build.gradle +1 -0
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +15 -0
- package/dist/generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainersSpringContextCustomizerFactory.java.ejs +29 -13
- package/dist/generators/spring-cloud/generators/gateway/command.js +5 -0
- package/dist/generators/spring-cloud/generators/gateway/generator.js +146 -0
- package/dist/generators/spring-cloud/generators/gateway/index.js +20 -0
- package/dist/generators/spring-cloud-stream/generator.js +2 -3
- package/dist/generators/spring-cloud-stream/generators/kafka/generator.js +2 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/config/KafkaTestContainersSpringContextCustomizerFactory.java.ejs +28 -12
- package/dist/generators/spring-cloud-stream/generators/pulsar/generator.js +2 -2
- package/dist/generators/spring-cloud-stream/generators/pulsar/templates/src/test/java/_package_/config/PulsarTestContainersSpringContextCustomizerFactory.java.ejs +33 -17
- package/dist/generators/spring-data-cassandra/generator.js +5 -6
- package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainersSpringContextCustomizerFactory.java.ejs +33 -17
- package/dist/generators/spring-data-couchbase/generator.js +3 -4
- package/dist/generators/spring-data-elasticsearch/generator.js +3 -5
- package/dist/generators/spring-data-mongodb/generator.js +5 -5
- package/dist/generators/spring-data-neo4j/generator.js +11 -5
- package/dist/generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainersSpringContextCustomizerFactory.java.ejs +32 -16
- package/dist/generators/spring-data-relational/generator.js +6 -7
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +47 -32
- package/dist/generators/spring-websocket/generator.js +2 -3
- package/dist/generators/statistics.js +2 -2
- package/dist/generators/upgrade/generator.js +4 -3
- package/dist/generators/vue/generator.js +4 -4
- package/dist/generators/vue/resources/package.json +18 -15
- package/dist/generators/vue/templates/package.json.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/tracker/tracker.service.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/admin/tracker/tracker.vue.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs +4 -3
- package/dist/generators/vue/templates/vite.config.mts.ejs +6 -0
- package/dist/generators/workspaces/generator.js +5 -4
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +2 -2
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js +3 -3
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +2 -2
- package/dist/jdl/jdl-importer.js +1 -2
- package/dist/jdl/jhipster/default-application-options.js +1 -1
- package/dist/jdl/jhipster/field-types.js +2 -2
- package/dist/jdl/jhipster/relationship-types.js +1 -2
- package/dist/jdl/models/jdl-deployment.js +1 -2
- package/dist/jdl/parsing/api.js +2 -2
- package/dist/jdl/parsing/lexer/token-creator.js +1 -2
- package/dist/jdl/parsing/self-checks/parsing-system-checker.js +13 -13
- package/dist/jdl/parsing/validator.js +5 -5
- package/dist/testing/get-generator.js +1 -1
- package/dist/testing/helpers.js +34 -9
- package/dist/types/generators/angular/support/index.d.ts +0 -1
- package/dist/types/generators/angular/support/translate-angular.d.ts +7 -4
- package/dist/types/generators/app/support/config.d.ts +1 -1
- package/dist/types/generators/base/api.d.ts +7 -0
- package/dist/types/generators/base/generator.d.ts +1 -1
- package/dist/types/generators/base-application/generator.d.ts +4 -4
- package/dist/types/generators/base-application/support/task-type-inference.d.ts +3 -0
- package/dist/types/generators/base-application/support/update-application-entities-transform.d.ts +1 -1
- package/dist/types/generators/base-core/generator.d.ts +33 -1
- package/dist/types/generators/bootstrap/internal/transform-utils.d.ts +1 -0
- package/dist/types/generators/bootstrap/support/java-unused-imports-transform.d.ts +1 -1
- package/dist/types/generators/bootstrap-application-base/support/export-jdl-transform.d.ts +2 -2
- package/dist/types/generators/docker/utils.d.ts +7 -0
- package/dist/types/generators/generator-constants.d.ts +2 -20
- package/dist/types/generators/gradle/types.d.ts +21 -7
- package/dist/types/generators/java/support/index.d.ts +1 -0
- package/dist/types/generators/java/types.d.ts +37 -22
- package/dist/types/generators/languages/support/translate.d.ts +29 -0
- package/dist/types/generators/maven/support/dependabot-maven.d.ts +17 -1
- package/dist/types/generators/project-name/support/name-resolver.d.ts +1 -1
- package/dist/types/generators/server/types.d.ts +2 -0
- package/dist/types/jdl/converters/jdl-to-json/jdl-to-json-field-converter.d.ts +0 -18
- package/dist/types/testing/helpers.d.ts +6 -0
- package/dist/types/testing/support/matrix-utils.d.ts +1 -1
- package/package.json +15 -27
- package/dist/generators/java/files.js +0 -20
- /package/dist/generators/{server → gradle/generators/code-quality}/templates/buildSrc/src/main/groovy/jhipster.code-quality-conventions.gradle.ejs +0 -0
- /package/dist/generators/{server → gradle/generators/jib}/templates/buildSrc/src/main/groovy/jhipster.docker-conventions.gradle.ejs +0 -0
- /package/dist/generators/java/{templates → generators/bootstrap/templates}/src/main/java/_package_/GeneratedByJHipster.java.ejs +0 -0
- /package/dist/generators/{server → java/generators/code-quality}/templates/checkstyle.xml.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/_global_partials_entity_/field_validators.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jackson_identity_info.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/main/java/_package_/_entityPackage_/domain/enumeration/_enumName_.java.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/test/java/_package_/_entityPackage_/domain/_persistClass_Asserts.java.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs +0 -0
- /package/dist/generators/java/{templates → generators/domain/templates}/src/test/java/_package_/domain/AssertUtils.java.ejs +0 -0
- /package/dist/generators/{server → java/generators/node}/templates/npmw +0 -0
- /package/dist/generators/{server → java/generators/node}/templates/npmw.cmd +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/main/java/_package_/security/jwt/JWTRelayGatewayFilterFactory.java.ejs +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/main/java/_package_/web/filter/ModifyServersOpenApiFilter.java.ejs +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/main/java/_package_/web/rest/GatewayResource.java.ejs +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/main/java/_package_/web/rest/vm/RouteVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-cloud/generators/gateway}/templates/src/test/java/_package_/web/filter/ModifyServersOpenApiFilterTest.java.ejs +0 -0
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
19
|
import chalk from 'chalk';
|
|
20
|
-
import
|
|
20
|
+
import { startCase } from 'lodash-es';
|
|
21
21
|
import needleClientBase from '../../client/needle-api/needle-client.js';
|
|
22
22
|
import { stripMargin } from '../../base/support/index.js';
|
|
23
23
|
export default class extends needleClientBase {
|
|
@@ -25,7 +25,7 @@ export default class extends needleClientBase {
|
|
|
25
25
|
const filePath = `${this.clientSrcDir}app/app.scss`;
|
|
26
26
|
this.addStyle(style, comment, filePath, 'jhipster-needle-scss-add-main');
|
|
27
27
|
}
|
|
28
|
-
addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue =
|
|
28
|
+
addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = startCase(routerName)) {
|
|
29
29
|
const errorMessage = `${chalk.yellow('Reference to ') + routerName} ${chalk.yellow('not added to menu.\n')}`;
|
|
30
30
|
const entityMenuPath = `${this.clientSrcDir}app/entities/menu.tsx`;
|
|
31
31
|
const entityEntry =
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@fortawesome/fontawesome-svg-core": "6.5.
|
|
4
|
-
"@fortawesome/free-solid-svg-icons": "6.5.
|
|
3
|
+
"@fortawesome/fontawesome-svg-core": "6.5.2",
|
|
4
|
+
"@fortawesome/free-solid-svg-icons": "6.5.2",
|
|
5
5
|
"@fortawesome/react-fontawesome": "0.2.0",
|
|
6
|
-
"@reduxjs/toolkit": "2.2.
|
|
6
|
+
"@reduxjs/toolkit": "2.2.3",
|
|
7
7
|
"axios": "1.6.8",
|
|
8
8
|
"bootstrap": "5.3.3",
|
|
9
9
|
"bootswatch": "5.3.3",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"path-browserify": "1.0.1",
|
|
12
12
|
"react": "18.2.0",
|
|
13
13
|
"react-dom": "18.2.0",
|
|
14
|
-
"react-hook-form": "7.51.
|
|
14
|
+
"react-hook-form": "7.51.2",
|
|
15
15
|
"react-jhipster": "0.25.3",
|
|
16
16
|
"react-loadable": "5.5.0",
|
|
17
17
|
"react-redux": "9.1.0",
|
|
@@ -21,30 +21,33 @@
|
|
|
21
21
|
"react-transition-group": "4.4.5",
|
|
22
22
|
"reactstrap": "9.2.2",
|
|
23
23
|
"redux": "5.0.1",
|
|
24
|
+
"rxjs": "7.8.1",
|
|
25
|
+
"sockjs-client": "1.6.1",
|
|
24
26
|
"sonar-scanner": "3.1.0",
|
|
25
27
|
"tslib": "2.6.2",
|
|
26
|
-
"uuid": "9.0.1"
|
|
28
|
+
"uuid": "9.0.1",
|
|
29
|
+
"webstomp-client": "1.2.6"
|
|
27
30
|
},
|
|
28
31
|
"devDependencies": {
|
|
29
32
|
"@module-federation/utilities": "3.0.3-0",
|
|
30
|
-
"@testing-library/react": "14.
|
|
33
|
+
"@testing-library/react": "14.3.0",
|
|
31
34
|
"@types/jest": "29.5.12",
|
|
32
35
|
"@types/lodash": "4.17.0",
|
|
33
36
|
"@types/node": "20.11.25",
|
|
34
|
-
"@types/react": "18.2.
|
|
35
|
-
"@types/react-dom": "18.2.
|
|
37
|
+
"@types/react": "18.2.75",
|
|
38
|
+
"@types/react-dom": "18.2.24",
|
|
36
39
|
"@types/react-redux": "7.1.33",
|
|
37
40
|
"@types/redux": "3.6.31",
|
|
38
41
|
"@types/webpack-env": "1.18.4",
|
|
39
|
-
"@typescript-eslint/eslint-plugin": "7.
|
|
40
|
-
"@typescript-eslint/parser": "7.
|
|
41
|
-
"autoprefixer": "10.4.
|
|
42
|
+
"@typescript-eslint/eslint-plugin": "7.6.0",
|
|
43
|
+
"@typescript-eslint/parser": "7.6.0",
|
|
44
|
+
"autoprefixer": "10.4.19",
|
|
42
45
|
"browser-sync": "2.29.3",
|
|
43
46
|
"browser-sync-webpack-plugin": "2.3.0",
|
|
44
47
|
"copy-webpack-plugin": "12.0.2",
|
|
45
48
|
"core-js": "3.36.1",
|
|
46
49
|
"cross-env": "7.0.3",
|
|
47
|
-
"css-loader": "
|
|
50
|
+
"css-loader": "7.1.0",
|
|
48
51
|
"css-minimizer-webpack-plugin": "6.0.0",
|
|
49
52
|
"eslint": "8.57.0",
|
|
50
53
|
"eslint-config-prettier": "9.1.0",
|
|
@@ -66,7 +69,7 @@
|
|
|
66
69
|
"react-infinite-scroll-component": "6.1.0",
|
|
67
70
|
"redux-mock-store": "1.5.4",
|
|
68
71
|
"rimraf": "5.0.5",
|
|
69
|
-
"sass": "1.
|
|
72
|
+
"sass": "1.74.1",
|
|
70
73
|
"sass-loader": "14.1.1",
|
|
71
74
|
"simple-progress-webpack-plugin": "2.0.0",
|
|
72
75
|
"sinon": "17.0.1",
|
|
@@ -77,8 +80,8 @@
|
|
|
77
80
|
"thread-loader": "4.0.2",
|
|
78
81
|
"ts-jest": "29.1.2",
|
|
79
82
|
"ts-loader": "9.5.1",
|
|
80
|
-
"typescript": "5.4.
|
|
81
|
-
"webpack": "5.
|
|
83
|
+
"typescript": "5.4.4",
|
|
84
|
+
"webpack": "5.91.0",
|
|
82
85
|
"webpack-cli": "5.1.4",
|
|
83
86
|
"webpack-dev-server": "5.0.4",
|
|
84
87
|
"webpack-merge": "5.10.0",
|
|
@@ -51,17 +51,11 @@
|
|
|
51
51
|
"react-transition-group": "<%= nodeDependencies['react-transition-group'] %>",
|
|
52
52
|
"reactstrap": "<%= nodeDependencies['reactstrap'] %>",
|
|
53
53
|
"redux": "<%= nodeDependencies['redux'] %>",
|
|
54
|
-
<%_ if (communicationSpringWebsocket) { _%>
|
|
55
|
-
"rxjs": "6.6.3",
|
|
56
|
-
"sockjs-client": "1.5.0",
|
|
57
|
-
<%_ } _%>
|
|
58
54
|
<%_ if (skipServer) { _%>
|
|
59
55
|
"sonar-scanner": "<%= nodeDependencies['sonar-scanner'] %>",
|
|
60
56
|
<%_ } _%>
|
|
61
57
|
"tslib": "<%= nodeDependencies['tslib'] %>",
|
|
62
|
-
"uuid": "<%= nodeDependencies['uuid'] %>"
|
|
63
|
-
"webstomp-client": "1.2.6"
|
|
64
|
-
<%_ } _%>
|
|
58
|
+
"uuid": "<%= nodeDependencies['uuid'] %>"
|
|
65
59
|
},
|
|
66
60
|
"devDependencies": {
|
|
67
61
|
<%_ if (applicationTypeGateway && microfrontend) { _%>
|
|
@@ -26,10 +26,10 @@ export const TrackerPage = () => {
|
|
|
26
26
|
|
|
27
27
|
return (
|
|
28
28
|
<div>
|
|
29
|
-
<h2>
|
|
29
|
+
<h2 data-cy="trackerPageHeading">
|
|
30
30
|
<Translate contentKey="tracker.title">Real-time user activities</Translate>
|
|
31
31
|
</h2>
|
|
32
|
-
<table className="table table-sm table-striped table-bordered">
|
|
32
|
+
<table className="table table-sm table-striped table-bordered" data-cy="trackerTable">
|
|
33
33
|
<thead>
|
|
34
34
|
<tr>
|
|
35
35
|
<th>
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
19
|
import chalk from 'chalk';
|
|
20
|
-
import { GENERATOR_COMMON,
|
|
20
|
+
import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
|
|
21
21
|
import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../jdl/index.js';
|
|
22
22
|
const command = {
|
|
23
23
|
options: {
|
|
@@ -45,12 +45,6 @@ const command = {
|
|
|
45
45
|
description: 'Recreate the initial database changelog based on the current config',
|
|
46
46
|
type: Boolean,
|
|
47
47
|
},
|
|
48
|
-
buildTool: {
|
|
49
|
-
name: 'build',
|
|
50
|
-
description: 'Provide build tool for the application when skipping server side generation',
|
|
51
|
-
type: String,
|
|
52
|
-
scope: 'storage',
|
|
53
|
-
},
|
|
54
48
|
cacheProvider: {
|
|
55
49
|
description: 'Cache provider',
|
|
56
50
|
type: String,
|
|
@@ -138,33 +132,7 @@ const command = {
|
|
|
138
132
|
},
|
|
139
133
|
],
|
|
140
134
|
},
|
|
141
|
-
feignClient: {
|
|
142
|
-
description: 'Generate a feign client',
|
|
143
|
-
cli: {
|
|
144
|
-
type: Boolean,
|
|
145
|
-
},
|
|
146
|
-
prompt: {
|
|
147
|
-
type: 'confirm',
|
|
148
|
-
message: 'Do you want to generate a feign client?',
|
|
149
|
-
when: currentAnswer => currentAnswer.applicationType === APPLICATION_TYPE_MICROSERVICE &&
|
|
150
|
-
currentAnswer.reactive !== undefined &&
|
|
151
|
-
!currentAnswer.reactive,
|
|
152
|
-
},
|
|
153
|
-
default: false,
|
|
154
|
-
},
|
|
155
|
-
syncUserWithIdp: {
|
|
156
|
-
description: 'Allow relationships with User for oauth2 applications',
|
|
157
|
-
cli: {
|
|
158
|
-
type: Boolean,
|
|
159
|
-
},
|
|
160
|
-
prompt: gen => ({
|
|
161
|
-
type: 'confirm',
|
|
162
|
-
message: 'Do you want to allow relationships with User entity?',
|
|
163
|
-
when: ({ authenticationType }) => (authenticationType ?? gen.jhipsterConfigWithDefaults.authenticationType) === 'oauth2',
|
|
164
|
-
}),
|
|
165
|
-
default: false,
|
|
166
|
-
},
|
|
167
135
|
},
|
|
168
|
-
import: [GENERATOR_COMMON,
|
|
136
|
+
import: [GENERATOR_COMMON, GENERATOR_SPRING_BOOT],
|
|
169
137
|
};
|
|
170
138
|
export default command;
|
|
@@ -22,20 +22,18 @@ import { existsSync } from 'fs';
|
|
|
22
22
|
import chalk from 'chalk';
|
|
23
23
|
import { getDBTypeFromDBValue, buildJavaGet as javaGetCall, javaBeanCase as javaBeanClassNameFormat, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, hibernateSnakeCase, } from './support/index.js';
|
|
24
24
|
import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
|
|
25
|
-
import {
|
|
25
|
+
import { GENERATOR_COMMON, GENERATOR_SERVER, GENERATOR_SPRING_BOOT } from '../generator-list.js';
|
|
26
26
|
import BaseApplicationGenerator from '../base-application/index.js';
|
|
27
27
|
import { packageJson } from '../../lib/index.js';
|
|
28
28
|
import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR, CLIENT_WEBPACK_DIR, MAIN_DIR, LOGIN_REGEX, TEST_DIR, JAVA_VERSION, JAVA_COMPATIBLE_VERSIONS, JHIPSTER_DEPENDENCIES_VERSION, } from '../generator-constants.js';
|
|
29
29
|
import statistics from '../statistics.js';
|
|
30
|
-
import { applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, clientFrameworkTypes,
|
|
30
|
+
import { applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, clientFrameworkTypes, } from '../../jdl/jhipster/index.js';
|
|
31
31
|
import { stringifyApplicationData } from '../base-application/support/index.js';
|
|
32
32
|
import { createBase64Secret, createSecret, createNeedleCallback, mutateData } from '../base/support/index.js';
|
|
33
|
-
import command from './command.js';
|
|
34
33
|
import { isReservedPaginationWords } from '../../jdl/jhipster/reserved-keywords.js';
|
|
35
34
|
import { loadStoredAppOptions } from '../app/support/index.js';
|
|
36
35
|
const dbTypes = fieldTypes;
|
|
37
36
|
const { STRING: TYPE_STRING, INTEGER: TYPE_INTEGER, LONG: TYPE_LONG, BIG_DECIMAL: TYPE_BIG_DECIMAL, FLOAT: TYPE_FLOAT, DOUBLE: TYPE_DOUBLE, LOCAL_DATE: TYPE_LOCAL_DATE, ZONED_DATE_TIME: TYPE_ZONED_DATE_TIME, INSTANT: TYPE_INSTANT, DURATION: TYPE_DURATION, } = dbTypes.CommonDBTypes;
|
|
38
|
-
const { CUCUMBER, GATLING } = testFrameworkTypes;
|
|
39
37
|
const { SUPPORTED_VALIDATION_RULES } = validations;
|
|
40
38
|
const { isReservedTableName } = reservedKeywords;
|
|
41
39
|
const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
|
|
@@ -57,34 +55,32 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
57
55
|
jhipsterDependenciesVersion;
|
|
58
56
|
/** @type {string} */
|
|
59
57
|
projectVersion;
|
|
60
|
-
command = command;
|
|
61
58
|
async beforeQueue() {
|
|
62
59
|
if (!this.fromBlueprint) {
|
|
63
60
|
loadStoredAppOptions.call(this);
|
|
64
|
-
await this.composeWithBlueprints(
|
|
61
|
+
await this.composeWithBlueprints();
|
|
65
62
|
}
|
|
66
63
|
if (!this.delegateToBlueprint) {
|
|
67
|
-
await this.
|
|
64
|
+
await this.dependsOnBootstrapApplication();
|
|
68
65
|
await this.dependsOnJHipster(GENERATOR_COMMON);
|
|
69
|
-
await this.dependsOnJHipster(GENERATOR_JAVA);
|
|
70
66
|
}
|
|
71
67
|
}
|
|
72
68
|
get initializing() {
|
|
73
69
|
return this.asInitializingTaskGroup({
|
|
74
|
-
|
|
75
|
-
this.
|
|
70
|
+
async parseCommand() {
|
|
71
|
+
await this.parseCurrentJHipsterCommand();
|
|
76
72
|
},
|
|
77
73
|
});
|
|
78
74
|
}
|
|
79
75
|
get [BaseApplicationGenerator.INITIALIZING]() {
|
|
80
|
-
return this.
|
|
76
|
+
return this.delegateTasksToBlueprint(() => this.initializing);
|
|
81
77
|
}
|
|
82
78
|
get prompting() {
|
|
83
79
|
return this.asPromptingTaskGroup({
|
|
84
80
|
async prompting({ control }) {
|
|
85
81
|
if (control.existingProject && this.options.askAnswered !== true)
|
|
86
82
|
return;
|
|
87
|
-
await this.
|
|
83
|
+
await this.promptCurrentJHipsterCommand();
|
|
88
84
|
},
|
|
89
85
|
askForServerTestOpts,
|
|
90
86
|
askForServerSideOpts,
|
|
@@ -92,7 +88,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
92
88
|
});
|
|
93
89
|
}
|
|
94
90
|
get [BaseApplicationGenerator.PROMPTING]() {
|
|
95
|
-
return this.
|
|
91
|
+
return this.delegateTasksToBlueprint(() => this.prompting);
|
|
96
92
|
}
|
|
97
93
|
get configuring() {
|
|
98
94
|
return this.asConfiguringTaskGroup({
|
|
@@ -128,44 +124,22 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
128
124
|
});
|
|
129
125
|
}
|
|
130
126
|
get [BaseApplicationGenerator.CONFIGURING]() {
|
|
131
|
-
return this.
|
|
127
|
+
return this.delegateTasksToBlueprint(() => this.configuring);
|
|
132
128
|
}
|
|
133
129
|
get composing() {
|
|
134
130
|
return this.asComposingTaskGroup({
|
|
131
|
+
async composeCommand() {
|
|
132
|
+
await this.composeCurrentJHipsterCommand();
|
|
133
|
+
},
|
|
135
134
|
async composeBackendType() {
|
|
136
135
|
if (!this.jhipsterConfig.backendType || ['spring-boot', 'java'].includes(this.jhipsterConfig.backendType.toLowerCase())) {
|
|
137
136
|
await this.composeWithJHipster(GENERATOR_SPRING_BOOT);
|
|
138
137
|
}
|
|
139
138
|
},
|
|
140
|
-
async composing() {
|
|
141
|
-
const { buildTool, enableTranslation, testFrameworks, feignClient } = this.jhipsterConfigWithDefaults;
|
|
142
|
-
if (buildTool === GRADLE) {
|
|
143
|
-
await this.composeWithJHipster(GENERATOR_GRADLE);
|
|
144
|
-
}
|
|
145
|
-
else if (buildTool === MAVEN) {
|
|
146
|
-
await this.composeWithJHipster(GENERATOR_MAVEN);
|
|
147
|
-
}
|
|
148
|
-
else {
|
|
149
|
-
throw new Error(`Build tool ${buildTool} is not supported`);
|
|
150
|
-
}
|
|
151
|
-
await this.composeWithJHipster(GENERATOR_DOCKER);
|
|
152
|
-
if (enableTranslation) {
|
|
153
|
-
await this.composeWithJHipster(GENERATOR_LANGUAGES);
|
|
154
|
-
}
|
|
155
|
-
if (testFrameworks?.includes(CUCUMBER)) {
|
|
156
|
-
await this.composeWithJHipster(GENERATOR_CUCUMBER);
|
|
157
|
-
}
|
|
158
|
-
if (testFrameworks?.includes(GATLING)) {
|
|
159
|
-
await this.composeWithJHipster(GENERATOR_GATLING);
|
|
160
|
-
}
|
|
161
|
-
if (feignClient) {
|
|
162
|
-
await this.composeWithJHipster(GENERATOR_FEIGN_CLIENT);
|
|
163
|
-
}
|
|
164
|
-
},
|
|
165
139
|
});
|
|
166
140
|
}
|
|
167
141
|
get [BaseApplicationGenerator.COMPOSING]() {
|
|
168
|
-
return this.
|
|
142
|
+
return this.delegateTasksToBlueprint(() => this.composing);
|
|
169
143
|
}
|
|
170
144
|
get loading() {
|
|
171
145
|
return this.asLoadingTaskGroup({
|
|
@@ -237,7 +211,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
237
211
|
});
|
|
238
212
|
}
|
|
239
213
|
get [BaseApplicationGenerator.PREPARING]() {
|
|
240
|
-
return this.
|
|
214
|
+
return this.delegateTasksToBlueprint(() => this.preparing);
|
|
241
215
|
}
|
|
242
216
|
get postPreparing() {
|
|
243
217
|
return this.asPostPreparingTaskGroup({
|
|
@@ -385,7 +359,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
385
359
|
});
|
|
386
360
|
}
|
|
387
361
|
get [BaseApplicationGenerator.CONFIGURING_EACH_ENTITY]() {
|
|
388
|
-
return this.
|
|
362
|
+
return this.delegateTasksToBlueprint(() => this.configuringEachEntity);
|
|
389
363
|
}
|
|
390
364
|
get preparingEachEntity() {
|
|
391
365
|
return this.asPreparingEachEntityTaskGroup({
|
|
@@ -412,7 +386,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
412
386
|
});
|
|
413
387
|
}
|
|
414
388
|
get [BaseApplicationGenerator.POST_PREPARING_EACH_ENTITY]() {
|
|
415
|
-
return this.
|
|
389
|
+
return this.delegateTasksToBlueprint(() => this.postPreparingEachEntity);
|
|
416
390
|
}
|
|
417
391
|
/** @inheritdoc */
|
|
418
392
|
get default() {
|
|
@@ -445,92 +419,10 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
445
419
|
});
|
|
446
420
|
}
|
|
447
421
|
get [BaseApplicationGenerator.DEFAULT]() {
|
|
448
|
-
return this.
|
|
422
|
+
return this.delegateTasksToBlueprint(() => this.default);
|
|
449
423
|
}
|
|
450
424
|
get postWriting() {
|
|
451
425
|
return this.asPostWritingTaskGroup({
|
|
452
|
-
customizeGradle({ application, source }) {
|
|
453
|
-
if (!application.buildToolGradle)
|
|
454
|
-
return;
|
|
455
|
-
source.addGradleDependencyCatalogVersion?.({ name: 'checkstyle', version: application.javaDependencies.checkstyle });
|
|
456
|
-
source.addGradleBuildSrcDependencyCatalogVersion?.({ name: 'checkstyle', version: application.javaDependencies.checkstyle });
|
|
457
|
-
source.addGradleDependencyCatalogVersion?.({ name: 'jacoco', version: application.javaDependencies?.['jacoco-maven-plugin'] });
|
|
458
|
-
source.addGradleBuildSrcDependencyCatalogVersion?.({
|
|
459
|
-
name: 'jacoco',
|
|
460
|
-
version: application.javaDependencies?.['jacoco-maven-plugin'],
|
|
461
|
-
});
|
|
462
|
-
source.addGradleDependencyCatalogVersion?.({
|
|
463
|
-
name: 'sonarqube-plugin',
|
|
464
|
-
version: application.javaDependencies?.['gradle-sonarqube'],
|
|
465
|
-
});
|
|
466
|
-
source.addGradleBuildSrcDependencyCatalogVersion?.({
|
|
467
|
-
name: 'sonarqube-plugin',
|
|
468
|
-
version: application.javaDependencies?.['gradle-sonarqube'],
|
|
469
|
-
});
|
|
470
|
-
source.addGradleDependencyCatalogVersion?.({
|
|
471
|
-
name: 'spotless-plugin',
|
|
472
|
-
version: application.javaDependencies?.['spotless-gradle-plugin'],
|
|
473
|
-
});
|
|
474
|
-
source.addGradleBuildSrcDependencyCatalogVersion?.({
|
|
475
|
-
name: 'spotless-plugin',
|
|
476
|
-
version: application.javaDependencies?.['spotless-gradle-plugin'],
|
|
477
|
-
});
|
|
478
|
-
source.addGradleDependencyCatalogVersion?.({
|
|
479
|
-
name: 'modernizer-plugin',
|
|
480
|
-
version: application.javaDependencies?.['gradle-modernizer-plugin'],
|
|
481
|
-
});
|
|
482
|
-
source.addGradleBuildSrcDependencyCatalogVersion?.({
|
|
483
|
-
name: 'modernizer-plugin',
|
|
484
|
-
version: application.javaDependencies?.['gradle-modernizer-plugin'],
|
|
485
|
-
});
|
|
486
|
-
source.addGradleDependencyCatalogVersion?.({ name: 'nohttp-plugin', version: application.javaDependencies?.['nohttp-checkstyle'] });
|
|
487
|
-
source.addGradleBuildSrcDependencyCatalogVersion?.({
|
|
488
|
-
name: 'nohttp-plugin',
|
|
489
|
-
version: application.javaDependencies?.['nohttp-checkstyle'],
|
|
490
|
-
});
|
|
491
|
-
source.addGradleDependencyCatalogVersion?.({ name: 'jib-plugin', version: application.javaDependencies?.['jib-maven-plugin'] });
|
|
492
|
-
source.addGradleBuildSrcDependencyCatalogVersion?.({
|
|
493
|
-
name: 'jib-plugin',
|
|
494
|
-
version: application.javaDependencies?.['jib-maven-plugin'],
|
|
495
|
-
});
|
|
496
|
-
source.addGradleBuildSrcDependency?.({
|
|
497
|
-
groupId: 'org.sonarsource.scanner.gradle',
|
|
498
|
-
artifactId: 'sonarqube-gradle-plugin',
|
|
499
|
-
// eslint-disable-next-line no-template-curly-in-string
|
|
500
|
-
version: '${libs.versions.sonarqube.plugin.get()}',
|
|
501
|
-
scope: 'implementation',
|
|
502
|
-
});
|
|
503
|
-
source.addGradleBuildSrcDependency?.({
|
|
504
|
-
groupId: 'com.diffplug.spotless',
|
|
505
|
-
artifactId: 'spotless-plugin-gradle',
|
|
506
|
-
// eslint-disable-next-line no-template-curly-in-string
|
|
507
|
-
version: '${libs.versions.spotless.plugin.get()}',
|
|
508
|
-
scope: 'implementation',
|
|
509
|
-
});
|
|
510
|
-
source.addGradleBuildSrcDependency?.({
|
|
511
|
-
groupId: 'com.github.andygoossens',
|
|
512
|
-
artifactId: 'gradle-modernizer-plugin',
|
|
513
|
-
// eslint-disable-next-line no-template-curly-in-string
|
|
514
|
-
version: '${libs.versions.modernizer.plugin.get()}',
|
|
515
|
-
scope: 'implementation',
|
|
516
|
-
});
|
|
517
|
-
source.addGradleBuildSrcDependency?.({
|
|
518
|
-
groupId: 'io.spring.nohttp',
|
|
519
|
-
artifactId: 'nohttp-gradle',
|
|
520
|
-
// eslint-disable-next-line no-template-curly-in-string
|
|
521
|
-
version: '${libs.versions.nohttp.plugin.get()}',
|
|
522
|
-
scope: 'implementation',
|
|
523
|
-
});
|
|
524
|
-
source.addGradleBuildSrcDependency?.({
|
|
525
|
-
groupId: 'com.google.cloud.tools',
|
|
526
|
-
artifactId: 'jib-gradle-plugin',
|
|
527
|
-
// eslint-disable-next-line no-template-curly-in-string
|
|
528
|
-
version: '${libs.versions.jib.plugin.get()}',
|
|
529
|
-
scope: 'implementation',
|
|
530
|
-
});
|
|
531
|
-
source.addGradlePlugin?.({ id: 'jhipster.code-quality-conventions' });
|
|
532
|
-
source.addGradlePlugin?.({ id: 'jhipster.docker-conventions' });
|
|
533
|
-
},
|
|
534
426
|
packageJsonScripts({ application }) {
|
|
535
427
|
const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();
|
|
536
428
|
packageJsonConfigStorage.backend_port = application.gatewayServerPort || application.serverPort;
|
|
@@ -547,7 +439,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
547
439
|
const excludeWebapp = application.skipClient ? '' : ' -Dskip.installnodenpm -Dskip.npm';
|
|
548
440
|
scriptsStorage.set({
|
|
549
441
|
'app:start': './mvnw',
|
|
550
|
-
'backend:info': './mvnw
|
|
442
|
+
'backend:info': './mvnw --version',
|
|
551
443
|
'backend:doc:test': './mvnw -ntp javadoc:javadoc --batch-mode',
|
|
552
444
|
'backend:nohttp:test': './mvnw -ntp checkstyle:check --batch-mode',
|
|
553
445
|
'backend:start': `./mvnw${excludeWebapp}`,
|
|
@@ -612,33 +504,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
|
|
|
612
504
|
});
|
|
613
505
|
}
|
|
614
506
|
get [BaseApplicationGenerator.POST_WRITING]() {
|
|
615
|
-
return this.
|
|
616
|
-
}
|
|
617
|
-
get postWritingEntities() {
|
|
618
|
-
return this.asPostWritingEntitiesTaskGroup({
|
|
619
|
-
packageJsonE2eScripts({ application, entities }) {
|
|
620
|
-
if (application.applicationTypeGateway) {
|
|
621
|
-
const { serverPort, lowercaseBaseName } = application;
|
|
622
|
-
const microservices = [...new Set(entities.map(entity => entity.microserviceName))].filter(Boolean).map(ms => ms.toLowerCase());
|
|
623
|
-
const scriptsStorage = this.packageJson.createStorage('scripts');
|
|
624
|
-
const waitServices = microservices
|
|
625
|
-
.concat(lowercaseBaseName)
|
|
626
|
-
.map(ms => `npm run ci:server:await:${ms}`)
|
|
627
|
-
.join(' && ');
|
|
628
|
-
scriptsStorage.set({
|
|
629
|
-
[`ci:server:await:${lowercaseBaseName}`]: `wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:$npm_package_config_backend_port/management/health`,
|
|
630
|
-
...Object.fromEntries(microservices.map(ms => [
|
|
631
|
-
`ci:server:await:${ms}`,
|
|
632
|
-
`wait-on -t ${WAIT_TIMEOUT} http-get://127.0.0.1:${serverPort}/services/${ms}/management/health/readiness`,
|
|
633
|
-
])),
|
|
634
|
-
'ci:server:await': `echo "Waiting for services to start" && ${waitServices} && echo "Services started"`,
|
|
635
|
-
});
|
|
636
|
-
}
|
|
637
|
-
},
|
|
638
|
-
});
|
|
639
|
-
}
|
|
640
|
-
get [BaseApplicationGenerator.POST_WRITING_ENTITIES]() {
|
|
641
|
-
return this.asPostWritingEntitiesTaskGroup(this.delegateTasksToBlueprint(() => this.postWritingEntities));
|
|
507
|
+
return this.delegateTasksToBlueprint(() => this.postWriting);
|
|
642
508
|
}
|
|
643
509
|
_configureServer(config = this.jhipsterConfigWithDefaults, dest = this.jhipsterConfig) {
|
|
644
510
|
// Generate JWT secret key if key does not already exist in config
|
|
@@ -16,11 +16,10 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
import
|
|
19
|
+
import { upperCase, snakeCase } from 'lodash-es';
|
|
20
20
|
import databaseMigrationOption from '../options/database-migration.js';
|
|
21
21
|
import messageBrokerOption from '../options/message-broker.js';
|
|
22
22
|
import { feignClientDefinition, syncUserWithIdpDefinition } from '../options/index.js';
|
|
23
|
-
const { upperCase, snakeCase } = _;
|
|
24
23
|
const jdlOptions = [
|
|
25
24
|
databaseMigrationOption,
|
|
26
25
|
messageBrokerOption,
|
|
@@ -17,23 +17,21 @@
|
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
19
|
import chalk from 'chalk';
|
|
20
|
-
import
|
|
21
|
-
import { applicationOptions, applicationTypes, authenticationTypes,
|
|
20
|
+
import { includes, intersection } from 'lodash-es';
|
|
21
|
+
import { applicationOptions, applicationTypes, authenticationTypes, databaseTypes, cacheTypes, serviceDiscoveryTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.js';
|
|
22
22
|
import { MESSAGE_BROKER } from './options/index.js';
|
|
23
23
|
import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from './support/database.js';
|
|
24
24
|
const { OptionNames } = applicationOptions;
|
|
25
25
|
const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes;
|
|
26
26
|
const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS } = cacheTypes;
|
|
27
27
|
const { JWT, OAUTH2, SESSION } = authenticationTypes;
|
|
28
|
-
const { GRADLE, MAVEN } = buildToolTypes;
|
|
29
28
|
const { CASSANDRA, H2_DISK, H2_MEMORY, MONGODB, NEO4J, SQL, COUCHBASE } = databaseTypes;
|
|
30
29
|
const { CONSUL, EUREKA } = serviceDiscoveryTypes;
|
|
31
|
-
const { AUTHENTICATION_TYPE,
|
|
30
|
+
const { AUTHENTICATION_TYPE, CACHE_PROVIDER, DATABASE_TYPE, DEV_DATABASE_TYPE, PROD_DATABASE_TYPE, REACTIVE, SERVER_PORT, SERVICE_DISCOVERY_TYPE, WEBSOCKET, SEARCH_ENGINE, ENABLE_SWAGGER_CODEGEN, } = OptionNames;
|
|
32
31
|
const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
|
|
33
32
|
const NO_DATABASE = databaseTypes.NO;
|
|
34
33
|
const NO_CACHE_PROVIDER = cacheTypes.NO;
|
|
35
34
|
const { GATLING, CUCUMBER } = testFrameworkTypes;
|
|
36
|
-
const { intersection } = _;
|
|
37
35
|
/**
|
|
38
36
|
* Get Option From Array
|
|
39
37
|
*
|
|
@@ -44,7 +42,7 @@ const { intersection } = _;
|
|
|
44
42
|
const getOptionFromArray = (array, option) => {
|
|
45
43
|
let optionValue = false;
|
|
46
44
|
array.forEach(value => {
|
|
47
|
-
if (
|
|
45
|
+
if (includes(value, option)) {
|
|
48
46
|
optionValue = value.split(':')[1];
|
|
49
47
|
}
|
|
50
48
|
});
|
|
@@ -71,16 +69,6 @@ export async function askForServerSideOpts({ control }) {
|
|
|
71
69
|
message: 'As you are running in a microservice architecture, on which port would like your server to run? It should be unique to avoid port conflicts.',
|
|
72
70
|
default: defaultServerPort,
|
|
73
71
|
},
|
|
74
|
-
{
|
|
75
|
-
type: 'input',
|
|
76
|
-
name: PACKAGE_NAME,
|
|
77
|
-
validate: input => /^([a-z_]{1}[a-z0-9_]*(\.[a-z_]{1}[a-z0-9_]*)*)$/.test(input)
|
|
78
|
-
? true
|
|
79
|
-
: 'The package name you have provided is not a valid Java package name.',
|
|
80
|
-
message: 'What is your default Java package name?',
|
|
81
|
-
default: this.jhipsterConfigWithDefaults.packageName,
|
|
82
|
-
store: true,
|
|
83
|
-
},
|
|
84
72
|
{
|
|
85
73
|
when: () => applicationType === 'gateway' || applicationType === 'microservice',
|
|
86
74
|
type: 'list',
|
|
@@ -243,36 +231,6 @@ export async function askForServerSideOpts({ control }) {
|
|
|
243
231
|
message: 'Do you want to use Hibernate 2nd level cache?',
|
|
244
232
|
default: this.jhipsterConfigWithDefaults.enableHibernateCache,
|
|
245
233
|
},
|
|
246
|
-
{
|
|
247
|
-
type: 'list',
|
|
248
|
-
name: BUILD_TOOL,
|
|
249
|
-
message: 'Would you like to use Maven or Gradle for building the backend?',
|
|
250
|
-
choices: [
|
|
251
|
-
{
|
|
252
|
-
value: MAVEN,
|
|
253
|
-
name: 'Maven',
|
|
254
|
-
},
|
|
255
|
-
{
|
|
256
|
-
value: GRADLE,
|
|
257
|
-
name: 'Gradle',
|
|
258
|
-
},
|
|
259
|
-
],
|
|
260
|
-
default: this.jhipsterConfigWithDefaults.buildTool,
|
|
261
|
-
},
|
|
262
|
-
{
|
|
263
|
-
when: answers => answers.buildTool === GRADLE && this.experimental,
|
|
264
|
-
type: 'confirm',
|
|
265
|
-
name: 'enableGradleEnterprise',
|
|
266
|
-
message: 'Do you want to enable Gradle Enterprise integration?',
|
|
267
|
-
default: this.jhipsterConfigWithDefaults.enableGradleEnterprise,
|
|
268
|
-
},
|
|
269
|
-
{
|
|
270
|
-
when: answers => answers.enableGradleEnterprise,
|
|
271
|
-
type: 'input',
|
|
272
|
-
name: 'gradleEnterpriseHost',
|
|
273
|
-
message: 'Enter your Gradle Enterprise host',
|
|
274
|
-
validate: input => (input.length === 0 ? 'Please enter your Gradle Enterprise host' : true),
|
|
275
|
-
},
|
|
276
234
|
];
|
|
277
235
|
await this.prompt(prompts, this.config);
|
|
278
236
|
}
|
|
@@ -13,7 +13,7 @@ LABEL ALIAS=consul-config-loader
|
|
|
13
13
|
FROM postgres:16.2
|
|
14
14
|
LABEL ALIAS=postgresql
|
|
15
15
|
|
|
16
|
-
FROM quay.io/keycloak/keycloak:24.0.
|
|
16
|
+
FROM quay.io/keycloak/keycloak:24.0.2
|
|
17
17
|
LABEL ALIAS=keycloak
|
|
18
18
|
|
|
19
19
|
FROM mysql:8.3.0
|
|
@@ -23,7 +23,7 @@ FROM mariadb:11.3.2
|
|
|
23
23
|
FROM mongo:7.0.6
|
|
24
24
|
LABEL ALIAS=mongodb
|
|
25
25
|
|
|
26
|
-
FROM couchbase/server:7.6.
|
|
26
|
+
FROM couchbase/server:7.6.1
|
|
27
27
|
LABEL ALIAS=couchbase
|
|
28
28
|
|
|
29
29
|
FROM cassandra:5.0
|
|
@@ -36,7 +36,7 @@ FROM neo4j:5.18.1
|
|
|
36
36
|
FROM hazelcast/management-center:5.3.3
|
|
37
37
|
LABEL ALIAS=hazelcast
|
|
38
38
|
|
|
39
|
-
FROM memcached:1.6.
|
|
39
|
+
FROM memcached:1.6.26-alpine
|
|
40
40
|
|
|
41
41
|
FROM redis:7.2.4
|
|
42
42
|
|
|
@@ -46,16 +46,16 @@ LABEL ALIAS=kafka
|
|
|
46
46
|
FROM confluentinc/cp-zookeeper:7.6.0
|
|
47
47
|
LABEL ALIAS=zookeeper
|
|
48
48
|
|
|
49
|
-
FROM apachepulsar/pulsar:3.2.
|
|
49
|
+
FROM apachepulsar/pulsar:3.2.2
|
|
50
50
|
LABEL ALIAS=pulsar
|
|
51
51
|
|
|
52
52
|
FROM sonarqube:10.4.1-community
|
|
53
53
|
LABEL ALIAS=sonar
|
|
54
54
|
|
|
55
|
-
FROM docker.io/bitnami/consul:1.18.
|
|
55
|
+
FROM docker.io/bitnami/consul:1.18.1
|
|
56
56
|
LABEL ALIAS=consul
|
|
57
57
|
|
|
58
|
-
FROM prom/prometheus:v2.51.
|
|
58
|
+
FROM prom/prometheus:v2.51.1
|
|
59
59
|
LABEL ALIAS=prometheus
|
|
60
60
|
|
|
61
61
|
FROM prom/alertmanager:v0.27.0
|
|
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
|
|
|
64
64
|
FROM quay.io/coreos/prometheus-operator:v0.42.1
|
|
65
65
|
LABEL ALIAS=prometheus-operator
|
|
66
66
|
|
|
67
|
-
FROM grafana/grafana:10.4.
|
|
67
|
+
FROM grafana/grafana:10.4.1
|
|
68
68
|
LABEL ALIAS=grafana
|
|
69
69
|
|
|
70
70
|
FROM quay.io/coreos/grafana-watcher:v0.0.8
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
// required by dependabot
|