generator-jhipster 7.6.0 → 7.7.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/README.md +1 -3
- package/cli/commands.js +3 -0
- package/cli/environment-builder.js +53 -18
- package/cli/import-jdl.js +3 -0
- package/cli/index.mjs +20 -0
- package/cli/jhipster.js +19 -11
- package/cli/program.js +94 -38
- package/generators/app/esm.mjs +1 -3
- package/generators/app/index.js +1 -16
- package/generators/aws/esm.mjs +1 -3
- package/generators/azure-app-service/esm.mjs +1 -3
- package/generators/azure-spring-cloud/esm.mjs +1 -3
- package/generators/base/esm.mjs +1 -3
- package/generators/bootstrap/esm.mjs +1 -3
- package/generators/bootstrap/index.js +36 -86
- package/generators/bootstrap-application/esm.mjs +19 -0
- package/generators/bootstrap-application/generator.mjs +353 -0
- package/generators/bootstrap-application/index.mjs +19 -0
- package/generators/ci-cd/esm.mjs +1 -3
- package/generators/ci-cd/prompts.js +1 -1
- package/generators/ci-cd/templates/github-actions.yml.ejs +2 -2
- package/generators/client/esm.mjs +5 -3
- package/generators/client/files-angular.js +9 -0
- package/generators/client/files-common.js +8 -7
- package/generators/client/files-vue.js +7 -6
- package/generators/client/index.js +2 -1
- package/generators/client/templates/angular/angular.json.ejs +1 -1
- package/generators/client/templates/angular/package.json +25 -22
- package/generators/client/templates/angular/package.json.ejs +5 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.html.ejs +7 -7
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +3 -3
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.html.ejs +10 -10
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs +8 -8
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +6 -6
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs +51 -49
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +16 -16
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +32 -32
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +18 -18
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +12 -12
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +8 -8
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +1 -1
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +4 -4
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +11 -11
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +4 -2
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs +0 -6
- package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs +0 -6
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs +3 -3
- package/generators/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.ejs +5 -5
- package/generators/client/templates/angular/src/main/webapp/content/scss/global.scss.ejs +29 -0
- package/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs +0 -4
- package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +19 -0
- package/generators/client/templates/common/package.json +2 -2
- package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs +1 -7
- package/generators/client/templates/react/package.json +33 -33
- package/generators/client/templates/vue/package.json +23 -23
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +3 -3
- package/generators/client/templates/vue/src/main/webapp/app/entities/user/user.service.ts.ejs +0 -0
- package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +29 -1
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +2 -2
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/config.ts.ejs +0 -4
- package/generators/cloudfoundry/esm.mjs +1 -3
- package/generators/common/esm.mjs +2 -3
- package/generators/common/files.js +1 -2
- package/generators/common/index.js +6 -0
- package/generators/common/templates/.husky/{pre-commit → pre-commit.ejs} +4 -0
- package/generators/common/templates/README.md.jhi.ejs +3 -1
- package/generators/common/templates/package.json +3 -3
- package/generators/common/templates/sonar-project.properties.ejs +1 -1
- package/generators/cypress/esm.mjs +2 -3
- package/generators/cypress/files.js +2 -1
- package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs +18 -14
- package/generators/database-changelog/esm.mjs +1 -3
- package/generators/database-changelog/index.js +1 -1
- package/generators/database-changelog-liquibase/esm.mjs +2 -3
- package/generators/docker-compose/esm.mjs +1 -3
- package/generators/entities/esm.mjs +1 -3
- package/generators/entities/index.js +2 -2
- package/generators/entities-client/esm.mjs +1 -3
- package/generators/entity/esm.mjs +1 -3
- package/generators/entity/index.js +11 -15
- package/generators/entity/prompts.js +4 -1
- package/generators/entity-client/esm.mjs +2 -3
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs +2 -2
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +20 -21
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +14 -16
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +2 -2
- package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +1 -1
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-reducer.spec.ts.ejs +1 -1
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +1 -1
- package/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +1 -1
- package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +1 -1
- package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs +1 -1
- package/generators/entity-i18n/esm.mjs +2 -3
- package/generators/entity-server/esm.mjs +2 -3
- package/generators/entity-server/files-couchbase.js +23 -2
- package/generators/entity-server/files.js +16 -2
- package/generators/entity-server/index.js +8 -1
- package/generators/entity-server/templates/couchbase/src/main/java/package/domain/Entity.java.jhi.spring_data_couchbase.ejs +11 -13
- package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +23 -59
- package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.fts.ejs +5 -6
- package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.n1ql.ejs +5 -0
- package/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs +2 -2
- package/generators/entity-server/templates/partials/save_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs +4 -4
- package/generators/entity-server/templates/src/main/java/package/common/patch_template.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +31 -18
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationships.java.ejs +37 -0
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationshipsImpl.java.ejs +90 -0
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +3 -5
- package/generators/entity-server/templates/src/main/java/package/repository/search/{SortToFieldSortBuilderConverter.java.ejs → SortToSortBuilderListConverter.java.ejs} +4 -3
- package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs +8 -6
- package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +6 -6
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +5 -5
- package/generators/export-jdl/esm.mjs +1 -3
- package/generators/gae/esm.mjs +1 -3
- package/generators/generate-blueprint/constants.mjs +146 -0
- package/generators/generate-blueprint/esm.mjs +19 -0
- package/generators/generate-blueprint/files.mjs +81 -0
- package/generators/generate-blueprint/generator.mjs +363 -0
- package/generators/generate-blueprint/index.mjs +20 -0
- package/generators/generate-blueprint/templates/.eslintrc.json.ejs +41 -0
- package/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs +32 -0
- package/generators/generate-blueprint/templates/.mocharc.cjs.ejs +29 -0
- package/generators/{server/templates/couchbase/src/main/java/package/config/couchbase/package-info.java.ejs → generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs} +4 -7
- package/generators/generate-blueprint/templates/README.md.ejs +75 -0
- package/generators/generate-blueprint/templates/cli/cli.mjs.ejs +35 -0
- package/generators/generate-blueprint/templates/cli/commands.cjs.ejs +25 -0
- package/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs +98 -0
- package/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +42 -0
- package/generators/generate-blueprint/templates/generators/generator/index.mjs.ejs +19 -0
- package/generators/generate-blueprint/templates/generators/generator/templates/template-file.ejs +0 -0
- package/generators/generate-blueprint/templates/test/utils.mjs.ejs +17 -0
- package/generators/generator-base-blueprint.js +29 -0
- package/generators/generator-base-docker.js +1 -0
- package/generators/generator-base-entities.cjs +368 -0
- package/generators/generator-base.js +128 -23
- package/generators/generator-constants.js +18 -16
- package/generators/generator-list.js +2 -0
- package/generators/gradle/esm.mjs +19 -0
- package/generators/heroku/esm.mjs +1 -3
- package/generators/info/esm.mjs +1 -3
- package/generators/init/esm.mjs +19 -0
- package/generators/init/files.cjs +9 -3
- package/generators/init/index.cjs +5 -0
- package/generators/init/templates/.gitignore.jhi.ejs +5 -0
- package/generators/init/templates/{.lintstagedrc.js.ejs → .lintstagedrc.cjs.ejs} +0 -0
- package/generators/java/esm.mjs +19 -0
- package/generators/java/index.cjs +58 -2
- package/generators/kubernetes/esm.mjs +1 -3
- package/generators/kubernetes-helm/esm.mjs +1 -3
- package/generators/kubernetes-knative/esm.mjs +1 -3
- package/generators/languages/esm.mjs +2 -3
- package/generators/languages/templates/src/test/resources/i18n/messages_fr.properties.ejs +4 -1
- package/generators/maven/esm.mjs +19 -0
- package/generators/openapi-client/esm.mjs +1 -3
- package/generators/openapi-client/index.js +11 -4
- package/generators/openshift/esm.mjs +1 -3
- package/generators/page/esm.mjs +1 -3
- package/generators/project-name/esm.mjs +19 -0
- package/generators/server/esm.mjs +2 -2
- package/generators/server/files-couchbase.js +28 -31
- package/generators/server/files.js +14 -1
- package/generators/server/index.js +13 -13
- package/generators/server/needle-api/needle-server-maven.js +1 -1
- package/generators/server/templates/couchbase/src/main/java/package/repository/CouchbaseSearchRepository.java.ejs +91 -0
- package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs +43 -64
- package/generators/server/templates/couchbase/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs +2 -2
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json.ejs +3 -0
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_USER.json.ejs +3 -0
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__admin.json.ejs → user/admin.json.ejs} +2 -2
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__user.json.ejs → user/user.json.ejs} +2 -2
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.2__create_indexes.n1ql.ejs +34 -0
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_collections.n1ql.ejs +8 -0
- package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs +4 -3
- package/generators/server/templates/couchbase/src/test/java/package/repository/{JHipsterCouchbaseRepositoryTest.java.ejs → CouchbaseSearchRepositoryTest.java.ejs} +2 -2
- package/generators/server/templates/gradle/profile_prod.gradle.ejs +4 -0
- package/generators/server/templates/gradle.properties.ejs +6 -6
- package/generators/server/templates/npmw +14 -5
- package/generators/server/templates/pom.xml.ejs +47 -42
- package/generators/server/templates/src/main/docker/app.yml.ejs +4 -2
- package/generators/server/templates/src/main/docker/zipkin.yml.ejs +25 -0
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +26 -16
- package/generators/server/templates/src/main/java/package/config/LocaleConfiguration_reactive.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +2 -1
- package/generators/server/templates/src/main/java/package/domain/Authority.java.ejs +11 -0
- package/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs +6 -6
- package/generators/server/templates/src/main/java/package/domain/User.java.ejs +9 -7
- package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +1 -11
- package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +48 -72
- package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +8 -6
- package/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +0 -1
- package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/web/rest/LogoutResource_reactive.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs +2 -2
- package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +8 -0
- package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +6 -0
- package/generators/server/templates/src/main/resources/config/application.yml.ejs +2 -0
- package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs +3 -1
- package/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs +21 -15
- package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +2 -0
- package/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs +8 -0
- package/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs +17 -3
- package/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest_reactive.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs +1 -1
- package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +13 -6
- package/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +1 -6
- package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +40 -42
- package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +1 -1
- package/generators/spring-boot/esm.mjs +19 -0
- package/generators/spring-controller/esm.mjs +1 -3
- package/generators/spring-service/esm.mjs +1 -3
- package/generators/upgrade/esm.mjs +1 -3
- package/generators/upgrade-config/esm.mjs +1 -3
- package/generators/workspaces/esm.mjs +1 -3
- package/lib/constants/logo.cjs +30 -0
- package/lib/constants/priorities.cjs +216 -2
- package/lib/constants/priorities.mjs +29 -1
- package/lib/index.mjs +6 -0
- package/lib/support/mixin.cjs +5 -1
- package/lib/support/shared-data.cjs +34 -1
- package/package.json +27 -23
- package/utils/entity.js +19 -2
- package/utils/faker.js +3 -3
- package/utils/field.js +61 -49
- package/utils/relationship.js +5 -3
- package/utils/user.js +109 -0
- package/generators/app/generator.spec.mjs +0 -47
- package/generators/aws/generator.spec.mjs +0 -47
- package/generators/azure-app-service/generator.spec.mjs +0 -47
- package/generators/azure-spring-cloud/generator.spec.mjs +0 -47
- package/generators/base/generator.spec.mjs +0 -44
- package/generators/bootstrap/generator.spec.mjs +0 -44
- package/generators/ci-cd/generator.spec.mjs +0 -47
- package/generators/client/__workflow/devserver-angular.json +0 -13
- package/generators/client/__workflow/devserver-react.json +0 -13
- package/generators/client/__workflow/devserver-vue.json +0 -13
- package/generators/client/generator.spec.mjs +0 -47
- package/generators/cloudfoundry/generator.spec.mjs +0 -47
- package/generators/common/generator.spec.mjs +0 -47
- package/generators/cypress/generator.spec.mjs +0 -47
- package/generators/database-changelog/generator.spec.mjs +0 -47
- package/generators/database-changelog-liquibase/generator.spec.mjs +0 -47
- package/generators/docker-compose/generator.spec.mjs +0 -44
- package/generators/entities/generator.spec.mjs +0 -47
- package/generators/entities-client/generator.spec.mjs +0 -47
- package/generators/entity/generator.spec.mjs +0 -47
- package/generators/entity-client/generator.spec.mjs +0 -47
- package/generators/entity-i18n/generator.spec.mjs +0 -47
- package/generators/entity-server/generator.spec.mjs +0 -47
- package/generators/export-jdl/generator.spec.mjs +0 -44
- package/generators/gae/generator.spec.mjs +0 -47
- package/generators/gradle/__snapshots__/generator.spec.cjs.snap +0 -59
- package/generators/gradle/generator.spec.cjs +0 -71
- package/generators/heroku/generator.spec.mjs +0 -47
- package/generators/info/generator.spec.mjs +0 -44
- package/generators/init/__snapshots__/generator.spec.cjs.snap +0 -65
- package/generators/init/generator.spec.cjs +0 -112
- package/generators/java/__snapshots__/generator.spec.cjs.snap +0 -118
- package/generators/java/generator.spec.cjs +0 -87
- package/generators/kubernetes/generator.spec.mjs +0 -44
- package/generators/kubernetes-helm/generator.spec.mjs +0 -44
- package/generators/kubernetes-knative/generator.spec.mjs +0 -44
- package/generators/languages/generator.spec.mjs +0 -47
- package/generators/maven/__snapshots__/generator.spec.cjs.snap +0 -53
- package/generators/maven/generator.spec.cjs +0 -78
- package/generators/openapi-client/generator.spec.mjs +0 -47
- package/generators/openshift/generator.spec.mjs +0 -44
- package/generators/page/generator.spec.mjs +0 -47
- package/generators/project-name/generator.spec.cjs +0 -43
- package/generators/server/__snapshots__/generator.spec.mjs.snap +0 -1931
- package/generators/server/generator.spec.mjs +0 -52
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactory.java.ejs +0 -83
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactoryBean.java.ejs +0 -40
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryQuery.java.ejs +0 -44
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlQueryCreator.java.ejs +0 -162
- package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlRepositoryQueryExecutor.java.ejs +0 -104
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json.ejs +0 -3
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json.ejs +0 -3
- package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs +0 -19
- package/generators/spring-boot/__snapshots__/generator.spec.cjs.snap +0 -80
- package/generators/spring-boot/generator.spec.cjs +0 -64
- package/generators/spring-controller/generator.spec.mjs +0 -47
- package/generators/spring-service/generator.spec.mjs +0 -47
- package/generators/upgrade/generator.spec.mjs +0 -44
- package/generators/upgrade-config/generator.spec.mjs +0 -44
- package/generators/workspaces/generator.spec.mjs +0 -47
|
@@ -29,6 +29,7 @@ const os = require('os');
|
|
|
29
29
|
const normalize = require('normalize-path');
|
|
30
30
|
const simpleGit = require('simple-git');
|
|
31
31
|
|
|
32
|
+
const SharedData = require('../lib/support/shared-data.cjs');
|
|
32
33
|
const packagejs = require('../package.json');
|
|
33
34
|
const jhipsterUtils = require('./utils');
|
|
34
35
|
const constants = require('./generator-constants');
|
|
@@ -42,6 +43,30 @@ const { calculateDbNameWithLimit, hibernateSnakeCase } = require('../utils/db');
|
|
|
42
43
|
const defaultApplicationOptions = require('../jdl/jhipster/default-application-options');
|
|
43
44
|
const databaseTypes = require('../jdl/jhipster/database-types');
|
|
44
45
|
const { ANGULAR_X: ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = require('../jdl/jhipster/client-framework-types');
|
|
46
|
+
const {
|
|
47
|
+
PRIORITY_NAMES: {
|
|
48
|
+
LOADING,
|
|
49
|
+
PREPARING,
|
|
50
|
+
|
|
51
|
+
CONFIGURING_EACH_ENTITY,
|
|
52
|
+
LOADING_EACH_ENTITY,
|
|
53
|
+
PREPARING_EACH_ENTITY,
|
|
54
|
+
PREPARING_FIELDS,
|
|
55
|
+
PREPARING_EACH_ENTITY_FIELD,
|
|
56
|
+
PREPARING_RELATIONSHIPS,
|
|
57
|
+
PREPARING_EACH_ENTITY_RELATIONSHIP,
|
|
58
|
+
POST_PREPARING_EACH_ENTITY,
|
|
59
|
+
|
|
60
|
+
DEFAULT,
|
|
61
|
+
WRITING,
|
|
62
|
+
WRITING_ENTITIES,
|
|
63
|
+
POST_WRITING,
|
|
64
|
+
POST_WRITING_ENTITIES,
|
|
65
|
+
PRE_CONFLICTS,
|
|
66
|
+
INSTALL,
|
|
67
|
+
END,
|
|
68
|
+
},
|
|
69
|
+
} = require('../lib/constants/priorities.cjs');
|
|
45
70
|
|
|
46
71
|
const JHIPSTER_CONFIG_DIR = constants.JHIPSTER_CONFIG_DIR;
|
|
47
72
|
const MODULES_HOOK_FILE = `${JHIPSTER_CONFIG_DIR}/modules/jhi-hooks.json`;
|
|
@@ -121,7 +146,6 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
|
|
|
121
146
|
// JHipster runtime config that should not be stored to .yo-rc.json.
|
|
122
147
|
this.configOptions = this.options.configOptions || { sharedEntities: {} };
|
|
123
148
|
this.configOptions.sharedEntities = this.configOptions.sharedEntities || {};
|
|
124
|
-
this._sharedData = this.options.jhipsterSharedData;
|
|
125
149
|
|
|
126
150
|
/* Force config to use 'generator-jhipster' namespace. */
|
|
127
151
|
this._config = this._getStorage('generator-jhipster', { sorted: true });
|
|
@@ -167,12 +191,29 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
|
|
|
167
191
|
return this.fetchFromInstalledJHipster(this._jhipsterGenerator, 'templates', ...args);
|
|
168
192
|
}
|
|
169
193
|
|
|
194
|
+
/**
|
|
195
|
+
* Get generator dependencies for building help
|
|
196
|
+
* This is a stub and should be overwritten by the generator.
|
|
197
|
+
*
|
|
198
|
+
* @returns {string[]}
|
|
199
|
+
*/
|
|
200
|
+
getPossibleDependencies() {
|
|
201
|
+
return [];
|
|
202
|
+
}
|
|
203
|
+
|
|
170
204
|
/**
|
|
171
205
|
* Shared Data
|
|
172
206
|
*/
|
|
173
207
|
get sharedData() {
|
|
174
208
|
if (!this._sharedData) {
|
|
175
|
-
|
|
209
|
+
const { baseName } = this.jhipsterConfig;
|
|
210
|
+
if (!baseName) {
|
|
211
|
+
throw new Error('baseName is required');
|
|
212
|
+
}
|
|
213
|
+
if (!this.options.sharedData[baseName]) {
|
|
214
|
+
this.options.sharedData[baseName] = {};
|
|
215
|
+
}
|
|
216
|
+
this._sharedData = new SharedData(this.options.sharedData[baseName]);
|
|
176
217
|
}
|
|
177
218
|
return this._sharedData;
|
|
178
219
|
}
|
|
@@ -1520,6 +1561,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
|
|
|
1520
1561
|
args,
|
|
1521
1562
|
{
|
|
1522
1563
|
...this.options,
|
|
1564
|
+
destinationRoot: this._destinationRoot,
|
|
1523
1565
|
configOptions: this.configOptions,
|
|
1524
1566
|
...options,
|
|
1525
1567
|
},
|
|
@@ -1579,8 +1621,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
|
|
|
1579
1621
|
* @return {object} entity definition
|
|
1580
1622
|
*/
|
|
1581
1623
|
readEntityJson(entityName) {
|
|
1582
|
-
const
|
|
1583
|
-
const file = this.destinationPath(configDir, `${entityName}.json`);
|
|
1624
|
+
const file = path.join(path.dirname(this.config.path), JHIPSTER_CONFIG_DIR, `${entityName}.json`);
|
|
1584
1625
|
try {
|
|
1585
1626
|
return this.fs.readJSON(file);
|
|
1586
1627
|
} catch (error) {
|
|
@@ -1919,15 +1960,6 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase {
|
|
|
1919
1960
|
* Prints a JHipster logo.
|
|
1920
1961
|
*/
|
|
1921
1962
|
printJHipsterLogo() {
|
|
1922
|
-
this.log('\n');
|
|
1923
|
-
this.log(`${chalk.green(' ██╗')}${chalk.red(' ██╗ ██╗ ████████╗ ███████╗ ██████╗ ████████╗ ████████╗ ███████╗')}`);
|
|
1924
|
-
this.log(`${chalk.green(' ██║')}${chalk.red(' ██║ ██║ ╚══██╔══╝ ██╔═══██╗ ██╔════╝ ╚══██╔══╝ ██╔═════╝ ██╔═══██╗')}`);
|
|
1925
|
-
this.log(`${chalk.green(' ██║')}${chalk.red(' ████████║ ██║ ███████╔╝ ╚█████╗ ██║ ██████╗ ███████╔╝')}`);
|
|
1926
|
-
this.log(`${chalk.green(' ██╗ ██║')}${chalk.red(' ██╔═══██║ ██║ ██╔════╝ ╚═══██╗ ██║ ██╔═══╝ ██╔══██║')}`);
|
|
1927
|
-
this.log(`${chalk.green(' ╚██████╔╝')}${chalk.red(' ██║ ██║ ████████╗ ██║ ██████╔╝ ██║ ████████╗ ██║ ╚██╗')}`);
|
|
1928
|
-
this.log(`${chalk.green(' ╚═════╝ ')}${chalk.red(' ╚═╝ ╚═╝ ╚═══════╝ ╚═╝ ╚═════╝ ╚═╝ ╚═══════╝ ╚═╝ ╚═╝')}\n`);
|
|
1929
|
-
this.log(chalk.white.bold(' https://www.jhipster.tech\n'));
|
|
1930
|
-
this.log(chalk.white('Welcome to JHipster ') + chalk.yellow(`v${packagejs.version}`));
|
|
1931
1963
|
this.log(chalk.white(`Application files will be generated in folder: ${chalk.yellow(process.cwd())}`));
|
|
1932
1964
|
if (process.cwd() === this.getUserHome()) {
|
|
1933
1965
|
this.log(chalk.red.bold('\n️⚠️ WARNING ⚠️ You are in your HOME folder!'));
|
|
@@ -2339,7 +2371,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
2339
2371
|
return val;
|
|
2340
2372
|
}
|
|
2341
2373
|
if (typeof val === 'function') {
|
|
2342
|
-
return val(context, this);
|
|
2374
|
+
return val.call(this, context, this);
|
|
2343
2375
|
}
|
|
2344
2376
|
throw new Error(`Type not supported ${val}`);
|
|
2345
2377
|
};
|
|
@@ -2547,7 +2579,27 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
2547
2579
|
if (this.configOptions.optionsParsed) return;
|
|
2548
2580
|
this.configOptions.optionsParsed = true;
|
|
2549
2581
|
|
|
2582
|
+
// Write new definitions to memfs
|
|
2583
|
+
if (options.applicationWithEntities) {
|
|
2584
|
+
this.config.set({
|
|
2585
|
+
...this.config.getAll(),
|
|
2586
|
+
...options.applicationWithEntities.config,
|
|
2587
|
+
});
|
|
2588
|
+
if (options.applicationWithEntities.entities) {
|
|
2589
|
+
const entities = options.applicationWithEntities.entities.map(entity => {
|
|
2590
|
+
const entityName = _.upperFirst(entity.name);
|
|
2591
|
+
const file = this.destinationPath(JHIPSTER_CONFIG_DIR, `${entityName}.json`);
|
|
2592
|
+
this.fs.writeJSON(file, { ...this.fs.readJSON(file), ...entity });
|
|
2593
|
+
return entityName;
|
|
2594
|
+
});
|
|
2595
|
+
this.jhipsterConfig.entities = [...new Set((this.jhipsterConfig.entities || []).concat(entities))];
|
|
2596
|
+
}
|
|
2597
|
+
}
|
|
2598
|
+
|
|
2550
2599
|
// Load stored options
|
|
2600
|
+
if (options.withGeneratedFlag !== undefined) {
|
|
2601
|
+
this.jhipsterConfig.withGeneratedFlag = options.withGeneratedFlag;
|
|
2602
|
+
}
|
|
2551
2603
|
if (options.skipJhipsterDependencies !== undefined) {
|
|
2552
2604
|
this.jhipsterConfig.skipJhipsterDependencies = options.skipJhipsterDependencies;
|
|
2553
2605
|
}
|
|
@@ -2770,6 +2822,10 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
2770
2822
|
dest.cucumberTests = dest.testFrameworks.includes(CUCUMBER);
|
|
2771
2823
|
dest.protractorTests = dest.testFrameworks.includes(PROTRACTOR);
|
|
2772
2824
|
dest.cypressTests = dest.testFrameworks.includes(CYPRESS);
|
|
2825
|
+
|
|
2826
|
+
dest.authenticationType = config.authenticationType;
|
|
2827
|
+
dest.rememberMeKey = config.rememberMeKey;
|
|
2828
|
+
dest.jwtSecretKey = config.jwtSecretKey;
|
|
2773
2829
|
}
|
|
2774
2830
|
|
|
2775
2831
|
loadDerivedMicroserviceAppConfig(dest = this) {
|
|
@@ -2804,6 +2860,10 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
2804
2860
|
dest.microfrontend ||
|
|
2805
2861
|
(dest.applicationTypeMicroservice && !dest.skipClient) ||
|
|
2806
2862
|
(dest.applicationTypeGateway && dest.microfrontends && dest.microfrontends.length > 0);
|
|
2863
|
+
|
|
2864
|
+
dest.authenticationTypeSession = dest.authenticationType === SESSION;
|
|
2865
|
+
dest.authenticationTypeJwt = dest.authenticationType === JWT;
|
|
2866
|
+
dest.authenticationTypeOauth2 = dest.authenticationType === OAUTH2;
|
|
2807
2867
|
}
|
|
2808
2868
|
|
|
2809
2869
|
/**
|
|
@@ -2864,10 +2924,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
2864
2924
|
|
|
2865
2925
|
dest.buildTool = config.buildTool;
|
|
2866
2926
|
|
|
2867
|
-
dest.authenticationType = config.authenticationType;
|
|
2868
|
-
dest.rememberMeKey = config.rememberMeKey;
|
|
2869
|
-
dest.jwtSecretKey = config.jwtSecretKey;
|
|
2870
|
-
|
|
2871
2927
|
dest.databaseType = config.databaseType;
|
|
2872
2928
|
dest.devDatabaseType = config.devDatabaseType;
|
|
2873
2929
|
dest.prodDatabaseType = config.prodDatabaseType;
|
|
@@ -2911,10 +2967,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
2911
2967
|
dest.messageBroker = false;
|
|
2912
2968
|
}
|
|
2913
2969
|
|
|
2914
|
-
dest.authenticationTypeSession = dest.authenticationType === SESSION;
|
|
2915
|
-
dest.authenticationTypeJwt = dest.authenticationType === JWT;
|
|
2916
|
-
dest.authenticationTypeOauth2 = dest.authenticationType === OAUTH2;
|
|
2917
|
-
|
|
2918
2970
|
dest.buildToolGradle = dest.buildTool === GRADLE;
|
|
2919
2971
|
dest.buildToolMaven = dest.buildTool === MAVEN;
|
|
2920
2972
|
dest.buildToolUnknown = !dest.buildToolGradle && !dest.buildToolMaven;
|
|
@@ -3048,6 +3100,13 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
3048
3100
|
return this.getDefaultConfigForApplicationType();
|
|
3049
3101
|
}
|
|
3050
3102
|
|
|
3103
|
+
/**
|
|
3104
|
+
* JHipster config with default values fallback
|
|
3105
|
+
*/
|
|
3106
|
+
get jhipsterConfigWithDefaults() {
|
|
3107
|
+
return _.defaults({}, this.jhipsterConfig, this.jhipsterDefaults);
|
|
3108
|
+
}
|
|
3109
|
+
|
|
3051
3110
|
/**
|
|
3052
3111
|
* Get default config based on applicationType
|
|
3053
3112
|
*/
|
|
@@ -3058,7 +3117,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
3058
3117
|
};
|
|
3059
3118
|
}
|
|
3060
3119
|
|
|
3061
|
-
setConfigDefaults(defaults = this.
|
|
3120
|
+
setConfigDefaults(defaults = this.jhipsterDefaults) {
|
|
3062
3121
|
const jhipsterVersion = packagejs.version;
|
|
3063
3122
|
const baseName = this.getDefaultAppName();
|
|
3064
3123
|
const creationTimestamp = new Date().getTime();
|
|
@@ -3176,6 +3235,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
3176
3235
|
* @param String options - Object containing options.
|
|
3177
3236
|
*/
|
|
3178
3237
|
jhipsterOptions(options = {}) {
|
|
3238
|
+
options = _.cloneDeep(options);
|
|
3179
3239
|
Object.entries(options).forEach(([optionName, optionDesc]) => {
|
|
3180
3240
|
this.option(kebabCase(optionName), optionDesc);
|
|
3181
3241
|
if (!optionDesc.scope) return;
|
|
@@ -3185,6 +3245,8 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
3185
3245
|
this.config.set(optionName, optionValue);
|
|
3186
3246
|
} else if (optionDesc.scope === 'runtime') {
|
|
3187
3247
|
this.configOptions[optionName] = optionValue;
|
|
3248
|
+
} else if (optionDesc.scope === 'generator') {
|
|
3249
|
+
this[optionName] = optionValue;
|
|
3188
3250
|
} else {
|
|
3189
3251
|
throw new Error(`Scope ${optionDesc.scope} not supported`);
|
|
3190
3252
|
}
|
|
@@ -3193,8 +3255,51 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
|
|
|
3193
3255
|
});
|
|
3194
3256
|
}
|
|
3195
3257
|
|
|
3258
|
+
getArgsForPriority(priorityName) {
|
|
3259
|
+
if (this.features.priorityArgs) {
|
|
3260
|
+
return [this.getDataArgForPriority(priorityName)];
|
|
3261
|
+
}
|
|
3262
|
+
return this.args;
|
|
3263
|
+
}
|
|
3264
|
+
|
|
3265
|
+
/**
|
|
3266
|
+
*/
|
|
3267
|
+
getDataArgForPriority(priorityName) {
|
|
3268
|
+
if (
|
|
3269
|
+
![
|
|
3270
|
+
LOADING,
|
|
3271
|
+
PREPARING,
|
|
3272
|
+
|
|
3273
|
+
CONFIGURING_EACH_ENTITY,
|
|
3274
|
+
LOADING_EACH_ENTITY,
|
|
3275
|
+
PREPARING_EACH_ENTITY,
|
|
3276
|
+
PREPARING_FIELDS,
|
|
3277
|
+
PREPARING_EACH_ENTITY_FIELD,
|
|
3278
|
+
PREPARING_RELATIONSHIPS,
|
|
3279
|
+
PREPARING_EACH_ENTITY_RELATIONSHIP,
|
|
3280
|
+
POST_PREPARING_EACH_ENTITY,
|
|
3281
|
+
|
|
3282
|
+
DEFAULT,
|
|
3283
|
+
WRITING,
|
|
3284
|
+
WRITING_ENTITIES,
|
|
3285
|
+
POST_WRITING,
|
|
3286
|
+
POST_WRITING_ENTITIES,
|
|
3287
|
+
PRE_CONFLICTS,
|
|
3288
|
+
INSTALL,
|
|
3289
|
+
END,
|
|
3290
|
+
].includes(priorityName)
|
|
3291
|
+
) {
|
|
3292
|
+
throw new Error(`${priorityName} data not available`);
|
|
3293
|
+
}
|
|
3294
|
+
if (!this.jhipsterConfig.baseName) {
|
|
3295
|
+
return {};
|
|
3296
|
+
}
|
|
3297
|
+
return { application: this.sharedData.getApplication() };
|
|
3298
|
+
}
|
|
3299
|
+
|
|
3196
3300
|
/**
|
|
3197
3301
|
* Create a simple-git instance using current destinationPath as baseDir.
|
|
3302
|
+
* @return {import('simple-git').SimpleGit}
|
|
3198
3303
|
*/
|
|
3199
3304
|
createGit() {
|
|
3200
3305
|
return simpleGit({ baseDir: this.destinationPath() }).env({
|
|
@@ -27,7 +27,7 @@ const JAVA_VERSION = '11';
|
|
|
27
27
|
const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
|
|
28
28
|
|
|
29
29
|
// Version of Node, NPM
|
|
30
|
-
const NODE_VERSION = '16.
|
|
30
|
+
const NODE_VERSION = '16.14.0';
|
|
31
31
|
const NPM_VERSION = commonPackageJson.devDependencies.npm;
|
|
32
32
|
const OPENAPI_GENERATOR_CLI_VERSION = '1.0.13-4.3.1';
|
|
33
33
|
|
|
@@ -35,7 +35,7 @@ const GRADLE_VERSION = gradleOptions.GRADLE_VERSION;
|
|
|
35
35
|
const JIB_VERSION = '3.2.0';
|
|
36
36
|
|
|
37
37
|
// Libraries version
|
|
38
|
-
const JHIPSTER_DEPENDENCIES_VERSION = '7.
|
|
38
|
+
const JHIPSTER_DEPENDENCIES_VERSION = '7.7.0';
|
|
39
39
|
// The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
|
|
40
40
|
const SPRING_BOOT_VERSION = '2.6.3';
|
|
41
41
|
const LIQUIBASE_VERSION = '4.6.1';
|
|
@@ -49,34 +49,35 @@ const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.2';
|
|
|
49
49
|
// Version of docker images
|
|
50
50
|
const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
|
|
51
51
|
// const DOCKER_JHIPSTER_REGISTRY = 'ghcr.io/jhipster/jhipster-registry:main';
|
|
52
|
-
const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.
|
|
52
|
+
const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.3.0';
|
|
53
53
|
const DOCKER_JHIPSTER_CONTROL_CENTER = 'jhipster/jhipster-control-center:v0.5.0';
|
|
54
54
|
const DOCKER_JAVA_JRE = 'eclipse-temurin:11-jre-focal';
|
|
55
|
-
const DOCKER_MYSQL = 'mysql:8.0.
|
|
55
|
+
const DOCKER_MYSQL = 'mysql:8.0.28';
|
|
56
56
|
const DOCKER_MARIADB = 'mariadb:10.7.1';
|
|
57
|
-
const DOCKER_POSTGRESQL = 'postgres:14.
|
|
58
|
-
const DOCKER_MONGODB = 'mongo:4.4.
|
|
59
|
-
const DOCKER_COUCHBASE = 'couchbase/server:7.0.
|
|
60
|
-
const DOCKER_CASSANDRA = 'cassandra:3.11.
|
|
61
|
-
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-
|
|
62
|
-
const DOCKER_NEO4J = 'neo4j:4.4.
|
|
63
|
-
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.
|
|
64
|
-
const DOCKER_MEMCACHED = 'memcached:1.6.
|
|
57
|
+
const DOCKER_POSTGRESQL = 'postgres:14.2';
|
|
58
|
+
const DOCKER_MONGODB = 'mongo:4.4.12';
|
|
59
|
+
const DOCKER_COUCHBASE = 'couchbase/server:7.0.3';
|
|
60
|
+
const DOCKER_CASSANDRA = 'cassandra:3.11.12';
|
|
61
|
+
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU15-ubuntu-20.04';
|
|
62
|
+
const DOCKER_NEO4J = 'neo4j:4.4.4';
|
|
63
|
+
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2022.01';
|
|
64
|
+
const DOCKER_MEMCACHED = 'memcached:1.6.14-alpine';
|
|
65
65
|
const DOCKER_REDIS = 'redis:6.2.6';
|
|
66
66
|
const DOCKER_KEYCLOAK = 'jboss/keycloak:16.1.0'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
|
|
67
67
|
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.15.2'; // The version should be coherent with the one from spring-data-elasticsearch project
|
|
68
68
|
const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`;
|
|
69
69
|
const DOCKER_ZOOKEEPER = `confluentinc/cp-zookeeper:${KAFKA_VERSION}`;
|
|
70
|
-
const DOCKER_SONAR = 'sonarqube:9.
|
|
71
|
-
const DOCKER_CONSUL = 'consul:1.11.
|
|
70
|
+
const DOCKER_SONAR = 'sonarqube:9.3.0-community';
|
|
71
|
+
const DOCKER_CONSUL = 'consul:1.11.3';
|
|
72
72
|
const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1';
|
|
73
|
-
const DOCKER_PROMETHEUS = 'prom/prometheus:v2.
|
|
73
|
+
const DOCKER_PROMETHEUS = 'prom/prometheus:v2.33.3';
|
|
74
74
|
const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.23.0';
|
|
75
|
-
const DOCKER_GRAFANA = 'grafana/grafana:8.
|
|
75
|
+
const DOCKER_GRAFANA = 'grafana/grafana:8.4.1';
|
|
76
76
|
const DOCKER_JENKINS = 'jenkins/jenkins:lts-jdk11';
|
|
77
77
|
const DOCKER_SWAGGER_EDITOR = 'swaggerapi/swagger-editor:latest';
|
|
78
78
|
const DOCKER_PROMETHEUS_OPERATOR = 'quay.io/coreos/prometheus-operator:v0.42.1';
|
|
79
79
|
const DOCKER_GRAFANA_WATCHER = 'quay.io/coreos/grafana-watcher:v0.0.8';
|
|
80
|
+
const DOCKER_ZIPKIN = 'openzipkin/zipkin:2.23';
|
|
80
81
|
|
|
81
82
|
// Kubernetes versions
|
|
82
83
|
const KUBERNETES_CORE_API_VERSION = 'v1';
|
|
@@ -418,6 +419,7 @@ const constants = {
|
|
|
418
419
|
KUBERNETES_INGRESS_API_VERSION,
|
|
419
420
|
KUBERNETES_ISTIO_NETWORKING_API_VERSION,
|
|
420
421
|
KUBERNETES_RBAC_API_VERSION,
|
|
422
|
+
DOCKER_ZIPKIN,
|
|
421
423
|
|
|
422
424
|
HELM_KAFKA,
|
|
423
425
|
HELM_ELASTICSEARCH,
|
|
@@ -25,6 +25,7 @@ const Generators = {
|
|
|
25
25
|
GENERATOR_AZURE_SPRING_CLOUD: 'azure-spring-cloud',
|
|
26
26
|
GENERATOR_BASE: 'base',
|
|
27
27
|
GENERATOR_BOOTSTRAP: 'bootstrap',
|
|
28
|
+
GENERATOR_BOOTSTRAP_APPLICATION: 'bootstrap-application',
|
|
28
29
|
GENERATOR_CI_CD: 'ci-cd',
|
|
29
30
|
/* @deprecated */
|
|
30
31
|
GENERATOR_CICD: 'ci-cd',
|
|
@@ -45,6 +46,7 @@ const Generators = {
|
|
|
45
46
|
GENERATOR_ENTITY_SERVER: 'entity-server',
|
|
46
47
|
GENERATOR_EXPORT_JDL: 'export-jdl',
|
|
47
48
|
GENERATOR_GAE: 'gae',
|
|
49
|
+
GENERATOR_GENERATE_BLUEPRINT: 'generate-blueprint',
|
|
48
50
|
GENERATOR_GRADLE: 'gradle',
|
|
49
51
|
GENERATOR_HEROKU: 'heroku',
|
|
50
52
|
GENERATOR_INFO: 'info',
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright 2013-2022 the original author or authors from the JHipster project.
|
|
3
|
+
*
|
|
4
|
+
* This file is part of the JHipster project, see https://www.jhipster.tech/
|
|
5
|
+
* for more information.
|
|
6
|
+
*
|
|
7
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
8
|
+
* you may not use this file except in compliance with the License.
|
|
9
|
+
* You may obtain a copy of the License at
|
|
10
|
+
*
|
|
11
|
+
* https://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
+
*
|
|
13
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
+
* See the License for the specific language governing permissions and
|
|
17
|
+
* limitations under the License.
|
|
18
|
+
*/
|
|
19
|
+
export { default } from './index.cjs';
|
package/generators/info/esm.mjs
CHANGED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright 2013-2022 the original author or authors from the JHipster project.
|
|
3
|
+
*
|
|
4
|
+
* This file is part of the JHipster project, see https://www.jhipster.tech/
|
|
5
|
+
* for more information.
|
|
6
|
+
*
|
|
7
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
8
|
+
* you may not use this file except in compliance with the License.
|
|
9
|
+
* You may obtain a copy of the License at
|
|
10
|
+
*
|
|
11
|
+
* https://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
+
*
|
|
13
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
+
* See the License for the specific language governing permissions and
|
|
17
|
+
* limitations under the License.
|
|
18
|
+
*/
|
|
19
|
+
export { default } from './index.cjs';
|
|
@@ -16,7 +16,6 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
|
|
20
19
|
module.exports.files = {
|
|
21
20
|
prettier: [
|
|
22
21
|
{
|
|
@@ -30,7 +29,14 @@ module.exports.files = {
|
|
|
30
29
|
],
|
|
31
30
|
global: [
|
|
32
31
|
{
|
|
33
|
-
templates: [
|
|
32
|
+
templates: [
|
|
33
|
+
'README.md',
|
|
34
|
+
'.editorconfig.jhi',
|
|
35
|
+
{
|
|
36
|
+
override: false,
|
|
37
|
+
file: 'package.json',
|
|
38
|
+
},
|
|
39
|
+
],
|
|
34
40
|
},
|
|
35
41
|
],
|
|
36
42
|
};
|
|
@@ -39,7 +45,7 @@ module.exports.commitHooksFiles = {
|
|
|
39
45
|
commitHooks: [
|
|
40
46
|
{
|
|
41
47
|
templates: [
|
|
42
|
-
'.lintstagedrc.
|
|
48
|
+
'.lintstagedrc.cjs',
|
|
43
49
|
{
|
|
44
50
|
file: '.husky/pre-commit',
|
|
45
51
|
method: 'copy',
|
|
@@ -165,6 +165,11 @@ module.exports = class extends MixedChain {
|
|
|
165
165
|
|
|
166
166
|
get writing() {
|
|
167
167
|
return {
|
|
168
|
+
cleanup() {
|
|
169
|
+
if (this.isJhipsterVersionLessThan('7.5.1')) {
|
|
170
|
+
this.removeFile('.lintstagedrc.js');
|
|
171
|
+
}
|
|
172
|
+
},
|
|
168
173
|
async writeFiles() {
|
|
169
174
|
if (this.shouldSkipFiles()) return;
|
|
170
175
|
await this.writeFiles({ sections: files, context: this.application });
|
|
File without changes
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright 2013-2022 the original author or authors from the JHipster project.
|
|
3
|
+
*
|
|
4
|
+
* This file is part of the JHipster project, see https://www.jhipster.tech/
|
|
5
|
+
* for more information.
|
|
6
|
+
*
|
|
7
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
8
|
+
* you may not use this file except in compliance with the License.
|
|
9
|
+
* You may obtain a copy of the License at
|
|
10
|
+
*
|
|
11
|
+
* https://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
+
*
|
|
13
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
+
* See the License for the specific language governing permissions and
|
|
17
|
+
* limitations under the License.
|
|
18
|
+
*/
|
|
19
|
+
export { default } from './index.cjs';
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
/* eslint-disable consistent-return */
|
|
20
20
|
const chalk = require('chalk');
|
|
21
21
|
const { generateMixedChain } = require('../../lib/support/mixin.cjs');
|
|
22
|
+
const GeneratorBaseEntity = require('../generator-base-entities.cjs');
|
|
22
23
|
const {
|
|
23
24
|
INITIALIZING_PRIORITY,
|
|
24
25
|
PROMPTING_PRIORITY,
|
|
@@ -26,10 +27,15 @@ const {
|
|
|
26
27
|
COMPOSING_PRIORITY,
|
|
27
28
|
LOADING_PRIORITY,
|
|
28
29
|
PREPARING_PRIORITY,
|
|
30
|
+
CONFIGURING_EACH_ENTITY_PRIORITY,
|
|
31
|
+
PREPARING_EACH_ENTITY_PRIORITY,
|
|
32
|
+
PREPARING_EACH_ENTITY_FIELD_PRIORITY,
|
|
33
|
+
PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY,
|
|
29
34
|
WRITING_PRIORITY,
|
|
35
|
+
WRITING_ENTITIES_PRIORITY,
|
|
30
36
|
} = require('../../lib/constants/priorities.cjs');
|
|
31
37
|
|
|
32
|
-
const { GENERATOR_JAVA } = require('../generator-list');
|
|
38
|
+
const { GENERATOR_JAVA, GENERATOR_BOOTSTRAP_APPLICATION } = require('../generator-list');
|
|
33
39
|
const {
|
|
34
40
|
PACKAGE_NAME,
|
|
35
41
|
PACKAGE_NAME_DEFAULT_VALUE,
|
|
@@ -42,7 +48,7 @@ const {
|
|
|
42
48
|
const { files } = require('./files.cjs');
|
|
43
49
|
const { dependencyChain } = require('./mixin.cjs');
|
|
44
50
|
|
|
45
|
-
const MixedChain = generateMixedChain(GENERATOR_JAVA);
|
|
51
|
+
const MixedChain = generateMixedChain(GeneratorBaseEntity, GENERATOR_JAVA);
|
|
46
52
|
|
|
47
53
|
module.exports = class extends MixedChain {
|
|
48
54
|
constructor(args, options, features) {
|
|
@@ -64,6 +70,11 @@ module.exports = class extends MixedChain {
|
|
|
64
70
|
}
|
|
65
71
|
}
|
|
66
72
|
|
|
73
|
+
async _postConstruct() {
|
|
74
|
+
this.loadStoredAppOptions();
|
|
75
|
+
await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
|
|
76
|
+
}
|
|
77
|
+
|
|
67
78
|
async _beforeQueue() {
|
|
68
79
|
if (!this.fromBlueprint) {
|
|
69
80
|
const configure = this.options.configure || !this.shouldComposeModular();
|
|
@@ -194,6 +205,42 @@ module.exports = class extends MixedChain {
|
|
|
194
205
|
return this.preparing;
|
|
195
206
|
}
|
|
196
207
|
|
|
208
|
+
get configuringEachEntity() {
|
|
209
|
+
return {};
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
get [CONFIGURING_EACH_ENTITY_PRIORITY]() {
|
|
213
|
+
if (this.delegateToBlueprint) return {};
|
|
214
|
+
return this.configuringEachEntity;
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
get preparingEachEntity() {
|
|
218
|
+
return {};
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
get [PREPARING_EACH_ENTITY_PRIORITY]() {
|
|
222
|
+
if (this.delegateToBlueprint) return {};
|
|
223
|
+
return this.preparingEachEntity;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
get preparingEachEntityField() {
|
|
227
|
+
return {};
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
get [PREPARING_EACH_ENTITY_FIELD_PRIORITY]() {
|
|
231
|
+
if (this.delegateToBlueprint) return {};
|
|
232
|
+
return this.preparingEachEntityField;
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
get preparingEachEntityRelationship() {
|
|
236
|
+
return {};
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
get [PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY]() {
|
|
240
|
+
if (this.delegateToBlueprint) return {};
|
|
241
|
+
return this.preparingEachEntityRelationship;
|
|
242
|
+
}
|
|
243
|
+
|
|
197
244
|
get writing() {
|
|
198
245
|
return {
|
|
199
246
|
async writeFiles() {
|
|
@@ -208,6 +255,15 @@ module.exports = class extends MixedChain {
|
|
|
208
255
|
return this.writing;
|
|
209
256
|
}
|
|
210
257
|
|
|
258
|
+
get writingEntities() {
|
|
259
|
+
return {};
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
get [WRITING_ENTITIES_PRIORITY]() {
|
|
263
|
+
if (this.delegateToBlueprint) return {};
|
|
264
|
+
return this.writingEntities;
|
|
265
|
+
}
|
|
266
|
+
|
|
211
267
|
/*
|
|
212
268
|
* Start of local public API, blueprints may override to customize the generator behavior.
|
|
213
269
|
*/
|
|
@@ -16,6 +16,5 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
export default generator;
|
|
19
|
+
export { default } from './index.js';
|
|
20
|
+
export { clientI18nFiles as files } from './files.js';
|