generator-jhipster 7.2.0 → 7.4.1
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/cli/environment-builder.js +1 -0
- package/cli/import-jdl.js +3 -2
- package/cli/jdl.js +1 -0
- package/cli/jhipster-command.js +2 -2
- package/cli/program.js +32 -29
- package/generators/app/index.js +35 -26
- package/generators/aws/index.js +8 -8
- package/generators/aws/lib/eb.js +1 -1
- package/generators/azure-app-service/index.js +16 -9
- package/generators/azure-app-service/templates/github/workflows/azure-app-service.yml.ejs +2 -2
- package/generators/azure-spring-cloud/index.js +16 -9
- package/generators/azure-spring-cloud/templates/github/workflows/azure-spring-cloud.yml.ejs +2 -2
- package/generators/bootstrap/index.js +57 -61
- package/generators/ci-cd/index.js +11 -8
- package/generators/ci-cd/templates/github-actions.yml.ejs +1 -1
- package/generators/ci-cd/templates/travis.yml.ejs +9 -4
- package/generators/client/__workflow/devserver-angular.json +1 -1
- package/generators/client/__workflow/devserver-react.json +1 -1
- package/generators/client/__workflow/devserver-vue.json +1 -1
- package/generators/client/files-angular.js +6 -0
- package/generators/client/files-common.js +6 -2
- package/generators/client/files-react.js +13 -2
- package/generators/client/files-vue.js +56 -6
- package/generators/client/index.js +114 -32
- package/generators/client/needle-api/needle-client-angular.js +1 -1
- package/generators/client/needle-api/needle-client-vue.js +57 -7
- package/generators/client/templates/angular/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/angular/package.json +19 -19
- package/generators/client/templates/angular/package.json.ejs +2 -1
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +52 -54
- package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs +65 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs +78 -80
- package/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.spec.ts.ejs +41 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +73 -75
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs +62 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +44 -46
- package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs +61 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs +116 -118
- package/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.spec.ts.ejs +66 -0
- package/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +75 -77
- package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +74 -76
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +48 -50
- package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs +50 -52
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +45 -47
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +66 -0
- package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +99 -101
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +61 -63
- package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs +19 -21
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +2 -2
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +28 -30
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs +62 -64
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +35 -37
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +40 -42
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +87 -89
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +41 -43
- package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +81 -83
- package/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +3 -0
- package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +178 -180
- package/generators/client/templates/angular/src/main/webapp/app/core/config/application-config.service.ts.ejs +9 -0
- package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.service.spec.ts.ejs +87 -89
- package/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +93 -95
- package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +166 -168
- package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +66 -68
- package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +27 -29
- package/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +112 -114
- package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +132 -134
- package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +29 -31
- package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +2 -3
- package/generators/client/templates/common/README.md.jhi.client.ejs +34 -0
- package/generators/client/templates/common/package.json +7 -7
- package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +56 -0
- package/generators/client/templates/react/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/react/package.json +57 -56
- package/generators/client/templates/react/package.json.ejs +5 -2
- package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +6 -6
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +8 -8
- package/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +3 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +7 -7
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +1 -1
- package/generators/client/templates/react/webpack/webpack.dev.js.ejs +17 -1
- package/generators/client/templates/react/webpack/webpack.prod.js.ejs +13 -1
- package/generators/client/templates/vue/.eslintrc.js.ejs +8 -5
- package/generators/client/templates/vue/package.json +40 -49
- package/generators/client/templates/vue/package.json.ejs +14 -18
- package/generators/client/templates/vue/src/main/webapp/app/account/account.service.ts.ejs +6 -5
- package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs +7 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.vue.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/tracker/tracker.service.ts.ejs +5 -4
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +9 -0
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-view.component.ts.ejs +5 -0
- package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +5 -0
- package/generators/client/templates/vue/src/main/webapp/app/constants.ts.ejs +16 -6
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +27 -8
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +6 -0
- package/generators/client/templates/vue/src/main/webapp/app/declarations.d.ts.ejs +41 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.component.ts.ejs +34 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.vue.ejs +13 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.component.ts.ejs +14 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.vue.ejs +5 -0
- package/generators/client/templates/vue/{webpack/utils.js.ejs → src/main/webapp/app/index.ts.ejs} +1 -12
- package/generators/client/templates/vue/src/main/webapp/app/locale/translation.service.ts.ejs +26 -9
- package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +23 -11
- package/generators/client/templates/vue/src/main/webapp/app/router/admin.ts.ejs +4 -4
- package/generators/client/templates/vue/src/main/webapp/app/router/entities.ts.ejs +45 -3
- package/generators/client/templates/vue/src/main/webapp/app/router/index.ts.ejs +19 -3
- package/generators/client/templates/vue/src/main/webapp/app/shared/alert/alert.service.ts.ejs +61 -0
- package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +0 -2
- package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +3 -1
- package/generators/client/templates/vue/src/main/webapp/app/shims-vue.d.ts.ejs +17 -3
- package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +25 -10
- package/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs +2 -2
- package/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs +2 -2
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.component.spec.ts.ejs +12 -12
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.service.spec.ts.ejs +2 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs +5 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs +2 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +5 -1
- package/generators/client/templates/vue/src/test/javascript/spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs +10 -4
- package/generators/client/templates/vue/src/test/javascript/spec/app/entities/entities-menu.spec.ts.ejs +52 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.component.ts.ejs +4 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.vue.ejs +7 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-router.ts.ejs +1 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/shared/alert/alert.service.spec.ts.ejs +124 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/axios-interceptor.spec.ts.ejs +0 -1
- package/generators/client/templates/vue/tsconfig.json.ejs +6 -10
- package/generators/client/templates/vue/tsconfig.spec.json.ejs +37 -0
- package/generators/client/templates/vue/webpack/config.js.ejs +50 -0
- package/generators/client/templates/vue/webpack/vue.utils.js.ejs +33 -32
- package/generators/client/templates/vue/webpack/webpack.common.js.ejs +152 -126
- package/generators/client/templates/vue/webpack/webpack.dev.js.ejs +19 -76
- package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs +77 -0
- package/generators/client/templates/vue/webpack/webpack.prod.js.ejs +5 -41
- package/generators/cloudfoundry/index.js +9 -9
- package/generators/common/index.js +12 -10
- package/generators/common/templates/.husky/pre-commit +1 -1
- package/generators/common/templates/.prettierrc.ejs +1 -1
- package/generators/common/templates/README.md.jhi.ejs +21 -0
- package/generators/common/templates/package.json +4 -4
- package/generators/cypress/index.js +12 -9
- package/generators/cypress/templates/cypress.json.ejs +9 -2
- package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +30 -2
- package/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +4 -4
- package/generators/cypress/templates/src/test/javascript/cypress/support/index.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
- package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +1 -1
- package/generators/database-changelog/index.js +33 -22
- package/generators/database-changelog-liquibase/index.js +12 -8
- package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +1 -1
- package/generators/docker-compose/index.js +11 -12
- package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +13 -12
- package/generators/entities/index.js +35 -26
- package/generators/entities-client/index.js +10 -7
- package/generators/entity/index.js +49 -29
- package/generators/entity-client/files.js +7 -16
- package/generators/entity-client/index.js +74 -11
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +42 -44
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs +58 -60
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +105 -107
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +8 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs +52 -54
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs +1 -1
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs +173 -175
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +2 -4
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +193 -195
- package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +7 -0
- package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +269 -109
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs +5 -2
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +17 -14
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +11 -13
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-details.component.ts.ejs +5 -0
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs +23 -8
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.vue.ejs +6 -9
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.component.ts.ejs +9 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs +1 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs +2 -6
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.ejs +2 -1
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs +8 -1
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs +8 -2
- package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs +1 -1
- package/generators/entity-i18n/index.js +7 -4
- package/generators/entity-server/files-couchbase.js +2 -2
- package/generators/entity-server/files.js +35 -30
- package/generators/entity-server/index.js +12 -8
- package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +2 -2
- package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.fts.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +6 -2
- package/generators/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +17 -30
- package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +5 -5
- package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +46 -0
- package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +3 -3
- package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +2 -2
- package/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs +8 -8
- package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs +4 -4
- package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs +4 -4
- package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs +7 -3
- package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +8 -8
- package/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs +1 -1
- package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +7 -3
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +51 -53
- package/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs +1 -1
- package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +17 -14
- package/generators/gae/index.js +10 -10
- package/generators/generator-base-blueprint.js +14 -46
- package/generators/generator-base-private.js +42 -22
- package/generators/generator-base.js +57 -20
- package/generators/generator-constants.js +29 -21
- package/generators/generator-transforms.js +39 -27
- package/generators/heroku/index.js +27 -48
- package/generators/init/constants.cjs +1 -1
- package/generators/init/templates/.husky/pre-commit +1 -1
- package/generators/java/constants.cjs +1 -1
- package/generators/kubernetes/files.js +3 -0
- package/generators/kubernetes/index.js +10 -10
- package/generators/kubernetes/templates/db/couchbase.yml.ejs +1 -1
- package/generators/kubernetes/templates/deployment.yml.ejs +8 -3
- package/generators/kubernetes/templates/istio/destination-rule.yml.ejs +1 -1
- package/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs +10 -8
- package/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway.yml.ejs +7 -5
- package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs +9 -0
- package/generators/kubernetes-base.js +1 -0
- package/generators/kubernetes-helm/files.js +3 -8
- package/generators/kubernetes-helm/index.js +10 -10
- package/generators/kubernetes-helm/templates/README-KUBERNETES-HELM.md.ejs +0 -1
- package/generators/kubernetes-helm/templates/app/Chart.yml.ejs +27 -0
- package/generators/kubernetes-helm/templates/app/helpers.tpl.ejs +0 -11
- package/generators/kubernetes-helm/templates/app/requirements.yml.ejs +7 -2
- package/generators/kubernetes-helm/templates/app/values.yml.ejs +68 -5
- package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs +17 -0
- package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs +2 -2
- package/generators/kubernetes-knative/index.js +10 -10
- package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs +6 -4
- package/generators/kubernetes-knative/templates/service.yml.ejs +1 -1
- package/generators/languages/index.js +13 -13
- package/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs +1 -2
- package/generators/languages/templates/src/main/webapp/i18n/vi/login.json +1 -1
- package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
- package/generators/openapi-client/index.js +13 -10
- package/generators/openshift/index.js +10 -11
- package/generators/openshift/templates/deployment.yml.ejs +1 -1
- package/generators/page/index.js +12 -10
- package/generators/server/__snapshots__/generator.spec.mjs.snap +12 -0
- package/generators/server/files-sql.js +52 -0
- package/generators/server/files.js +15 -0
- package/generators/server/index.js +100 -33
- package/generators/server/needle-api/needle-server-cache.js +4 -6
- package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
- package/generators/server/templates/build.gradle.ejs +17 -1
- package/generators/server/templates/gradle.properties.ejs +11 -11
- package/generators/server/templates/npmw +1 -1
- package/generators/server/templates/npmw.cmd +1 -1
- package/generators/server/templates/pom.xml.ejs +128 -9
- package/generators/server/templates/settings.gradle.ejs +9 -0
- package/generators/server/templates/sql/reactive/src/main/java/package/repository/UserSqlHelper.java.ejs +48 -0
- package/generators/server/templates/src/main/docker/app.yml.ejs +2 -1
- package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +13 -12
- package/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_cassandra.java.ejs +0 -6
- package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_sql.java.ejs +2 -2
- package/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs +1 -1
- package/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs +0 -2
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +2 -5
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +9 -1
- package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +0 -1
- package/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs +68 -0
- package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +0 -23
- package/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs +0 -2
- package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +29 -4
- package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +21 -9
- package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +13 -5
- package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +1 -1
- package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +1 -1
- package/generators/server/templates/src/main/resources/config/application.yml.ejs +7 -7
- package/generators/server/templates/src/main/resources/static/microservices_index.html.ejs +1 -1
- package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs +113 -0
- package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +6 -1
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderSecurityMetersTests.java.ejs +198 -0
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs +13 -3
- package/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +16 -2
- package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +63 -0
- package/generators/spring-controller/index.js +9 -7
- package/generators/spring-service/index.js +10 -7
- package/generators/upgrade/index.js +4 -5
- package/generators/utils.js +2 -2
- package/generators/workspaces/index.js +16 -7
- package/jdl/jhipster/default-application-options.js +9 -7
- package/package.json +23 -23
- package/utils/entity.js +21 -4
- package/utils/field.js +12 -2
- package/utils/multi-step-transform/index.js +8 -8
- package/generators/client/templates/react/.npmrc.ejs +0 -1
- package/generators/client/templates/vue/webpack/dev.env.js.ejs +0 -17
- package/generators/client/templates/vue/webpack/env.js.ejs +0 -67
- package/generators/client/templates/vue/webpack/loader.conf.js.ejs +0 -20
- package/generators/client/templates/vue/webpack/prod.env.js.ejs +0 -15
|
@@ -45,8 +45,6 @@ const {
|
|
|
45
45
|
const NO_CACHE_PROVIDER = cacheProviders.NO;
|
|
46
46
|
const NO_MESSAGE_BROKER = messageBrokers.NO;
|
|
47
47
|
|
|
48
|
-
let useBlueprints;
|
|
49
|
-
|
|
50
48
|
module.exports = class extends BaseBlueprintGenerator {
|
|
51
49
|
constructor(args, options, features) {
|
|
52
50
|
super(args, options, features);
|
|
@@ -60,8 +58,12 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
60
58
|
description: 'default option',
|
|
61
59
|
});
|
|
62
60
|
this.defaultOption = this.options.default;
|
|
61
|
+
}
|
|
63
62
|
|
|
64
|
-
|
|
63
|
+
async _postConstruct() {
|
|
64
|
+
if (!this.fromBlueprint) {
|
|
65
|
+
await this.composeWithBlueprints(GENERATOR_SPRING_CONTROLLER, { arguments: [this.name] });
|
|
66
|
+
}
|
|
65
67
|
}
|
|
66
68
|
|
|
67
69
|
// Public API method used by the getter and also by Blueprints
|
|
@@ -94,7 +96,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
get initializing() {
|
|
97
|
-
if (
|
|
99
|
+
if (this.delegateToBlueprint) return {};
|
|
98
100
|
return this._initializing();
|
|
99
101
|
}
|
|
100
102
|
|
|
@@ -106,7 +108,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
106
108
|
}
|
|
107
109
|
|
|
108
110
|
get prompting() {
|
|
109
|
-
if (
|
|
111
|
+
if (this.delegateToBlueprint) return {};
|
|
110
112
|
return this._prompting();
|
|
111
113
|
}
|
|
112
114
|
|
|
@@ -120,7 +122,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
120
122
|
}
|
|
121
123
|
|
|
122
124
|
get default() {
|
|
123
|
-
if (
|
|
125
|
+
if (this.delegateToBlueprint) return {};
|
|
124
126
|
return this._default();
|
|
125
127
|
}
|
|
126
128
|
|
|
@@ -177,7 +179,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
177
179
|
}
|
|
178
180
|
|
|
179
181
|
get writing() {
|
|
180
|
-
if (
|
|
182
|
+
if (this.delegateToBlueprint) return {};
|
|
181
183
|
return this._writing();
|
|
182
184
|
}
|
|
183
185
|
};
|
|
@@ -27,7 +27,6 @@ const { GENERATOR_SPRING_SERVICE } = require('../generator-list');
|
|
|
27
27
|
const { BASE_NAME, PACKAGE_NAME, PACKAGE_FOLDER, DATABASE_TYPE } = OptionNames;
|
|
28
28
|
const SERVER_MAIN_SRC_DIR = constants.SERVER_MAIN_SRC_DIR;
|
|
29
29
|
|
|
30
|
-
let useBlueprints;
|
|
31
30
|
module.exports = class extends BaseBlueprintGenerator {
|
|
32
31
|
constructor(args, options, features) {
|
|
33
32
|
super(args, options, features);
|
|
@@ -41,8 +40,12 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
41
40
|
description: 'default option',
|
|
42
41
|
});
|
|
43
42
|
this.defaultOption = this.options.default;
|
|
43
|
+
}
|
|
44
44
|
|
|
45
|
-
|
|
45
|
+
async _postConstruct() {
|
|
46
|
+
if (!this.fromBlueprint) {
|
|
47
|
+
await this.composeWithBlueprints(GENERATOR_SPRING_SERVICE, { arguments: [this.name] });
|
|
48
|
+
}
|
|
46
49
|
}
|
|
47
50
|
|
|
48
51
|
// Public API method used by the getter and also by Blueprints
|
|
@@ -64,7 +67,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
64
67
|
}
|
|
65
68
|
|
|
66
69
|
get initializing() {
|
|
67
|
-
if (
|
|
70
|
+
if (this.delegateToBlueprint) return {};
|
|
68
71
|
return this._initializing();
|
|
69
72
|
}
|
|
70
73
|
|
|
@@ -94,7 +97,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
94
97
|
}
|
|
95
98
|
|
|
96
99
|
get prompting() {
|
|
97
|
-
if (
|
|
100
|
+
if (this.delegateToBlueprint) return {};
|
|
98
101
|
return this._prompting();
|
|
99
102
|
}
|
|
100
103
|
|
|
@@ -108,7 +111,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
108
111
|
}
|
|
109
112
|
|
|
110
113
|
get loading() {
|
|
111
|
-
if (
|
|
114
|
+
if (this.delegateToBlueprint) return {};
|
|
112
115
|
return this._loading();
|
|
113
116
|
}
|
|
114
117
|
|
|
@@ -122,7 +125,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
122
125
|
}
|
|
123
126
|
|
|
124
127
|
get default() {
|
|
125
|
-
if (
|
|
128
|
+
if (this.delegateToBlueprint) return {};
|
|
126
129
|
return this._default();
|
|
127
130
|
}
|
|
128
131
|
|
|
@@ -151,7 +154,7 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
151
154
|
}
|
|
152
155
|
|
|
153
156
|
get writing() {
|
|
154
|
-
if (
|
|
157
|
+
if (this.delegateToBlueprint) return {};
|
|
155
158
|
return this._writing();
|
|
156
159
|
}
|
|
157
160
|
};
|
|
@@ -89,10 +89,9 @@ module.exports = class extends BaseGenerator {
|
|
|
89
89
|
// Used for isJhipsterVersionLessThan on cleanup.upgradeFiles
|
|
90
90
|
this.jhipsterOldVersion = this.config.get('jhipsterVersion');
|
|
91
91
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
'This seems to be an app blueprinted project with jhipster 6.6.0 bug (https://github.com/jhipster/generator-jhipster/issues/11045), you should pass --blueprints to jhipster upgrade commmand.'
|
|
92
|
+
if (!this.config.existed) {
|
|
93
|
+
throw new Error(
|
|
94
|
+
"Could not find a valid JHipster application configuration, check if the '.yo-rc.json' file exists and if the 'generator-jhipster' key exists inside it."
|
|
96
95
|
);
|
|
97
96
|
}
|
|
98
97
|
}
|
|
@@ -165,7 +164,7 @@ module.exports = class extends BaseGenerator {
|
|
|
165
164
|
generatorCommand = `"${generatorDir.replace('\n', '')}/jhipster"`;
|
|
166
165
|
}
|
|
167
166
|
const skipChecksOption = this.skipChecks ? '--skip-checks' : '';
|
|
168
|
-
const regenerateCmd = `${generatorCommand} --with-entities --force --skip-install --skip-git --no-insight ${skipChecksOption}`;
|
|
167
|
+
const regenerateCmd = `${generatorCommand} --with-entities --force --skip-install --skip-git --ignore-errors --no-insight ${skipChecksOption}`;
|
|
169
168
|
this.info(regenerateCmd);
|
|
170
169
|
try {
|
|
171
170
|
childProcess.execSync(regenerateCmd, { stdio: 'inherit' });
|
package/generators/utils.js
CHANGED
|
@@ -522,7 +522,7 @@ function getEnumInfo(field, clientRootFolder) {
|
|
|
522
522
|
const customValuesState = getCustomValuesState(enums);
|
|
523
523
|
return {
|
|
524
524
|
enumName: fieldType,
|
|
525
|
-
javadoc: field.fieldTypeJavadoc &&
|
|
525
|
+
javadoc: field.fieldTypeJavadoc && getJavadoc(field.fieldTypeJavadoc),
|
|
526
526
|
enumInstance: field.enumInstance,
|
|
527
527
|
enums,
|
|
528
528
|
...customValuesState,
|
|
@@ -794,7 +794,7 @@ function vueReplaceTranslation(generator, files) {
|
|
|
794
794
|
const regexp = ['v-text', 'v-bind:placeholder', 'v-html', 'v-bind:title', 'v-bind:label', 'v-bind:value', 'v-bind:html']
|
|
795
795
|
.map(s => `${s}="\\$t\\(.*?\\)"`)
|
|
796
796
|
.join(')|(');
|
|
797
|
-
|
|
797
|
+
replaceContent(
|
|
798
798
|
{
|
|
799
799
|
file: filePath,
|
|
800
800
|
pattern: new RegExp(` ?(${regexp})`, 'g'),
|
|
@@ -42,13 +42,17 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
42
42
|
|
|
43
43
|
if (this.options.help) return;
|
|
44
44
|
|
|
45
|
-
this.useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('workspaces');
|
|
46
|
-
|
|
47
45
|
// Generate workspaces file only when option passed or regenerating
|
|
48
46
|
this.generateWorkspaces = this.options.workspaces !== false || !!this.packageJson.get('workspaces');
|
|
49
47
|
|
|
50
48
|
// When generating workspaces, save to .yo-rc.json. Use a dummy config otherwise.
|
|
51
49
|
this.workspacesConfig = this.generateWorkspaces ? this.jhipsterConfig : {};
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
async _postConstruct() {
|
|
53
|
+
if (!this.fromBlueprint) {
|
|
54
|
+
await this.composeWithBlueprints('workspaces');
|
|
55
|
+
}
|
|
52
56
|
|
|
53
57
|
this.loadRuntimeOptions();
|
|
54
58
|
}
|
|
@@ -106,7 +110,8 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
106
110
|
}
|
|
107
111
|
|
|
108
112
|
get configuring() {
|
|
109
|
-
|
|
113
|
+
if (this.delegateToBlueprint) return {};
|
|
114
|
+
return this._configuring();
|
|
110
115
|
}
|
|
111
116
|
|
|
112
117
|
_loading() {
|
|
@@ -122,7 +127,8 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
122
127
|
}
|
|
123
128
|
|
|
124
129
|
get loading() {
|
|
125
|
-
|
|
130
|
+
if (this.delegateToBlueprint) return {};
|
|
131
|
+
return this._loading();
|
|
126
132
|
}
|
|
127
133
|
|
|
128
134
|
_writing() {
|
|
@@ -146,7 +152,8 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
146
152
|
}
|
|
147
153
|
|
|
148
154
|
get writing() {
|
|
149
|
-
|
|
155
|
+
if (this.delegateToBlueprint) return {};
|
|
156
|
+
return this._writing();
|
|
150
157
|
}
|
|
151
158
|
|
|
152
159
|
_postWriting() {
|
|
@@ -179,7 +186,8 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
179
186
|
}
|
|
180
187
|
|
|
181
188
|
get postWriting() {
|
|
182
|
-
|
|
189
|
+
if (this.delegateToBlueprint) return {};
|
|
190
|
+
return this._postWriting();
|
|
183
191
|
}
|
|
184
192
|
|
|
185
193
|
// Public API method used by the getter and also by Blueprints
|
|
@@ -199,7 +207,8 @@ module.exports = class extends BaseBlueprintGenerator {
|
|
|
199
207
|
}
|
|
200
208
|
|
|
201
209
|
get install() {
|
|
202
|
-
|
|
210
|
+
if (this.delegateToBlueprint) return {};
|
|
211
|
+
return this._install();
|
|
203
212
|
}
|
|
204
213
|
|
|
205
214
|
_detectNodePackageManager() {
|
|
@@ -169,10 +169,16 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
|
|
|
169
169
|
[SKIP_USER_MANAGEMENT]: true,
|
|
170
170
|
...customOptions,
|
|
171
171
|
};
|
|
172
|
-
|
|
172
|
+
let skipClient = options[SKIP_CLIENT];
|
|
173
|
+
if (skipClient === undefined) {
|
|
174
|
+
skipClient = options[CLIENT_FRAMEWORK] === undefined;
|
|
175
|
+
}
|
|
176
|
+
if (skipClient) {
|
|
177
|
+
delete options[CLIENT_FRAMEWORK];
|
|
178
|
+
delete options[SKIP_SERVER];
|
|
179
|
+
}
|
|
173
180
|
delete options[CLIENT_THEME];
|
|
174
181
|
delete options[CLIENT_THEME_VARIANT];
|
|
175
|
-
delete options[SKIP_SERVER];
|
|
176
182
|
delete options[WITH_ADMIN_UI];
|
|
177
183
|
if (typeof options[SKIP_USER_MANAGEMENT] !== 'boolean') {
|
|
178
184
|
options[SKIP_USER_MANAGEMENT] = true;
|
|
@@ -186,7 +192,7 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
|
|
|
186
192
|
return {
|
|
187
193
|
...options,
|
|
188
194
|
[APPLICATION_TYPE]: MICROSERVICE,
|
|
189
|
-
[SKIP_CLIENT]:
|
|
195
|
+
[SKIP_CLIENT]: skipClient,
|
|
190
196
|
};
|
|
191
197
|
}
|
|
192
198
|
|
|
@@ -205,16 +211,12 @@ function getDefaultConfigForNewApplication(customOptions = {}) {
|
|
|
205
211
|
[MESSAGE_BROKER]: OptionValues[MESSAGE_BROKER].false,
|
|
206
212
|
[PROD_DATABASE_TYPE]: POSTGRESQL,
|
|
207
213
|
[SEARCH_ENGINE]: OptionValues[SEARCH_ENGINE].false,
|
|
208
|
-
[SKIP_CLIENT]: OptionValues[SKIP_CLIENT],
|
|
209
214
|
[TEST_FRAMEWORKS]: [],
|
|
210
215
|
[WEBSOCKET]: OptionValues[WEBSOCKET].false,
|
|
211
216
|
[ENABLE_GRADLE_ENTERPRISE]: OptionValues[ENABLE_GRADLE_ENTERPRISE],
|
|
212
217
|
[GRADLE_ENTERPRISE_HOST]: OptionValues[GRADLE_ENTERPRISE_HOST],
|
|
213
218
|
...customOptions,
|
|
214
219
|
};
|
|
215
|
-
if (typeof options[SKIP_SERVER] !== 'boolean') {
|
|
216
|
-
options[SKIP_SERVER] = OptionValues[SKIP_SERVER];
|
|
217
|
-
}
|
|
218
220
|
if (!options[PACKAGE_NAME] && !options[PACKAGE_FOLDER]) {
|
|
219
221
|
options[PACKAGE_FOLDER] = OptionValues[PACKAGE_FOLDER];
|
|
220
222
|
options[PACKAGE_NAME] = OptionValues[PACKAGE_NAME];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "generator-jhipster",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.4.1",
|
|
4
4
|
"description": "Spring Boot + Angular/React/Vue in one handy generator",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"yeoman-generator",
|
|
@@ -75,23 +75,22 @@
|
|
|
75
75
|
"prettier:check": "prettier --check \"{,**/}*.{js,cjs,mjs,json,md,yml,java}\"",
|
|
76
76
|
"prettier:format": "prettier --write \"{,**/}*.{js,cjs,mjs,json,md,yml,java}\"",
|
|
77
77
|
"pretest": "npm run lint",
|
|
78
|
-
"test": "mocha test generators --no-insight --forbid-only --parallel",
|
|
79
|
-
"update-
|
|
80
|
-
"update-
|
|
78
|
+
"test": "mocha test generators --no-insight --forbid-only --parallel --max-old-space-size=4096",
|
|
79
|
+
"update-snapshot": "mocha --no-insight --no-parallel --updateSnapshot --",
|
|
80
|
+
"update-snapshots": "npm run update-snapshot -- test generators"
|
|
81
81
|
},
|
|
82
82
|
"dependencies": {
|
|
83
|
-
"aws-sdk": "2.
|
|
84
|
-
"axios": "0.
|
|
83
|
+
"aws-sdk": "2.1037.0",
|
|
84
|
+
"axios": "0.24.0",
|
|
85
85
|
"chalk": "4.1.2",
|
|
86
|
-
"chevrotain": "9.0
|
|
87
|
-
"commander": "8.
|
|
88
|
-
"conf": "10.0
|
|
89
|
-
"debug": "4.3.
|
|
86
|
+
"chevrotain": "9.1.0",
|
|
87
|
+
"commander": "8.3.0",
|
|
88
|
+
"conf": "10.1.0",
|
|
89
|
+
"debug": "4.3.3",
|
|
90
90
|
"didyoumean": "1.2.2",
|
|
91
91
|
"ejs": "3.1.6",
|
|
92
92
|
"faker": "5.5.3",
|
|
93
|
-
"glob": "7.
|
|
94
|
-
"gulp-filter": "7.0.0",
|
|
93
|
+
"glob": "7.2.0",
|
|
95
94
|
"insight": "0.11.1",
|
|
96
95
|
"js-yaml": "4.1.0",
|
|
97
96
|
"lodash": "4.17.21",
|
|
@@ -100,39 +99,40 @@
|
|
|
100
99
|
"normalize-path": "3.0.0",
|
|
101
100
|
"os-locale": "5.0.0",
|
|
102
101
|
"p-queue": "6.6.2",
|
|
102
|
+
"p-transform": "1.3.0",
|
|
103
103
|
"parse-gitignore": "1.0.1",
|
|
104
104
|
"pluralize": "8.0.0",
|
|
105
|
-
"prettier": "2.
|
|
106
|
-
"prettier-plugin-java": "1.
|
|
107
|
-
"prettier-plugin-packagejson": "2.2.
|
|
105
|
+
"prettier": "2.5.0",
|
|
106
|
+
"prettier-plugin-java": "1.6.0",
|
|
107
|
+
"prettier-plugin-packagejson": "2.2.15",
|
|
108
108
|
"progress": "2.0.3",
|
|
109
109
|
"randexp": "0.5.3",
|
|
110
110
|
"semver": "7.3.5",
|
|
111
111
|
"shelljs": "0.8.4",
|
|
112
|
-
"simple-git": "2.
|
|
112
|
+
"simple-git": "2.47.0",
|
|
113
113
|
"then-request": "6.0.2",
|
|
114
114
|
"uuid": "8.3.2",
|
|
115
115
|
"winston": "3.3.3",
|
|
116
|
-
"yeoman-environment": "3.
|
|
116
|
+
"yeoman-environment": "3.8.1",
|
|
117
117
|
"yeoman-generator": "5.4.2"
|
|
118
118
|
},
|
|
119
119
|
"devDependencies": {
|
|
120
120
|
"chai": "4.3.4",
|
|
121
121
|
"ejs-lint": "1.2.1",
|
|
122
|
-
"eslint": "
|
|
123
|
-
"eslint-config-airbnb-base": "
|
|
122
|
+
"eslint": "8.3.0",
|
|
123
|
+
"eslint-config-airbnb-base": "15.0.0",
|
|
124
124
|
"eslint-config-prettier": "8.3.0",
|
|
125
125
|
"eslint-plugin-chai-friendly": "^0.7.1",
|
|
126
|
-
"eslint-plugin-import": "2.
|
|
126
|
+
"eslint-plugin-import": "2.25.3",
|
|
127
127
|
"eslint-plugin-mocha": "9.0.0",
|
|
128
128
|
"eslint-plugin-prettier": "4.0.0",
|
|
129
|
-
"expect": "27.
|
|
129
|
+
"expect": "27.3.1",
|
|
130
130
|
"fs-extra": "10.0.0",
|
|
131
131
|
"jsdoc": "3.6.7",
|
|
132
|
-
"mocha": "9.1.
|
|
132
|
+
"mocha": "9.1.3",
|
|
133
133
|
"mocha-expect-snapshot": "1.1.1",
|
|
134
134
|
"proxyquire": "2.1.3",
|
|
135
|
-
"sinon": "
|
|
135
|
+
"sinon": "12.0.1",
|
|
136
136
|
"sinon-chai": "3.7.0",
|
|
137
137
|
"yeoman-assert": "3.1.1",
|
|
138
138
|
"yeoman-test": "6.2.0"
|
package/utils/entity.js
CHANGED
|
@@ -28,10 +28,11 @@ const { PaginationTypes, ServiceTypes } = require('../jdl/jhipster/entity-option
|
|
|
28
28
|
const { GATEWAY, MICROSERVICE } = require('../jdl/jhipster/application-types');
|
|
29
29
|
const { MapperTypes } = require('../jdl/jhipster/entity-options');
|
|
30
30
|
const { OAUTH2 } = require('../jdl/jhipster/authentication-types');
|
|
31
|
+
const { ANGULAR_X } = require('../jdl/jhipster/client-framework-types');
|
|
31
32
|
const { CommonDBTypes } = require('../jdl/jhipster/field-types');
|
|
32
33
|
|
|
33
34
|
const { BOOLEAN, LONG, STRING, UUID } = CommonDBTypes;
|
|
34
|
-
const { MAPSTRUCT } = MapperTypes;
|
|
35
|
+
const { NO: NO_DTO, MAPSTRUCT } = MapperTypes;
|
|
35
36
|
const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
|
|
36
37
|
const { SERVICE_IMPL } = ServiceTypes;
|
|
37
38
|
const NO_SERVICE = ServiceTypes.NO;
|
|
@@ -40,6 +41,7 @@ const NO_MAPPER = MapperTypes.NO;
|
|
|
40
41
|
|
|
41
42
|
const BASE_TEMPLATE_DATA = {
|
|
42
43
|
primaryKey: undefined,
|
|
44
|
+
entityPackage: undefined,
|
|
43
45
|
skipUiGrouping: false,
|
|
44
46
|
haveFieldWithJavadoc: false,
|
|
45
47
|
existingEnum: false,
|
|
@@ -105,7 +107,7 @@ function _derivedProperties(entityWithConfig) {
|
|
|
105
107
|
}
|
|
106
108
|
|
|
107
109
|
function prepareEntityForTemplates(entityWithConfig, generator) {
|
|
108
|
-
const entityName = entityWithConfig.name;
|
|
110
|
+
const entityName = _.upperFirst(entityWithConfig.name);
|
|
109
111
|
_.defaults(entityWithConfig, entityDefaultConfig, BASE_TEMPLATE_DATA);
|
|
110
112
|
|
|
111
113
|
entityWithConfig.changelogDateForRecent = parseLiquibaseChangelogDate(entityWithConfig.changelogDate);
|
|
@@ -128,15 +130,17 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
|
|
|
128
130
|
entityWithConfig.skipServer = true;
|
|
129
131
|
}
|
|
130
132
|
|
|
133
|
+
entityWithConfig.builtInUser = generator.isBuiltInUser(entityName);
|
|
134
|
+
|
|
131
135
|
_.defaults(entityWithConfig, {
|
|
132
|
-
entityNameCapitalized:
|
|
136
|
+
entityNameCapitalized: entityName,
|
|
133
137
|
entityClass: _.upperFirst(entityName),
|
|
134
138
|
entityInstance: _.lowerFirst(entityName),
|
|
135
139
|
entityTableName: generator.getTableName(entityName),
|
|
136
140
|
entityNamePlural: pluralize(entityName),
|
|
137
141
|
});
|
|
138
142
|
|
|
139
|
-
const dto = entityWithConfig.dto
|
|
143
|
+
const dto = entityWithConfig.dto && entityWithConfig.dto !== NO_DTO;
|
|
140
144
|
if (dto) {
|
|
141
145
|
_.defaults(entityWithConfig, {
|
|
142
146
|
dtoClass: generator.asDto(entityWithConfig.entityClass),
|
|
@@ -201,6 +205,16 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
|
|
|
201
205
|
entityWithConfig.i18nAlertHeaderPrefix = `${entityWithConfig.microserviceAppName}.${entityWithConfig.entityTranslationKey}`;
|
|
202
206
|
}
|
|
203
207
|
|
|
208
|
+
const { microserviceName, entityFileName, microfrontend } = entityWithConfig;
|
|
209
|
+
entityWithConfig.entityApi = microserviceName ? `services/${microserviceName.toLowerCase()}/` : '';
|
|
210
|
+
entityWithConfig.entityPage =
|
|
211
|
+
microfrontend &&
|
|
212
|
+
microserviceName &&
|
|
213
|
+
entityWithConfig.clientFramework !== ANGULAR_X &&
|
|
214
|
+
(entityWithConfig.applicationType === MICROSERVICE || entityWithConfig.applicationType === GATEWAY)
|
|
215
|
+
? `${microserviceName.toLowerCase()}/${entityFileName}`
|
|
216
|
+
: `${entityFileName}`;
|
|
217
|
+
|
|
204
218
|
const hasBuiltInUserField = entityWithConfig.relationships.some(relationship => generator.isBuiltInUser(relationship.otherEntityName));
|
|
205
219
|
entityWithConfig.saveUserSnapshot =
|
|
206
220
|
entityWithConfig.applicationType === MICROSERVICE &&
|
|
@@ -446,6 +460,9 @@ function loadRequiredConfigIntoEntity(entity, config) {
|
|
|
446
460
|
jhiPrefix: config.jhiPrefix,
|
|
447
461
|
authenticationType: config.authenticationType,
|
|
448
462
|
reactive: config.reactive,
|
|
463
|
+
microfrontend: config.microfrontend,
|
|
464
|
+
// Workaround different paths
|
|
465
|
+
clientFramework: config.clientFramework,
|
|
449
466
|
});
|
|
450
467
|
return entity;
|
|
451
468
|
}
|
package/utils/field.js
CHANGED
|
@@ -129,9 +129,12 @@ const generateFakeDataForField = (field, faker, changelogDate, type = 'csv') =>
|
|
|
129
129
|
});
|
|
130
130
|
} else if ([INSTANT, ZONED_DATE_TIME, LOCAL_DATE].includes(field.fieldType)) {
|
|
131
131
|
// Iso: YYYY-MM-DDTHH:mm:ss.sssZ
|
|
132
|
-
const
|
|
132
|
+
const date = faker.date.recent(1, changelogDate);
|
|
133
|
+
const isoDate = date.toISOString();
|
|
133
134
|
if (field.fieldType === LOCAL_DATE) {
|
|
134
135
|
data = isoDate.split('T')[0];
|
|
136
|
+
} else if (type === 'json-serializable') {
|
|
137
|
+
data = date;
|
|
135
138
|
} else {
|
|
136
139
|
// Write the date without milliseconds so Java can parse it
|
|
137
140
|
// See https://stackoverflow.com/a/34053802/150868
|
|
@@ -154,6 +157,10 @@ const generateFakeDataForField = (field, faker, changelogDate, type = 'csv') =>
|
|
|
154
157
|
data = faker.datatype.boolean();
|
|
155
158
|
}
|
|
156
159
|
|
|
160
|
+
if (field.fieldType === BYTES && type === 'json-serializable') {
|
|
161
|
+
data = Buffer.from(data).toString('base64');
|
|
162
|
+
}
|
|
163
|
+
|
|
157
164
|
// Validation rules
|
|
158
165
|
if (data !== undefined && field.fieldValidate === true) {
|
|
159
166
|
// manage String max length
|
|
@@ -289,6 +296,9 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
|
|
|
289
296
|
|
|
290
297
|
field.fieldIsEnum = !field.id && fieldIsEnum(fieldType);
|
|
291
298
|
field.fieldWithContentType = (fieldType === BYTES || fieldType === BYTE_BUFFER) && field.fieldTypeBlobContent !== TEXT;
|
|
299
|
+
if (field.fieldWithContentType) {
|
|
300
|
+
field.contentTypeFieldName = `${field.fieldName}ContentType`;
|
|
301
|
+
}
|
|
292
302
|
|
|
293
303
|
if (field.fieldNameAsDatabaseColumn === undefined) {
|
|
294
304
|
const fieldNameUnderscored = _.snakeCase(field.fieldName);
|
|
@@ -367,7 +377,7 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
|
|
|
367
377
|
// eslint-disable-next-line no-new
|
|
368
378
|
new RegExp(field.fieldValidateRulesPattern);
|
|
369
379
|
} catch (e) {
|
|
370
|
-
|
|
380
|
+
generator.warning(`${field.fieldName} pattern is not valid: ${field.fieldValidateRulesPattern}. Skipping generating fake data. `);
|
|
371
381
|
return undefined;
|
|
372
382
|
}
|
|
373
383
|
return faker.createRandexp(field.fieldValidateRulesPattern);
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
const { default: PQueue } = require('p-queue');
|
|
2
|
-
const
|
|
2
|
+
const { PTransform } = require('p-transform');
|
|
3
3
|
const { isFilePending } = require('mem-fs-editor/lib/state');
|
|
4
4
|
|
|
5
5
|
const { TemplateFileFs } = require('./template-file-fs');
|
|
6
6
|
|
|
7
|
-
module.exports.MultiStepTransform = class MultiStepTransform extends
|
|
7
|
+
module.exports.MultiStepTransform = class MultiStepTransform extends PTransform {
|
|
8
8
|
constructor(options = {}) {
|
|
9
|
-
super(options);
|
|
9
|
+
super({ logName: 'jhipster:multi-step-transform', ...options });
|
|
10
10
|
|
|
11
11
|
this.twoStepTemplateQueue = new PQueue({ concurrency: 1, autoStart: false });
|
|
12
12
|
this.templateFileFs = new TemplateFileFs(options);
|
|
@@ -15,7 +15,7 @@ module.exports.MultiStepTransform = class MultiStepTransform extends OOOTransfor
|
|
|
15
15
|
this.pendingFiles = [];
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
async
|
|
18
|
+
async queuedTransform(file, enc) {
|
|
19
19
|
try {
|
|
20
20
|
if (file.contents && this.templateFileFs.isTemplate(file.path)) {
|
|
21
21
|
const templateFile = this.templateFileFs.add(file.path, file.contents.toString());
|
|
@@ -43,10 +43,10 @@ module.exports.MultiStepTransform = class MultiStepTransform extends OOOTransfor
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
|
|
46
|
+
_flush(callback) {
|
|
47
47
|
// Clear normal queue before templates.
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
this.flushQueue()
|
|
49
|
+
.then(() => this.twoStepTemplateQueue.start().onIdle())
|
|
50
|
+
.then(() => super._flush(callback));
|
|
51
51
|
}
|
|
52
52
|
};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
legacy-peer-deps = true
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
const webpackMerge = require('webpack-merge').merge;
|
|
3
|
-
const prodEnv = require('./prod.env');
|
|
4
|
-
<%_ if (buildToolUnknown) { _%>
|
|
5
|
-
const packageJson = require('./../package.json');
|
|
6
|
-
<%_ } _%>
|
|
7
|
-
|
|
8
|
-
module.exports = webpackMerge(prodEnv, {
|
|
9
|
-
NODE_ENV: '"development"',
|
|
10
|
-
SERVER_API_URL: '\'\'',
|
|
11
|
-
<%_ if (buildToolUnknown) { _%>
|
|
12
|
-
VERSION: `'${packageJson.version}'`,
|
|
13
|
-
<%_ } else { _%>
|
|
14
|
-
// APP_VERSION is passed as an environment variable from the Gradle / Maven build tasks.
|
|
15
|
-
VERSION: `'${process.env.hasOwnProperty('APP_VERSION') ? process.env.APP_VERSION : 'UNKNOWN'}'`,
|
|
16
|
-
<%_ } _%>
|
|
17
|
-
});
|
|
@@ -1,67 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
// Template version: 1.3.1
|
|
3
|
-
// see http://vuejs-templates.github.io/webpack for documentation.
|
|
4
|
-
|
|
5
|
-
const path = require('path');
|
|
6
|
-
|
|
7
|
-
module.exports = {
|
|
8
|
-
dev: {
|
|
9
|
-
// Paths
|
|
10
|
-
assetsSubDirectory: 'static',
|
|
11
|
-
assetsPublicPath: '/',
|
|
12
|
-
proxyTable: {},
|
|
13
|
-
|
|
14
|
-
// Various Dev Server settings
|
|
15
|
-
host: 'localhost', // can be overwritten by process.env.HOST
|
|
16
|
-
port: <%= serverPort %>, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
|
|
17
|
-
autoOpenBrowser: false,
|
|
18
|
-
errorOverlay: true,
|
|
19
|
-
notifyOnErrors: true,
|
|
20
|
-
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
|
|
21
|
-
|
|
22
|
-
/**
|
|
23
|
-
* Source Maps
|
|
24
|
-
*/
|
|
25
|
-
|
|
26
|
-
// https://webpack.js.org/configuration/devtool/#development
|
|
27
|
-
devtool: 'cheap-module-source-map',
|
|
28
|
-
|
|
29
|
-
// If you have problems debugging vue-files in devtools,
|
|
30
|
-
// set this to false - it *may* help
|
|
31
|
-
// https://vue-loader.vuejs.org/en/options.html#cachebusting
|
|
32
|
-
cacheBusting: true,
|
|
33
|
-
|
|
34
|
-
cssSourceMap: true
|
|
35
|
-
},
|
|
36
|
-
|
|
37
|
-
build: {
|
|
38
|
-
// Template for index.html
|
|
39
|
-
index: path.resolve(__dirname, '../target/www/index.html'),
|
|
40
|
-
|
|
41
|
-
// Paths
|
|
42
|
-
assetsRoot: path.resolve(__dirname, '../target'),
|
|
43
|
-
assetsSubDirectory: 'static',
|
|
44
|
-
assetsPublicPath: '/',
|
|
45
|
-
|
|
46
|
-
/**
|
|
47
|
-
* Source Maps
|
|
48
|
-
*/
|
|
49
|
-
|
|
50
|
-
productionSourceMap: true,
|
|
51
|
-
// https://webpack.js.org/configuration/devtool/#production
|
|
52
|
-
devtool: 'source-map',
|
|
53
|
-
|
|
54
|
-
// Gzip off by default as many popular static hosts such as
|
|
55
|
-
// Surge or Netlify already gzip all static assets for you.
|
|
56
|
-
// Before setting to `true`, make sure to:
|
|
57
|
-
// npm install --save-dev compression-webpack-plugin
|
|
58
|
-
productionGzip: false,
|
|
59
|
-
productionGzipExtensions: ['js', 'css'],
|
|
60
|
-
|
|
61
|
-
// Run the build command with an extra argument to
|
|
62
|
-
// View the bundle analyzer report after build finishes:
|
|
63
|
-
// `npm run build --report`
|
|
64
|
-
// Set to `true` or `false` to always turn it on or off
|
|
65
|
-
bundleAnalyzerReport: process.env.npm_config_report
|
|
66
|
-
}
|
|
67
|
-
};
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
const utils = require('./vue.utils');
|
|
3
|
-
const config = require('./env');
|
|
4
|
-
const isProduction = process.env.NODE_ENV === 'production';
|
|
5
|
-
const sourceMapEnabled = isProduction ? config.build.productionSourceMap : config.dev.cssSourceMap;
|
|
6
|
-
|
|
7
|
-
module.exports = {
|
|
8
|
-
loaders: utils.cssLoaders({
|
|
9
|
-
sourceMap: sourceMapEnabled,
|
|
10
|
-
extract: isProduction
|
|
11
|
-
}),
|
|
12
|
-
cssSourceMap: sourceMapEnabled,
|
|
13
|
-
cacheBusting: config.dev.cacheBusting,
|
|
14
|
-
transformToRequire: {
|
|
15
|
-
video: ['src', 'poster'],
|
|
16
|
-
source: 'src',
|
|
17
|
-
img: 'src',
|
|
18
|
-
image: 'xlink:href'
|
|
19
|
-
}
|
|
20
|
-
};
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
<%_ if (buildToolUnknown) { _%>
|
|
3
|
-
const packageJson = require('./../package.json');
|
|
4
|
-
<%_ } _%>
|
|
5
|
-
|
|
6
|
-
module.exports = {
|
|
7
|
-
NODE_ENV: '"production"',
|
|
8
|
-
SERVER_API_URL: '""',
|
|
9
|
-
<%_ if (buildToolUnknown) { _%>
|
|
10
|
-
VERSION: `'${packageJson.version}'`,
|
|
11
|
-
<%_ } else { _%>
|
|
12
|
-
// APP_VERSION is passed as an environment variable from the Gradle / Maven build tasks.
|
|
13
|
-
VERSION: `'${process.env.hasOwnProperty('APP_VERSION') ? process.env.APP_VERSION : 'UNKNOWN'}'`,
|
|
14
|
-
<%_ } _%>
|
|
15
|
-
};
|