generator-jhipster 8.5.0 → 8.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 +3 -4
- package/dist/cli/commands.mjs +2 -0
- package/dist/cli/download.mjs +1 -1
- package/dist/cli/environment-builder.mjs +8 -7
- package/dist/cli/program.mjs +16 -15
- package/dist/cli/utils.mjs +1 -2
- package/dist/generators/angular/cleanup.js +0 -1
- package/dist/generators/angular/entity-files-angular.js +6 -7
- package/dist/generators/angular/files-angular.js +2 -2
- package/dist/generators/angular/generator.js +27 -9
- package/dist/generators/angular/resources/package.json +25 -23
- package/dist/generators/angular/support/path-utils.js +0 -1
- package/dist/generators/angular/templates/eslint.config.js.jhi.angular.ejs +141 -0
- package/dist/generators/angular/templates/jest.conf.js.ejs +4 -2
- package/dist/generators/angular/templates/package.json.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs +9 -9
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +18 -19
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +6 -8
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs +17 -14
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs +9 -12
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs +7 -3
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +13 -11
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +6 -5
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +42 -49
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +4 -6
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +42 -37
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs +9 -16
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs +6 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +16 -13
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +3 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/admin.routes.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +8 -10
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs +3 -9
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs +10 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +44 -40
- package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +9 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +4 -3
- package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +15 -17
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/log.model.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +7 -6
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.ts.ejs +10 -10
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +18 -21
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +42 -42
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +60 -56
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +24 -24
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +85 -83
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +85 -61
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs +91 -98
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +34 -27
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +42 -41
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +10 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs +8 -7
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +9 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +13 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +13 -16
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +17 -13
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +6 -5
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs +8 -11
- package/dist/generators/angular/templates/src/main/webapp/app/app-page-title-strategy.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/app.component.ts.ejs +0 -1
- package/dist/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs +8 -6
- package/dist/generators/angular/templates/src/main/webapp/app/app.routes.ts.ejs +3 -8
- package/dist/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/config/uib-pagination.config.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +13 -9
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/auth-jwt.service.spec.ts.ejs +3 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/auth.interceptor.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +31 -31
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/alert.service.ts.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.ts.ejs +5 -2
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/operators.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/core/util/parse-links.service.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.routes.ts.ejs +5 -10
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.spec.ts.ejs +3 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +18 -18
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.spec.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.spec.ts.ejs +5 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +8 -7
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs +2 -3
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.html.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/error/error.route.ts.ejs +3 -5
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +22 -29
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.component.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +8 -9
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs +15 -17
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.model.ts.ejs +5 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.html.ejs +8 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +7 -9
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert.component.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs +10 -7
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +18 -18
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.model.ts.ejs +7 -5
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs +6 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translate.directive.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs +5 -5
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +10 -10
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs +9 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs +4 -4
- package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort.directive.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/bootstrap.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/content/scss/global.scss.ejs +5 -4
- package/dist/generators/angular/templates/src/main/webapp/main.ts.ejs +1 -1
- package/dist/generators/angular/templates/webpack/environment.js.ejs +1 -1
- package/dist/generators/angular/templates/webpack/proxy.conf.js.ejs +1 -2
- package/dist/generators/angular/templates/webpack/webpack.custom.js.ejs +14 -10
- package/dist/generators/angular/templates/webpack/webpack.microfrontend.js.ejs +1 -1
- package/dist/generators/app/generator.js +3 -21
- package/dist/generators/base/command.js +1 -0
- package/dist/generators/base/generator.js +17 -15
- package/dist/generators/base/internal/blueprint.js +1 -1
- package/dist/generators/base/internal/command.js +13 -0
- package/dist/generators/base/internal/index.js +1 -0
- package/dist/generators/base/shared-data.js +74 -2
- package/dist/generators/base/support/config.js +1 -3
- package/dist/generators/base/support/configuration-helpers/options.js +0 -1
- package/dist/generators/base/support/contents.js +0 -2
- package/dist/generators/base/support/faker.js +1 -5
- package/dist/generators/base/support/index.js +1 -1
- package/dist/generators/base/support/jhipster7-context.js +180 -56
- package/dist/generators/base/support/namespace.js +0 -1
- package/dist/generators/base/support/path.js +0 -1
- package/dist/generators/base/support/string.js +2 -2
- package/dist/generators/base/support/write-files.js +0 -1
- package/dist/generators/base-application/generator.js +3 -4
- package/dist/generators/base-application/priorities.js +1 -1
- package/dist/generators/base-application/support/debug.js +0 -1
- package/dist/generators/base-application/support/doc.js +0 -1
- package/dist/generators/base-application/support/entities.js +1 -2
- package/dist/generators/base-application/support/entity.js +0 -1
- package/dist/generators/base-application/support/enum.js +0 -2
- package/dist/generators/base-application/support/field-utils.js +0 -1
- package/dist/generators/base-application/support/prepare-entity.js +5 -5
- package/dist/generators/base-application/support/prepare-field.js +3 -4
- package/dist/generators/base-application/support/prepare-relationship.js +2 -2
- package/dist/generators/base-application/support/relationship.js +1 -1
- package/dist/generators/base-application/support/update-application-entities-transform.js +1 -1
- package/dist/generators/base-core/generator.js +209 -80
- package/dist/generators/base-workspaces/generator.js +2 -2
- package/dist/generators/base-workspaces/internal/deployments.js +1 -1
- package/dist/generators/base-workspaces/internal/docker-prompts.js +2 -2
- package/dist/generators/base-workspaces/priorities.js +1 -1
- package/dist/generators/bootstrap/generator.js +4 -7
- package/dist/generators/bootstrap/support/eslint-transform.js +18 -10
- package/dist/generators/bootstrap/support/eslint-worker.js +14 -24
- package/dist/generators/bootstrap/support/java-unused-imports-transform.js +0 -1
- package/dist/generators/bootstrap/support/multi-step-transform/index.js +0 -1
- package/dist/generators/bootstrap/support/multi-step-transform/template-file.js +6 -1
- package/dist/generators/bootstrap/support/prettier-support.js +16 -11
- package/dist/generators/bootstrap/support/prettier-worker.js +3 -3
- package/dist/generators/bootstrap-application/generator.js +8 -10
- package/dist/generators/bootstrap-application-base/generator.js +5 -6
- package/dist/generators/bootstrap-application-base/utils.js +0 -1
- package/dist/generators/bootstrap-application-client/generator.js +5 -1
- package/dist/generators/bootstrap-application-server/generator.js +1 -1
- package/dist/generators/ci-cd/command.js +2 -2
- package/dist/generators/ci-cd/generator.js +5 -17
- package/dist/generators/ci-cd/index.js +1 -0
- package/dist/generators/ci-cd/templates/docker-registry.yml.ejs +0 -1
- package/dist/generators/ci-cd/templates/jenkins/jenkins.yml.ejs +0 -1
- package/dist/generators/client/files-common.js +1 -4
- package/dist/generators/client/generator.js +7 -25
- package/dist/generators/client/generators/common/generator.js +0 -32
- package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs +1 -1
- package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs +1 -1
- package/dist/generators/client/needle-api/needle-client-vue.js +1 -1
- package/dist/generators/client/prompts.js +1 -1
- package/dist/generators/client/resources/package.json +7 -7
- package/dist/generators/client/support/entity-definition.js +1 -1
- package/dist/generators/client/support/files.js +1 -1
- package/dist/generators/client/support/filter-entities.js +1 -1
- package/dist/generators/client/support/template-utils.js +1 -1
- package/dist/generators/client/support/update-languages.js +0 -1
- package/dist/generators/client/templates/README.md.jhi.client.ejs +29 -20
- package/dist/generators/client/templates/src/main/webapp/index.html.ejs +23 -7
- package/dist/generators/client/templates/src/main/webapp/swagger-ui/index.html.ejs +6 -5
- package/dist/generators/client/templates/webpack/webpack.microfrontend.js.jhi.ejs +1 -1
- package/dist/generators/common/command.js +1 -13
- package/dist/generators/common/files.js +1 -14
- package/dist/generators/common/generator.js +23 -75
- package/dist/generators/common/resources/package.json +2 -4
- package/dist/generators/common/templates/{.editorconfig.ejs → .editorconfig.jhi.ejs} +3 -4
- package/dist/generators/cucumber/files.js +19 -1
- package/dist/generators/cucumber/generator.js +18 -18
- package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberIT.java.ejs +1 -5
- package/dist/generators/cucumber/templates/src/test/java/_package_/cucumber/CucumberTestContextConfiguration.java.ejs +1 -3
- package/dist/generators/cypress/files.js +4 -1
- package/dist/generators/cypress/generator.js +7 -8
- package/dist/generators/cypress/index.js +0 -1
- package/dist/generators/cypress/templates/eslint.config.js.jhi.cypress.ejs +40 -0
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs +3 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +4 -2
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/account.ts.ejs +1 -0
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +0 -3
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +0 -3
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +0 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +2 -2
- package/dist/generators/docker/files.js +6 -1
- package/dist/generators/docker/generator.js +2 -3
- package/dist/generators/docker/templates/docker/grafana/provisioning/datasources/datasource.yml.ejs +4 -4
- package/dist/generators/docker/templates/docker/keycloak.yml.ejs +2 -1
- package/dist/generators/docker/templates/docker/mariadb.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/monitoring.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/mysql.yml.ejs +1 -2
- package/dist/generators/docker/templates/docker/prometheus/prometheus.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/realm-config/keycloak-health-check.sh +2 -2
- package/dist/generators/docker/templates/docker/sonar.yml.ejs +1 -1
- package/dist/generators/{init/templates/.eslintignore.jhi.ejs → docker/templates/eslint.config.js.jhi.docker.ejs} +3 -3
- package/dist/generators/docker-compose/files.js +0 -1
- package/dist/generators/docker-compose/generator.js +12 -16
- package/dist/generators/docker-compose/templates/docker-compose.yml.ejs +1 -0
- package/dist/generators/docker-compose/templates/realm-config/keycloak-health-check.sh +2 -2
- package/dist/generators/entities/generator.js +0 -3
- package/dist/generators/entity/generator.js +1 -5
- package/dist/generators/entity/prompts.js +1 -1
- package/dist/generators/entity/support/index.js +0 -1
- package/dist/generators/export-jdl/generator.js +0 -1
- package/dist/generators/feign-client/templates/src/main/java/_package_/client/AuthorizationHeaderUtil.java.ejs +4 -4
- package/dist/generators/gatling/entity-files.js +18 -0
- package/dist/generators/gatling/files.js +19 -1
- package/dist/generators/gatling/generator.js +0 -1
- package/dist/generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs +12 -12
- package/dist/generators/generate-blueprint/files.js +6 -3
- package/dist/generators/generate-blueprint/generator.js +22 -18
- package/dist/generators/generate-blueprint/resources/package.json +3 -1
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs +0 -3
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/generator.mjs.ejs +2 -6
- package/dist/generators/generate-blueprint/templates/.github/workflows/build-cache.yml.ejs +39 -0
- package/dist/generators/generate-blueprint/templates/.github/workflows/samples.yml.ejs +105 -0
- package/dist/generators/generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs +1 -1
- package/dist/generators/{init/templates/.lintstagedrc.cjs.ejs → generate-blueprint/templates/eslint.config.js.jhi.blueprint.ejs} +6 -3
- package/dist/generators/generator-constants.js +3 -2
- package/dist/generators/git/command.js +14 -3
- package/dist/generators/git/files.js +0 -1
- package/dist/generators/git/generator.js +36 -18
- package/dist/generators/gradle/generator.js +20 -30
- package/dist/generators/gradle/generators/jib/templates/buildSrc/src/main/groovy/jhipster.docker-conventions.gradle.ejs +3 -0
- package/dist/generators/gradle/internal/needles.js +38 -25
- package/dist/generators/gradle/support/dependabot-gradle.js +0 -1
- package/dist/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties +1 -1
- package/dist/generators/heroku/generator.js +2 -3
- package/dist/generators/heroku/templates.js +0 -1
- package/dist/generators/info/generator.js +7 -3
- package/dist/generators/info/support/extract-info.js +60 -0
- package/dist/generators/info/support/index.js +1 -0
- package/dist/generators/init/command.js +2 -27
- package/dist/generators/init/config.js +0 -2
- package/dist/generators/init/files.js +3 -39
- package/dist/generators/init/generator.js +7 -71
- package/dist/generators/init/resources/.node-version +1 -1
- package/dist/generators/init/templates/.editorconfig.jhi.ejs +1 -1
- package/dist/generators/java/generator.js +1 -10
- package/dist/generators/java/generators/bootstrap/generator.js +40 -27
- package/dist/generators/java/generators/bootstrap/templates/.editorconfig.jhi.java.ejs +3 -0
- package/dist/generators/java/generators/build-tool/command.js +2 -2
- package/dist/generators/java/generators/build-tool/generator.js +19 -24
- package/dist/generators/java/generators/code-quality/generator.js +0 -32
- package/dist/generators/java/generators/domain/generator.js +2 -11
- package/dist/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs +2 -2
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Asserts.java.ejs +7 -0
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/domain/AssertUtils.java.ejs +0 -1
- package/dist/generators/java/generators/jib/generator.js +0 -32
- package/dist/generators/java/generators/node/generator.js +0 -32
- package/dist/generators/java/generators/node/templates/npmw +1 -5
- package/dist/generators/java/generators/openapi-generator/README.md +7 -0
- package/dist/generators/java/generators/openapi-generator/command.js +14 -0
- package/dist/generators/java/generators/openapi-generator/generator.js +130 -0
- package/dist/generators/{init/constants.js → java/generators/openapi-generator/index.js} +2 -3
- package/dist/generators/java/generators/openapi-generator/templates/README.md.jhi.openapi-generator.ejs +48 -0
- package/dist/generators/{server/templates/gradle/swagger.gradle.ejs → java/generators/openapi-generator/templates/buildSrc/src/main/groovy/jhipster.openapi-generator-conventions.gradle.ejs} +3 -5
- package/dist/generators/java/support/add-java-annotation.js +1 -1
- package/dist/generators/java/support/checks/index.js +0 -1
- package/dist/generators/java/support/files.js +2 -2
- package/dist/generators/java/support/key-store.js +1 -2
- package/dist/generators/javascript/generators/bootstrap/command.js +23 -0
- package/dist/generators/javascript/generators/bootstrap/generator.js +82 -0
- package/dist/generators/javascript/generators/bootstrap/index.js +20 -0
- package/dist/generators/{common/templates/.prettierignore.jhi.ejs → javascript/generators/bootstrap/templates/package.json.ejs} +7 -6
- package/dist/generators/javascript/generators/eslint/command.js +11 -0
- package/dist/generators/javascript/generators/eslint/generator.js +84 -0
- package/dist/generators/javascript/generators/eslint/index.js +20 -0
- package/dist/generators/javascript/generators/eslint/support/index.js +1 -0
- package/dist/generators/javascript/generators/eslint/support/tasks.js +31 -0
- package/dist/generators/javascript/generators/eslint/templates/eslint.config.js.jhi.ejs +59 -0
- package/dist/generators/javascript/generators/husky/command.js +13 -0
- package/dist/generators/javascript/generators/husky/generator.js +75 -0
- package/dist/generators/javascript/generators/husky/index.js +20 -0
- package/dist/generators/javascript/generators/husky/templates/.husky/pre-commit.ejs +1 -0
- package/dist/generators/{common → javascript/generators/husky}/templates/.lintstagedrc.cjs.ejs +1 -1
- package/dist/generators/javascript/generators/prettier/command.js +43 -0
- package/dist/generators/javascript/generators/prettier/generator.js +127 -0
- package/dist/generators/javascript/generators/prettier/index.js +20 -0
- package/dist/generators/{init → javascript/generators/prettier}/templates/.prettierrc.yml.jhi.ejs +2 -4
- package/dist/generators/javascript/resources/package.json +8 -0
- package/dist/generators/jdl/generator.js +9 -12
- package/dist/generators/kubernetes/files.js +1 -1
- package/dist/generators/kubernetes/generator.js +5 -6
- package/dist/generators/kubernetes/kubernetes-base.js +2 -2
- package/dist/generators/kubernetes/kubernetes-constants.js +1 -1
- package/dist/generators/kubernetes/prompts.js +2 -2
- package/dist/generators/kubernetes/templates/db/mysql.yml.ejs +1 -0
- package/dist/generators/kubernetes-helm/generator.js +4 -5
- package/dist/generators/kubernetes-knative/files.js +0 -1
- package/dist/generators/kubernetes-knative/generator.js +8 -9
- package/dist/generators/languages/files.js +0 -1
- package/dist/generators/languages/generator.js +6 -9
- package/dist/generators/languages/support/load-config.js +1 -1
- package/dist/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs +12 -12
- package/dist/generators/liquibase/files.js +0 -1
- package/dist/generators/liquibase/generator.js +9 -17
- package/dist/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs +4 -5
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +1 -1
- package/dist/generators/maven/command.js +16 -0
- package/dist/generators/maven/generator.js +25 -4
- package/dist/generators/maven/generators/code-quality/generator.js +0 -32
- package/dist/generators/maven/generators/frontend-plugin/generator.js +0 -32
- package/dist/generators/maven/generators/jib/generator.js +21 -34
- package/dist/generators/maven/index.js +1 -0
- package/dist/generators/maven/internal/pom-sort.js +144 -0
- package/dist/generators/maven/internal/xml-store.js +12 -10
- package/dist/generators/maven/support/dependabot-maven.js +3 -2
- package/dist/generators/maven/support/index.js +1 -0
- package/dist/generators/maven/support/pom-file-sort.js +28 -0
- package/dist/generators/maven/support/pom-store.js +8 -94
- package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
- package/dist/generators/project-name/command.js +0 -18
- package/dist/generators/project-name/generator.js +3 -7
- package/dist/generators/project-name/support/index.js +0 -1
- package/dist/generators/react/application/entities/index.js +0 -1
- package/dist/generators/react/entity-files-react.js +7 -7
- package/dist/generators/react/files-react.js +5 -4
- package/dist/generators/react/generator.js +29 -12
- package/dist/generators/react/resources/package.json +27 -26
- package/dist/generators/react/templates/eslint.config.js.jhi.react.ejs +101 -0
- package/dist/generators/react/templates/jest.conf.js.ejs +37 -38
- package/dist/generators/react/templates/package.json.ejs +4 -3
- package/dist/generators/react/templates/postcss.config.js.ejs +1 -3
- package/dist/generators/react/templates/src/main/webapp/app/_bootstrap-variables.scss.ejs +11 -11
- package/dist/generators/react/templates/src/main/webapp/app/app.scss.ejs +68 -66
- package/dist/generators/react/templates/src/main/webapp/app/app.tsx.ejs +12 -3
- package/dist/generators/react/templates/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs +3 -4
- package/dist/generators/react/templates/src/main/webapp/app/config/axios-interceptor.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/constants.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/error-middleware.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.spec.ts.ejs +5 -5
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs +3 -2
- package/dist/generators/react/templates/src/main/webapp/app/config/store.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/config/translation.ts.ejs +4 -0
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/index.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.reducer.spec.ts.ejs +1 -5
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.reducer.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/activate/activate.tsx.ejs +3 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password/password.reducer.spec.ts.ejs +6 -10
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password/password.reducer.ts.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs +36 -34
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs +4 -5
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.spec.ts.ejs +5 -8
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.reducer.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/register/register.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/sessions/sessions.reducer.ts.ejs +7 -13
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/sessions/sessions.tsx.ejs +34 -25
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.spec.ts.ejs +6 -9
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/account/settings/settings.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs +25 -25
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs +23 -15
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/docs/docs.scss.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/docs/docs.tsx.ejs +6 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs +9 -4
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/health/health.tsx.ejs +11 -6
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/index.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +3 -10
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.ejs +10 -4
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs +14 -11
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs +30 -47
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts.ejs +11 -23
- package/dist/generators/react/templates/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +31 -23
- package/dist/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs +15 -1
- package/dist/generators/react/templates/src/main/webapp/app/modules/login/login-redirect.tsx.ejs +4 -0
- package/dist/generators/react/templates/src/main/webapp/app/modules/login/logout.tsx.ejs +5 -3
- package/dist/generators/react/templates/src/main/webapp/app/routes.tsx.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/setup-tests.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/DurationFormat.tsx.ejs +8 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs +7 -9
- package/dist/generators/react/templates/src/main/webapp/app/shared/auth/private-route.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary-routes.spec.tsx.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary.spec.tsx.ejs +1 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/error/error-boundary.tsx.ejs +7 -7
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +4 -5
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs +5 -6
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.tsx.ejs +0 -9
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs +3 -5
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +29 -6
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/locale.tsx.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +9 -9
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/menus/menu-item.tsx.ejs +0 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx.ejs +8 -15
- package/dist/generators/react/templates/src/main/webapp/app/shared/model/user.model.ts.ejs +1 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/application-profile.spec.ts.ejs +9 -10
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/application-profile.ts.ejs +2 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +14 -17
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/authentication.ts.ejs +8 -4
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/locale.spec.ts.ejs +42 -25
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/locale.ts.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +7 -8
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.spec.ts.ejs +4 -6
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/user-management.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/date-utils.ts.ejs +2 -3
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.spec.ts.ejs +10 -12
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/entity-utils.ts.ejs +4 -2
- package/dist/generators/react/templates/src/main/webapp/app/shared/util/url-utils.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/typings.d.ts.ejs +2 -2
- package/dist/generators/react/templates/webpack/environment.js.ejs +2 -2
- package/dist/generators/react/templates/webpack/utils.js.ejs +2 -2
- package/dist/generators/react/templates/webpack/webpack.common.js.ejs +8 -11
- package/dist/generators/react/templates/webpack/webpack.dev.js.ejs +0 -1
- package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs +0 -5
- package/dist/generators/server/generator.js +11 -39
- package/dist/generators/server/jdl/application-definition.js +1 -1
- package/dist/generators/server/resources/Dockerfile +16 -16
- package/dist/generators/server/resources/gradle/libs.versions.toml +16 -12
- package/dist/generators/server/resources/pom.xml +14 -20
- package/dist/generators/server/support/config.js +1 -1
- package/dist/generators/server/support/database.js +1 -1
- package/dist/generators/server/support/prepare-entity.js +1 -1
- package/dist/generators/server/support/prepare-field.js +2 -2
- package/dist/generators/server/support/relationship.js +0 -1
- package/dist/generators/server/support/spring-factories.js +0 -1
- package/dist/generators/server/support/string.js +0 -1
- package/dist/generators/server/support/templates/field-values.js +1 -1
- package/dist/generators/spring-boot/cleanup.js +5 -2
- package/dist/generators/spring-boot/command.js +1 -1
- package/dist/generators/spring-boot/entity-cleanup.js +0 -1
- package/dist/generators/spring-boot/entity-files.js +2 -2
- package/dist/generators/spring-boot/files.js +7 -11
- package/dist/generators/spring-boot/generator.js +28 -49
- package/dist/generators/spring-boot/prompts.js +1 -1
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +138 -241
- package/dist/generators/{server → spring-boot}/templates/README.md.jhi.spring-boot.ejs +0 -30
- package/dist/generators/spring-boot/templates/_global_partials_entity_/save_template.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/build.gradle.ejs +1 -10
- package/dist/generators/{server → spring-boot}/templates/gradle/profile_dev.gradle.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/gradle/profile_prod.gradle.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/gradle.properties.ejs +0 -6
- package/dist/generators/{server → spring-boot}/templates/pom.xml.ejs +5 -108
- package/dist/generators/{server → spring-boot}/templates/settings.gradle.ejs +10 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/Application.java.ejs +27 -17
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_stream_template.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_all_template.ejs +5 -5
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/get_filtered_template.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/repository/UserRepository.java.ejs +13 -10
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +37 -36
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs +4 -4
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.java.ejs +11 -11
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/PublicUserResource.java.ejs +3 -3
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/UserResource.java.ejs +37 -16
- package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/web/rest/_entityClass_Resource.java.ejs +7 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/aop/logging/LoggingAspect.java.ejs +16 -16
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/ApplicationProperties.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/AsyncConfiguration.java.ejs +2 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/CRLFLogConverter.java.ejs +17 -16
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/Constants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +23 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +59 -34
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs +5 -5
- package/dist/generators/spring-boot/templates/src/main/java/_package_/config/SpringDocConfiguration.java.ejs +40 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/StaticResourcesWebConfiguration.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/WebConfigurer.java.ejs +6 -6
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/management/SecurityMetersService.java.ejs +2 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/AuthoritiesConstants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/DomainUserDetailsService.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/PersistentTokenRememberMeServices.java.ejs +23 -28
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/SecurityUtils.java.ejs +12 -13
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/oauth2/AudienceValidator.java.ejs +3 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs +9 -8
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/MailService.java.ejs +22 -13
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs +11 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs +8 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/OAuth2RefreshTokensWebFilter.java.ejs +5 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource.java.ejs +33 -41
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource_oauth2.java.ejs +9 -22
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs +12 -22
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AuthInfoResource.java.ejs +2 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/AuthenticateController.java.ejs +16 -21
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/LogoutResource_imperative.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/LogoutResource_reactive.java.ejs +7 -7
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/BadRequestAlertException.java.ejs +7 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/ErrorConstants.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs +17 -17
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/FieldErrorVM.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/InvalidPasswordException.java.ejs +6 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-dev.yml.ejs +4 -3
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-prod.yml.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application.yml.ejs +8 -10
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/bootstrap-prod.yml.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/bootstrap.yml.ejs +2 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/error.html.ejs +4 -2
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/activationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/creationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/main/resources/templates/mail/passwordResetEmail.html.ejs +1 -1
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs +5 -1
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/PublicUserResourceIT.java.ejs +1 -11
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs +7 -12
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +35 -23
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs +2 -6
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs +11 -17
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs +2 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs +13 -40
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs +10 -6
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs +21 -25
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs +1 -2
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs +3 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs +3 -2
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs +7 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/service/MailServiceIT.java.ejs +5 -3
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs +4 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs +1 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs +34 -38
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs +0 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs +20 -13
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs +4 -4
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs +4 -4
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs +3 -5
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs +2 -2
- package/dist/generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +212 -0
- package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorTestController.java.ejs +4 -3
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/config/bootstrap.yml.ejs +12 -12
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/activationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/creationEmail.html.ejs +1 -1
- package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/passwordResetEmail.html.ejs +1 -1
- package/dist/generators/spring-cache/files.js +19 -1
- package/dist/generators/spring-cache/generator.js +11 -10
- package/dist/generators/spring-cache/internal/dependencies.js +0 -1
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +3 -3
- package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs +20 -19
- package/dist/generators/spring-cache/templates/src/test/java/_package_/config/RedisTestContainer.java.ejs +2 -2
- package/dist/generators/spring-cloud/generators/gateway/command.js +5 -0
- package/dist/generators/spring-cloud/generators/gateway/generator.js +21 -37
- package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/rest/GatewayResource_imperative.java.ejs +126 -0
- package/dist/generators/spring-cloud-stream/generators/kafka/files.js +1 -1
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_imperative.java.ejs +5 -5
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/broker/KafkaConsumer_reactive.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/web/rest/KafkaResource_imperative.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/main/java/_package_/web/rest/KafkaResource_reactive.java.ejs +3 -3
- package/dist/generators/spring-cloud-stream/generators/kafka/templates/src/test/java/_package_/config/KafkaTestContainer.java.ejs +2 -2
- package/dist/generators/spring-cloud-stream/generators/pulsar/files.js +1 -1
- package/dist/generators/spring-cloud-stream/generators/pulsar/templates/src/test/java/_package_/config/PulsarTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-cassandra/files.js +1 -1
- package/dist/generators/spring-data-cassandra/generator.js +1 -1
- package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-couchbase/files.js +1 -1
- package/dist/generators/spring-data-couchbase/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs +2 -2
- package/dist/generators/spring-data-couchbase/templates/src/test/java/_package_/config/CouchbaseTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-elasticsearch/generator.js +1 -1
- package/dist/generators/spring-data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-mongodb/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs +0 -3
- package/dist/generators/spring-data-mongodb/templates/src/test/java/_package_/config/MongoDbTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-neo4j/entity-files.js +18 -0
- package/dist/generators/spring-data-neo4j/files.js +1 -1
- package/dist/generators/spring-data-neo4j/generator.js +14 -13
- package/dist/generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs +18 -2
- package/dist/generators/spring-data-neo4j/templates/src/test/java/_package_/config/Neo4jTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/files.js +2 -2
- package/dist/generators/spring-data-relational/generator.js +35 -51
- package/dist/generators/spring-data-relational/internal/dependencies.js +0 -1
- package/dist/generators/spring-data-relational/support/application-properties.js +1 -1
- package/dist/generators/spring-data-relational/support/database-data.js +1 -1
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/EntityManager_reactive.java.ejs +35 -28
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/UserSqlHelper_reactive.java.ejs +1 -0
- package/dist/generators/spring-data-relational/templates/src/main/java/_package_/repository/rowmapper/ColumnConverter_reactive.java.ejs +0 -2
- package/dist/generators/spring-data-relational/templates/src/main/resources/.h2.server.properties.ejs +1 -1
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MariadbTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MsSqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/MysqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/PostgreSqlTestContainer.java.ejs +2 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainer.java.ejs +0 -1
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +1 -2
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/repository/timezone/DateTimeWrapperRepository.java.ejs +1 -3
- package/dist/generators/spring-websocket/files.js +18 -0
- package/dist/generators/spring-websocket/templates/src/main/java/_package_/web/websocket/ActivityService.java.ejs +2 -2
- package/dist/generators/upgrade/generator.js +2 -5
- package/dist/generators/vue/entity-files-vue.js +7 -7
- package/dist/generators/vue/files-vue.js +3 -3
- package/dist/generators/vue/generator.js +28 -12
- package/dist/generators/vue/resources/package.json +29 -30
- package/dist/generators/vue/support/translate-vue.js +1 -1
- package/dist/generators/vue/templates/.postcssrc.js.ejs +2 -2
- package/dist/generators/vue/templates/eslint.config.js.jhi.vue.ejs +74 -0
- package/dist/generators/vue/templates/package.json.ejs +5 -5
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.spec.ts.ejs +3 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/account.service.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/activate/activate.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.component.spec.ts.ejs +13 -12
- package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs +122 -77
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.spec.ts.ejs +35 -25
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.component.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs +11 -7
- package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/login.service.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.vue.ejs +211 -143
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs +3 -3
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue.ejs +101 -72
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.component.spec.ts.ejs +35 -35
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.vue.ejs +69 -44
- package/dist/generators/vue/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +6 -6
- package/dist/generators/vue/templates/src/main/webapp/app/account/sessions/sessions.vue.ejs +38 -36
- package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +6 -7
- package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs +91 -34
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +9 -9
- package/dist/generators/vue/templates/src/main/webapp/app/admin/configuration/configuration.vue.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/admin/docs/docs.vue.ejs +11 -3
- package/dist/generators/vue/templates/src/main/webapp/app/admin/gateway/gateway.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health-modal.component.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +56 -56
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.service.ts.ejs +7 -8
- package/dist/generators/vue/templates/src/main/webapp/app/admin/health/health.vue.ejs +3 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/logs/logs.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/logs/logs.vue.ejs +8 -8
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics-modal.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics-modal.vue.ejs +6 -6
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +171 -173
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs +0 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/metrics/metrics.vue.ejs +58 -48
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +2 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.vue.ejs +77 -38
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-view.vue.ejs +2 -3
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management.vue.ejs +20 -23
- package/dist/generators/vue/templates/src/main/webapp/app/core/error/error.vue.ejs +3 -5
- package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.vue.ejs +8 -6
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-footer/jhi-footer.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +6 -8
- package/dist/generators/vue/templates/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +22 -23
- package/dist/generators/vue/templates/src/main/webapp/app/core/ribbon/ribbon.component.ts.ejs +1 -3
- package/dist/generators/vue/templates/src/main/webapp/app/core/ribbon/ribbon.vue.ejs +30 -30
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs +4 -4
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs +12 -12
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs +14 -14
- package/dist/generators/vue/templates/src/main/webapp/app/entities/entities-menu.component.ts.ejs +4 -1
- package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs +9 -5
- package/dist/generators/vue/templates/src/main/webapp/app/router/admin.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/alert/alert.service.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/shared/computables/arrays.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.spec.ts.ejs +30 -30
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/shared/config/config.ts.ejs +9 -12
- package/dist/generators/vue/templates/src/main/webapp/app/shared/data/data-utils.service.spec.ts.ejs +15 -11
- package/dist/generators/vue/templates/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +5 -5
- package/dist/generators/vue/templates/src/main/webapp/app/shared/jhi-item-count.vue.ejs +1 -3
- package/dist/generators/vue/templates/src/main/webapp/app/shared/model/user.model.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/security/authority.ts.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/shared/sort/jhi-sort-indicator.vue.ejs +2 -3
- package/dist/generators/vue/templates/src/main/webapp/app/shared/sort/sorts.spec.ts.ejs +0 -1
- package/dist/generators/vue/templates/src/main/webapp/app/test-setup.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/content/scss/global.scss.ejs +94 -94
- package/dist/generators/vue/templates/vite.config.mts.ejs +4 -2
- package/dist/generators/vue/templates/webpack/config.js.ejs +4 -6
- package/dist/generators/vue/templates/webpack/vue.utils.js.ejs +3 -7
- package/dist/generators/vue/templates/webpack/webpack.common.js.ejs +1 -1
- package/dist/generators/vue/templates/webpack/webpack.dev.js.ejs +8 -9
- package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs +0 -6
- package/dist/generators/vue/templates/webpack/webpack.prod.js.ejs +17 -18
- package/dist/generators/workspaces/generator.js +25 -5
- package/dist/generators/workspaces/support/applications-lookup.js +31 -0
- package/dist/generators/workspaces/support/index.js +19 -0
- package/dist/generators/workspaces/templates/.prettierignore.jhi.workspaces.ejs +26 -0
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js +1 -1
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +1 -1
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-option-converter.js +1 -1
- package/dist/jdl/converters/json-to-jdl-converter.js +4 -4
- package/dist/jdl/converters/json-to-jdl-entity-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +1 -3
- package/dist/jdl/exporters/jhipster-entity-exporter.js +1 -1
- package/dist/jdl/jhipster/application-options.js +1 -1
- package/dist/jdl/jhipster/default-application-options.js +1 -1
- package/dist/jdl/jhipster/field-types.js +2 -2
- package/dist/jdl/jhipster/reserved-keywords.js +2 -2
- package/dist/jdl/linters/entity-linter.js +1 -1
- package/dist/jdl/linters/relationship-linter.js +1 -1
- package/dist/jdl/linters/rule.js +1 -1
- package/dist/jdl/linters/rules.js +1 -1
- package/dist/jdl/models/index.js +0 -1
- package/dist/jdl/models/jdl-binary-option.js +1 -1
- package/dist/jdl/models/jdl-deployment.js +1 -1
- package/dist/jdl/models/jdl-object.js +1 -1
- package/dist/jdl/models/jdl-unary-option.js +1 -1
- package/dist/jdl/models/list-jdl-application-configuration-option.js +1 -1
- package/dist/jdl/parsing/exports.js +2 -2
- package/dist/jdl/parsing/jdl-ast-builder-visitor.js +2 -2
- package/dist/jdl/parsing/lexer/application-tokens.js +2 -2
- package/dist/jdl/parsing/lexer/lexer.js +1 -1
- package/dist/jdl/parsing/lexer/option-tokens.js +1 -1
- package/dist/jdl/parsing/lexer/token-creator.js +1 -1
- package/dist/jdl/parsing/self-checks/parsing-system-checker.js +1 -2
- package/dist/jdl/parsing/validator.js +1 -1
- package/dist/jdl/readers/json-reader.js +2 -3
- package/dist/jdl/utils/file-utils.js +1 -1
- package/dist/jdl/utils/objects/logger.js +8 -9
- package/dist/jdl/validators/deployment-validator.js +1 -1
- package/dist/jdl/validators/entity-validator.js +1 -1
- package/dist/jdl/validators/enum-validator.js +1 -1
- package/dist/jdl/validators/jdl-with-application-validator.js +1 -1
- package/dist/jdl/validators/jdl-without-application-validator.js +2 -2
- package/dist/jdl/validators/relationship-validator.js +1 -1
- package/dist/jdl/validators/validation-validator.js +1 -1
- package/dist/lib/eslint/base.js +46 -0
- package/dist/lib/eslint/index.js +4 -0
- package/dist/lib/eslint/recommended.js +23 -0
- package/dist/lib/index.js +0 -1
- package/dist/lib/internal/config-def.js +2 -4
- package/dist/testing/github.js +32 -0
- package/dist/testing/helpers.js +33 -10
- package/dist/testing/index.js +2 -0
- package/dist/testing/sample-config.js +31 -0
- package/dist/testing/support/client-samples.js +1 -2
- package/dist/testing/support/matrix-utils.js +22 -10
- package/dist/testing/support/server-samples.js +2 -3
- package/dist/types/cli/commands.d.mts +2 -0
- package/dist/types/cli/environment-builder.d.mts +1 -0
- package/dist/types/generators/base/api.d.ts +36 -14
- package/dist/types/generators/base/generator.d.ts +1 -1
- package/dist/types/generators/base/internal/command.d.ts +2 -0
- package/dist/types/generators/base/internal/index.d.ts +1 -0
- package/dist/types/generators/base/shared-data.d.ts +10 -1
- package/dist/types/generators/base/support/config.d.ts +2 -2
- package/dist/types/generators/base/support/index.d.ts +1 -1
- package/dist/types/generators/base/support/jhipster7-context.d.ts +495 -1
- package/dist/types/generators/base/support/logger.d.ts +1 -1
- package/dist/types/generators/base/types.d.ts +12 -0
- package/dist/types/generators/base-application/application-options.d.ts +1 -1
- package/dist/types/generators/base-application/generator.d.ts +3 -3
- package/dist/types/generators/base-application/support/relationship.d.ts +1 -1
- package/dist/types/generators/base-application/support/task-type-inference.d.ts +1 -1
- package/dist/types/generators/base-application/tasks.d.ts +3 -3
- package/dist/types/generators/base-application/types/entity.d.ts +5 -0
- package/dist/types/generators/base-application/types.d.ts +15 -0
- package/dist/types/generators/base-core/generator.d.ts +10 -2
- package/dist/types/generators/bootstrap/support/eslint-transform.d.ts +20 -2
- package/dist/types/generators/bootstrap/support/eslint-worker.d.ts +6 -2
- package/dist/types/generators/bootstrap/support/multi-step-transform/template-file-fs.d.ts +1 -1
- package/dist/types/generators/bootstrap/support/prettier-support.d.ts +20 -5
- package/dist/types/generators/client/support/files.d.ts +3 -1
- package/dist/types/generators/client/types.d.ts +3 -1
- package/dist/types/generators/generator-constants.d.ts +1 -1
- package/dist/types/generators/gradle/types.d.ts +6 -5
- package/dist/types/generators/info/support/extract-info.d.ts +14 -0
- package/dist/types/generators/info/support/index.d.ts +1 -0
- package/dist/types/generators/java/types.d.ts +22 -0
- package/dist/types/generators/javascript/types.d.ts +12 -0
- package/dist/types/generators/languages/support/detect-language.d.ts +1 -1
- package/dist/types/generators/languages/support/languages.d.ts +4 -4
- package/dist/types/generators/languages/types.d.ts +1 -1
- package/dist/types/generators/maven/internal/pom-sort.d.ts +2 -0
- package/dist/types/generators/maven/internal/xml-store.d.ts +6 -3
- package/dist/types/generators/maven/support/index.d.ts +1 -0
- package/dist/types/generators/maven/support/pom-file-sort.d.ts +25 -0
- package/dist/types/generators/maven/support/pom-store.d.ts +5 -2
- package/dist/types/generators/maven/types.d.ts +1 -0
- package/dist/types/generators/server/types.d.ts +11 -3
- package/dist/types/generators/spring-cloud/generators/gateway/types.d.ts +2 -1
- package/dist/types/generators/workspaces/support/applications-lookup.d.ts +1 -0
- package/dist/types/generators/workspaces/support/index.d.ts +19 -0
- package/dist/types/jdl/converters/json-to-jdl-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/application-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.d.ts +1 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/option-converter.d.ts +1 -1
- package/dist/types/jdl/converters/types.d.ts +1 -1
- package/dist/types/jdl/exporters/types.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application-configuration-factory.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application.d.ts +1 -1
- package/dist/types/jdl/models/jdl-enum.d.ts +1 -1
- package/dist/types/jdl/models/jdl-relationship.d.ts +1 -1
- package/dist/types/jdl/parsing/exports.d.ts +2 -2
- package/dist/types/jdl/utils/objects/logger.d.ts +6 -19
- package/dist/types/jdl/validators/deployment-validator.d.ts +1 -1
- package/dist/types/jdl/validators/relationship-validator.d.ts +1 -1
- package/dist/types/lib/eslint/base.d.ts +8 -0
- package/dist/types/lib/eslint/index.d.ts +15 -0
- package/dist/types/lib/eslint/recommended.d.ts +3 -0
- package/dist/types/testing/github.d.ts +11 -0
- package/dist/types/testing/helpers.d.ts +17 -2
- package/dist/types/testing/index.d.ts +2 -0
- package/dist/types/testing/sample-config.d.ts +4 -0
- package/dist/types/testing/support/matrix-utils.d.ts +21 -1
- package/package.json +49 -40
- package/dist/generators/angular/templates/.eslintrc.json.ejs +0 -123
- package/dist/generators/client/templates/.eslintignore.ejs +0 -28
- package/dist/generators/common/templates/.husky/pre-commit.ejs +0 -9
- package/dist/generators/common/templates/.prettierrc.ejs +0 -24
- package/dist/generators/cypress/templates/src/test/javascript/cypress/.eslintrc.json.ejs +0 -20
- package/dist/generators/generate-blueprint/templates/.eslintrc.json.ejs +0 -35
- package/dist/generators/init/resources/package.json +0 -6
- package/dist/generators/init/templates/.husky/pre-commit +0 -4
- package/dist/generators/init/templates/package.json.ejs +0 -34
- package/dist/generators/react/templates/.eslintrc.json.ejs +0 -109
- package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/JwtGrantedAuthorityConverter.java.ejs +0 -40
- package/dist/generators/server/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +0 -161
- package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/filter/ModifyServersOpenApiFilter.java.ejs +0 -179
- package/dist/generators/spring-cloud/generators/gateway/templates/src/test/java/_package_/web/filter/ModifyServersOpenApiFilterTest.java.ejs +0 -150
- package/dist/generators/vue/templates/.eslintrc.cjs.ejs +0 -58
- package/dist/generators/{server → java/generators/openapi-generator}/templates/src/main/resources/swagger/api.yml.ejs +0 -0
- package/dist/generators/{init → javascript/generators/prettier}/templates/.prettierignore.jhi.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/.devcontainer/Dockerfile.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/.devcontainer/devcontainer.json.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/gradle/war.gradle.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/gradle/zipkin.gradle.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/micro_services_architecture.md +0 -0
- package/dist/generators/{server → spring-boot}/templates/package.json.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/ApplicationWebXml.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/mapper/EntityMapper.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/_entityPackage_/service/mapper/_entityClass_Mapper.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/DateTimeFormatConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/EurekaWorkaroundConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/JacksonConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/LoggingAspectConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/LoggingConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/OAuth2Configuration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/OpenApiConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/ReactorConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/config/SecurityInMemoryConfiguration.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/AbstractAuditingEntity.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/PersistentToken.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/domain/User.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/repository/PersistentTokenRepository.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/SpringSecurityAuditorAware.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/security/UserNotActivatedException.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/AdminUserDTO.java.ejs +0 -0
- package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs +1 -1
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/SpaWebFilter_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/filter/SpaWebFilter_reactive.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/EmailAlreadyUsedException.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/errors/LoginAlreadyUsedException.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/KeyAndPasswordVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/LoginVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/java/_package_/web/rest/vm/ManagedUserVM.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner-no-color.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner_react.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/banner_vue.txt +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/config/application-tls.yml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/i18n/messages.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/logback-spring.xml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/main/resources/static/index_microservices.html.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/IntegrationTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/TechnicalStructureTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/_entityPackage_/service/mapper/_entityClass_MapperTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/CRLFLogConverterTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/JHipsterBlockHoundIntegration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/SpringBootTestClassOrderer.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/TestContainersSpringContextCustomizerFactory.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/AuthenticationIntegrationTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/oauth2/AudienceValidatorTest.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AuthenticateControllerIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/LogoutResourceIT.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/config/application.yml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/i18n/messages_en.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/junit-platform.properties.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/logback.xml.ejs +0 -0
- /package/dist/generators/{server → spring-boot}/templates/src/test/resources/templates/mail/testEmail.html.ejs +0 -0
- /package/dist/generators/spring-cloud/generators/gateway/templates/src/main/java/_package_/web/rest/{GatewayResource.java.ejs → GatewayResource_reactive.java.ejs} +0 -0
|
@@ -21,12 +21,12 @@ import path from 'path';
|
|
|
21
21
|
import chalk from 'chalk';
|
|
22
22
|
import semver from 'semver';
|
|
23
23
|
import { packageJson } from '../../lib/index.js';
|
|
24
|
+
import CoreGenerator from '../base-core/index.js';
|
|
25
|
+
import { loadStoredAppOptions } from '../app/support/index.js';
|
|
24
26
|
import { packageNameToNamespace } from './support/index.js';
|
|
25
|
-
import {
|
|
27
|
+
import { loadBlueprintsFromConfiguration, mergeBlueprints, normalizeBlueprintName, parseBluePrints } from './internal/index.js';
|
|
26
28
|
import { PRIORITY_NAMES } from './priorities.js';
|
|
27
|
-
import CoreGenerator from '../base-core/index.js';
|
|
28
29
|
import { LOCAL_BLUEPRINT_PACKAGE_NAMESPACE } from './support/constants.js';
|
|
29
|
-
import { loadStoredAppOptions } from '../app/support/index.js';
|
|
30
30
|
/**
|
|
31
31
|
* Base class that contains blueprints support.
|
|
32
32
|
*/
|
|
@@ -67,6 +67,13 @@ export default class JHipsterBaseBlueprintGenerator extends CoreGenerator {
|
|
|
67
67
|
this.log.log(error);
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
|
+
else if (this.features.queueCommandTasks === undefined) {
|
|
71
|
+
this.on('before:queueOwnTasks', () => {
|
|
72
|
+
if (!this.delegateToBlueprint) {
|
|
73
|
+
this.queueCurrentJHipsterCommandTasks();
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
}
|
|
70
77
|
}
|
|
71
78
|
/**
|
|
72
79
|
* Filter generator's tasks in case the blueprint should be responsible on queueing those tasks.
|
|
@@ -568,23 +575,18 @@ export default class JHipsterBaseBlueprintGenerator extends CoreGenerator {
|
|
|
568
575
|
return;
|
|
569
576
|
}
|
|
570
577
|
const mainGeneratorJhipsterVersion = packageJson.version;
|
|
571
|
-
const
|
|
572
|
-
|
|
573
|
-
|
|
578
|
+
const compatibleJhipsterRange = blueprintPackageJson.engines?.['generator-jhipster'] ??
|
|
579
|
+
blueprintPackageJson.dependencies?.['generator-jhipster'] ??
|
|
580
|
+
blueprintPackageJson.peerDependencies?.['generator-jhipster'];
|
|
581
|
+
if (compatibleJhipsterRange) {
|
|
582
|
+
if (!semver.valid(compatibleJhipsterRange) && !semver.validRange(compatibleJhipsterRange)) {
|
|
574
583
|
this.log.verboseInfo(`Blueprint ${blueprintPkgName} contains generator-jhipster dependency with non comparable version`);
|
|
575
584
|
return;
|
|
576
585
|
}
|
|
577
|
-
if (semver.satisfies(mainGeneratorJhipsterVersion,
|
|
578
|
-
return;
|
|
579
|
-
}
|
|
580
|
-
throw new Error(`The installed ${chalk.yellow(blueprintPkgName)} blueprint targets JHipster v${blueprintJhipsterVersion} and is not compatible with this JHipster version. Either update the blueprint or JHipster. You can also disable this check using --skip-checks at your own risk`);
|
|
581
|
-
}
|
|
582
|
-
const blueprintPeerJhipsterVersion = blueprintPackageJson.peerDependencies && blueprintPackageJson.peerDependencies['generator-jhipster'];
|
|
583
|
-
if (blueprintPeerJhipsterVersion) {
|
|
584
|
-
if (semver.satisfies(mainGeneratorJhipsterVersion, blueprintPeerJhipsterVersion, { includePrerelease: true })) {
|
|
586
|
+
if (semver.satisfies(mainGeneratorJhipsterVersion, compatibleJhipsterRange, { includePrerelease: true })) {
|
|
585
587
|
return;
|
|
586
588
|
}
|
|
587
|
-
throw new Error(`The installed ${chalk.yellow(blueprintPkgName)} blueprint targets JHipster ${
|
|
589
|
+
throw new Error(`The installed ${chalk.yellow(blueprintPkgName)} blueprint targets JHipster v${compatibleJhipsterRange} and is not compatible with this JHipster version. Either update the blueprint or JHipster. You can also disable this check using --skip-checks at your own risk`);
|
|
588
590
|
}
|
|
589
591
|
this.log.warn(`Could not retrieve version of JHipster declared by blueprint '${blueprintPkgName}'`);
|
|
590
592
|
}
|
|
@@ -128,7 +128,7 @@ export function normalizeBlueprintName(blueprint) {
|
|
|
128
128
|
return ns.with({ unscoped: `generator-jhipster-${ns.unscoped}` }).toString();
|
|
129
129
|
// eslint-disable-next-line no-empty
|
|
130
130
|
}
|
|
131
|
-
catch
|
|
131
|
+
catch { }
|
|
132
132
|
if (blueprint && blueprint.startsWith('@')) {
|
|
133
133
|
return blueprint;
|
|
134
134
|
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export const extractArgumentsFromConfigs = (configs) => {
|
|
2
|
+
if (!configs)
|
|
3
|
+
return {};
|
|
4
|
+
return Object.fromEntries(Object.entries(configs)
|
|
5
|
+
.filter(([_name, def]) => def.argument)
|
|
6
|
+
.map(([name, def]) => [
|
|
7
|
+
name,
|
|
8
|
+
{
|
|
9
|
+
description: def.description,
|
|
10
|
+
...def.argument,
|
|
11
|
+
},
|
|
12
|
+
]));
|
|
13
|
+
};
|
|
@@ -16,13 +16,30 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
+
import { existsSync, readFileSync, statSync } from 'fs';
|
|
20
|
+
import { rm } from 'fs/promises';
|
|
21
|
+
import { isAbsolute, join, relative } from 'path';
|
|
22
|
+
import { lt as semverLessThan } from 'semver';
|
|
19
23
|
import { defaults } from 'lodash-es';
|
|
24
|
+
import { create } from 'mem-fs-editor';
|
|
25
|
+
import { GENERATOR_JHIPSTER } from '../generator-constants.js';
|
|
20
26
|
export default class SharedData {
|
|
21
27
|
_storage;
|
|
22
|
-
|
|
28
|
+
_editor;
|
|
29
|
+
_log;
|
|
30
|
+
_logCwd;
|
|
31
|
+
constructor(storage, { memFs, destinationPath, log, logCwd }, initialControl = {}) {
|
|
23
32
|
if (!storage) {
|
|
24
33
|
throw new Error('Storage is required for SharedData');
|
|
25
34
|
}
|
|
35
|
+
this._editor = create(memFs);
|
|
36
|
+
this._log = log;
|
|
37
|
+
this._logCwd = logCwd;
|
|
38
|
+
let jhipsterOldVersion;
|
|
39
|
+
if (existsSync(join(destinationPath, '.yo-rc.json'))) {
|
|
40
|
+
jhipsterOldVersion = JSON.parse(readFileSync(join(destinationPath, '.yo-rc.json'), 'utf-8').toString())[GENERATOR_JHIPSTER]
|
|
41
|
+
?.jhipsterVersion;
|
|
42
|
+
}
|
|
26
43
|
// Backward compatibility sharedData
|
|
27
44
|
this._storage = storage;
|
|
28
45
|
defaults(this._storage, {
|
|
@@ -34,7 +51,62 @@ export default class SharedData {
|
|
|
34
51
|
control: initialControl,
|
|
35
52
|
props: {},
|
|
36
53
|
});
|
|
37
|
-
this._storage.sharedApplication
|
|
54
|
+
defaults(this._storage.sharedApplication, {
|
|
55
|
+
nodeDependencies: {},
|
|
56
|
+
customizeTemplatePaths: [],
|
|
57
|
+
});
|
|
58
|
+
let customizeRemoveFiles = [];
|
|
59
|
+
const removeFiles = async (assertions, ...files) => {
|
|
60
|
+
if (typeof assertions === 'string') {
|
|
61
|
+
files = [assertions, ...files];
|
|
62
|
+
assertions = {};
|
|
63
|
+
}
|
|
64
|
+
for (const customize of customizeRemoveFiles) {
|
|
65
|
+
files = files.map(customize).filter(file => file);
|
|
66
|
+
}
|
|
67
|
+
const { removedInVersion } = assertions;
|
|
68
|
+
if (removedInVersion && jhipsterOldVersion && !semverLessThan(jhipsterOldVersion, removedInVersion)) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
const absolutePaths = files.map(file => (isAbsolute(file) ? file : join(destinationPath, file)));
|
|
72
|
+
// Delete from memory fs to keep updated.
|
|
73
|
+
this._editor.delete(absolutePaths);
|
|
74
|
+
await Promise.all(absolutePaths.map(async (file) => {
|
|
75
|
+
const relativePath = relative(logCwd, file);
|
|
76
|
+
try {
|
|
77
|
+
if (statSync(file).isFile()) {
|
|
78
|
+
this._log.info(`Removing legacy file ${relativePath}`);
|
|
79
|
+
await rm(file, { force: true });
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
this._log.info(`Could not remove legacy file ${relativePath}`);
|
|
84
|
+
}
|
|
85
|
+
}));
|
|
86
|
+
};
|
|
87
|
+
defaults(this._storage.control, {
|
|
88
|
+
jhipsterOldVersion,
|
|
89
|
+
removeFiles,
|
|
90
|
+
customizeRemoveFiles: [],
|
|
91
|
+
cleanupFiles: async (cleanup) => {
|
|
92
|
+
await Promise.all(Object.entries(cleanup).map(async ([version, files]) => {
|
|
93
|
+
const stringFiles = [];
|
|
94
|
+
for (const file of files) {
|
|
95
|
+
if (Array.isArray(file)) {
|
|
96
|
+
const [condition, ...fileParts] = file;
|
|
97
|
+
if (condition) {
|
|
98
|
+
stringFiles.push(join(...fileParts));
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
stringFiles.push(file);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
await removeFiles({ removedInVersion: version }, ...stringFiles);
|
|
106
|
+
}));
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
customizeRemoveFiles = this._storage.control.customizeRemoveFiles;
|
|
38
110
|
}
|
|
39
111
|
getSource() {
|
|
40
112
|
return this._storage.sharedSource;
|
|
@@ -22,7 +22,6 @@ const filterNullishValues = value => value !== undefined && value !== null;
|
|
|
22
22
|
* @param object
|
|
23
23
|
* @returns
|
|
24
24
|
*/
|
|
25
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
26
25
|
export function removeFieldsWithNullishValues(object) {
|
|
27
26
|
return filterValue(object, filterNullishValues);
|
|
28
27
|
}
|
|
@@ -31,7 +30,6 @@ export function removeFieldsWithNullishValues(object) {
|
|
|
31
30
|
* @param object
|
|
32
31
|
* @returns
|
|
33
32
|
*/
|
|
34
|
-
// eslint-disable-next-line import/prefer-default-export, @typescript-eslint/no-explicit-any
|
|
35
33
|
function filterValue(object, filterValue = filterNullishValues) {
|
|
36
34
|
const clone = {};
|
|
37
35
|
for (const [key, value] of Object.entries(object)) {
|
|
@@ -80,7 +78,7 @@ export const mutateData = (context, ...mutations) => {
|
|
|
80
78
|
context[key] = value(context);
|
|
81
79
|
}
|
|
82
80
|
}
|
|
83
|
-
else if (context[key] === undefined) {
|
|
81
|
+
else if (context[key] === undefined || override === true) {
|
|
84
82
|
context[key] = value;
|
|
85
83
|
}
|
|
86
84
|
}
|
|
@@ -23,7 +23,6 @@
|
|
|
23
23
|
* @param lineEnding
|
|
24
24
|
* @returns normalized line ending string
|
|
25
25
|
*/
|
|
26
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
27
26
|
export function normalizeLineEndings(str, lineEnding) {
|
|
28
27
|
return str.replace(/\r\n|\r|\n/g, lineEnding);
|
|
29
28
|
}
|
|
@@ -34,7 +33,6 @@ export function normalizeLineEndings(str, lineEnding) {
|
|
|
34
33
|
*
|
|
35
34
|
* @param {string} content - the string to process
|
|
36
35
|
*/
|
|
37
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
38
36
|
export const stripMargin = content => {
|
|
39
37
|
return content.replace(/^[ ]*\|/gm, '');
|
|
40
38
|
};
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/* eslint-disable max-classes-per-file */
|
|
2
1
|
/**
|
|
3
2
|
* Copyright 2013-2024 the original author or authors from the JHipster project.
|
|
4
3
|
*
|
|
@@ -45,7 +44,6 @@ class FakerWithRandexp extends Faker {
|
|
|
45
44
|
* @param nativeLanguage - native language
|
|
46
45
|
* @returns Faker instance
|
|
47
46
|
*/
|
|
48
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
49
47
|
export async function createFaker(nativeLanguage = 'en') {
|
|
50
48
|
nativeLanguage = languageToJavaLanguage(nativeLanguage);
|
|
51
49
|
let locale;
|
|
@@ -53,12 +51,10 @@ export async function createFaker(nativeLanguage = 'en') {
|
|
|
53
51
|
// We need a Faker instance for each entity, to build additional fake instances, use the locale from the exported localized faker instance.
|
|
54
52
|
// See https://github.com/faker-js/faker/pull/642
|
|
55
53
|
try {
|
|
56
|
-
// eslint-disable-next-line import/no-dynamic-require, quotes
|
|
57
54
|
locale = (await import(`@faker-js/faker`))[nativeLanguage];
|
|
58
55
|
}
|
|
59
|
-
catch
|
|
56
|
+
catch {
|
|
60
57
|
// Faker not implemented for the native language, fallback to en.
|
|
61
|
-
// eslint-disable-next-line import/no-unresolved, import/no-dynamic-require
|
|
62
58
|
locale = (await import('@faker-js/faker')).en;
|
|
63
59
|
}
|
|
64
60
|
const faker = new FakerWithRandexp({
|
|
@@ -22,7 +22,7 @@ export * from './config.js';
|
|
|
22
22
|
export * from './contents.js';
|
|
23
23
|
export * from './faker.js';
|
|
24
24
|
export { default as getHipster } from './hipster.js';
|
|
25
|
-
export
|
|
25
|
+
export * from './jhipster7-context.js';
|
|
26
26
|
export * from './logger.js';
|
|
27
27
|
export * from './namespace.js';
|
|
28
28
|
export * from './needles.js';
|
|
@@ -1,6 +1,33 @@
|
|
|
1
1
|
/* eslint-disable no-console */
|
|
2
2
|
import chalk from 'chalk';
|
|
3
|
-
|
|
3
|
+
import { camelCase } from 'lodash-es';
|
|
4
|
+
import { isReservedTableName } from '../../../jdl/jhipster/reserved-keywords.js';
|
|
5
|
+
import { getJavaValueGeneratorForType, getJoinTableName, getPrimaryKeyValue, getSpecificationBuildForType, hibernateSnakeCase, } from '../../server/support/index.js';
|
|
6
|
+
import { getDBCExtraOption } from '../../spring-data-relational/support/database-data.js';
|
|
7
|
+
import { getJdbcUrl, getR2dbcUrl } from '../../spring-data-relational/support/database-url.js';
|
|
8
|
+
import { fieldTypes } from '../../../jdl/index.js';
|
|
9
|
+
import { upperFirstCamelCase } from './string.js';
|
|
10
|
+
const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes;
|
|
11
|
+
export const jhipster7deprecatedProperties = {
|
|
12
|
+
devDatabaseType: {
|
|
13
|
+
behaviorOnlyReason: 'v8: devDatabaseType is only used in jhipster:spring-data-relational generator',
|
|
14
|
+
get: ({ data }) => {
|
|
15
|
+
if (data.devDatabaseType !== undefined)
|
|
16
|
+
return data.devDatabaseType;
|
|
17
|
+
const fallbackValue = data.prodDatabaseType ?? data.databaseType;
|
|
18
|
+
console.log(`JHipster v8 behavior change(devDatabaseType is only used in jhipster:spring-data-relational generator): devDatabaseType is not set, using fallback: ${fallbackValue}`);
|
|
19
|
+
return fallbackValue;
|
|
20
|
+
},
|
|
21
|
+
},
|
|
22
|
+
prodDatabaseType: {
|
|
23
|
+
behaviorOnlyReason: 'v8: prodDatabaseType is only used in jhipster:spring-data-relational generator',
|
|
24
|
+
get: ({ data }) => {
|
|
25
|
+
if (data.prodDatabaseType !== undefined)
|
|
26
|
+
return data.prodDatabaseType;
|
|
27
|
+
console.log(`JHipster v8 behavior change(prodDatabaseType is only used in jhipster:spring-data-relational generator): devDatabaseType is not set, using fallback: ${data.databaseType}`);
|
|
28
|
+
return data.databaseType;
|
|
29
|
+
},
|
|
30
|
+
},
|
|
4
31
|
GRADLE_VERSION: {
|
|
5
32
|
replacement: 'gradleVersion',
|
|
6
33
|
get: ({ data }) => data.gradleVersion,
|
|
@@ -17,6 +44,18 @@ const deprecatedProperties = {
|
|
|
17
44
|
replacement: 'jhipsterDependenciesVersion',
|
|
18
45
|
get: ({ data }) => data.jhipsterDependenciesVersion,
|
|
19
46
|
},
|
|
47
|
+
JAVA_VERSION: {
|
|
48
|
+
replacement: 'javaVersion',
|
|
49
|
+
get: ({ data }) => data.javaVersion,
|
|
50
|
+
},
|
|
51
|
+
JAVA_COMPATIBLE_VERSIONS: {
|
|
52
|
+
replacement: 'javaCompatibleVersions',
|
|
53
|
+
get: ({ data }) => data.javaCompatibleVersions,
|
|
54
|
+
},
|
|
55
|
+
SPRING_BOOT_VERSION: {
|
|
56
|
+
replacement: "javaDependencies['spring-boot']",
|
|
57
|
+
get: ({ data }) => data.javaDependencies['spring-boot'],
|
|
58
|
+
},
|
|
20
59
|
DOCKER_DIR: {
|
|
21
60
|
replacement: 'dockerServicesDir',
|
|
22
61
|
get: ({ data }) => data.dockerServicesDir,
|
|
@@ -123,7 +162,7 @@ const deprecatedProperties = {
|
|
|
123
162
|
},
|
|
124
163
|
dependabotPackageJson: {
|
|
125
164
|
replacement: 'nodeDependencies',
|
|
126
|
-
get: ({ data }) => data.nodeDependencies,
|
|
165
|
+
get: ({ data }) => ({ dependencies: data.nodeDependencies, devDependencies: data.nodeDependencies }),
|
|
127
166
|
},
|
|
128
167
|
cacheManagerIsAvailable: {
|
|
129
168
|
replacement: 'cacheProviderAny',
|
|
@@ -157,31 +196,115 @@ const deprecatedProperties = {
|
|
|
157
196
|
replacement: 'prodDatabaseTypeMssql',
|
|
158
197
|
get: ({ data }) => data.prodDatabaseTypeMssql,
|
|
159
198
|
},
|
|
199
|
+
cacheProviderEhCache: {
|
|
200
|
+
replacement: 'cacheProviderEhcache',
|
|
201
|
+
get: ({ data }) => data.cacheProviderEhcache,
|
|
202
|
+
},
|
|
203
|
+
getJDBCUrl: {
|
|
204
|
+
replacement: '(prod/dev)(Jdbc/Liquibase)Url or this.getJDBCUrl',
|
|
205
|
+
get: () => getJdbcUrl,
|
|
206
|
+
},
|
|
207
|
+
getR2DBCUrl: {
|
|
208
|
+
replacement: '(prod/dev)R2dbcUrl of this.getR2DBCUrl',
|
|
209
|
+
get: () => getR2dbcUrl,
|
|
210
|
+
},
|
|
211
|
+
getDBCExtraOption: {
|
|
212
|
+
replacement: '???',
|
|
213
|
+
get: () => getDBCExtraOption,
|
|
214
|
+
},
|
|
215
|
+
getPrimaryKeyValue: {
|
|
216
|
+
replacement: 'current generator this.getPrimaryKeyValue',
|
|
217
|
+
get: () => getPrimaryKeyValue,
|
|
218
|
+
},
|
|
219
|
+
getJoinTableName: {
|
|
220
|
+
replacement: 'joinTable property',
|
|
221
|
+
get: () => (...args) => getJoinTableName(...args).value,
|
|
222
|
+
},
|
|
223
|
+
getJavaValueGeneratorForType: {
|
|
224
|
+
replacement: 'javaValueGenerator property',
|
|
225
|
+
get: () => type => getJavaValueGeneratorForType(type).replace('longCount', 'count'),
|
|
226
|
+
},
|
|
227
|
+
asEntity: {
|
|
228
|
+
replacement: 'persistClass property',
|
|
229
|
+
get: ({ data }) => name => `${name}${data.entitySuffix}`,
|
|
230
|
+
},
|
|
231
|
+
asDto: {
|
|
232
|
+
replacement: 'restClass property',
|
|
233
|
+
get: ({ data }) => name => `${name}${data.dtoSuffix}`,
|
|
234
|
+
},
|
|
235
|
+
upperFirstCamelCase: {
|
|
236
|
+
replacement: 'upperFirstCamelCase* property alternative',
|
|
237
|
+
get: () => upperFirstCamelCase,
|
|
238
|
+
},
|
|
239
|
+
hasOauthUser: {
|
|
240
|
+
replacement: 'authenticationTypeOauth2 && generateBuiltInUserEntity',
|
|
241
|
+
get: ({ data }) => data.authenticationTypeOauth2 && data.generateBuiltInUserEntity,
|
|
242
|
+
},
|
|
243
|
+
getPrettierExtensions: {
|
|
244
|
+
replacement: 'prettierExtensions',
|
|
245
|
+
get: ({ data }) => () => data.prettierExtensions,
|
|
246
|
+
},
|
|
247
|
+
_generateSqlSafeName: {
|
|
248
|
+
replacement: 'relationshipSqlSafeName property',
|
|
249
|
+
get: () => name => (isReservedTableName(name, 'sql') ? `e_${name}` : name),
|
|
250
|
+
},
|
|
251
|
+
isFilterableType: {
|
|
252
|
+
replacement: 'filterableField property',
|
|
253
|
+
get: () => fieldType => ![BYTES, BYTE_BUFFER].includes(fieldType),
|
|
254
|
+
},
|
|
255
|
+
getSpecificationBuilder: {
|
|
256
|
+
replacement: 'field.fieldJavaBuildSpecification || primaryKey.javaBuildSpecification',
|
|
257
|
+
get: () => getSpecificationBuildForType,
|
|
258
|
+
},
|
|
259
|
+
getColumnName: {
|
|
260
|
+
replacement: 'entityTableName || relationship.columnName property',
|
|
261
|
+
get: () => hibernateSnakeCase,
|
|
262
|
+
},
|
|
263
|
+
isUsingBuiltInUser: {
|
|
264
|
+
replacement: 'generateBuiltInUserEntity',
|
|
265
|
+
get: ({ data }) => () => data.generateBuiltInUserEntity,
|
|
266
|
+
},
|
|
267
|
+
isUsingBuiltInAuthority: {
|
|
268
|
+
replacement: 'generateBuiltInAuthorityEntity',
|
|
269
|
+
get: ({ data }) => () => data.generateBuiltInAuthorityEntity,
|
|
270
|
+
},
|
|
271
|
+
jhipsterConfig: {
|
|
272
|
+
replacement: 'none',
|
|
273
|
+
get: ({ generator }) => generator.config?.getAll?.(),
|
|
274
|
+
},
|
|
275
|
+
configOptions: {
|
|
276
|
+
replacement: 'none',
|
|
277
|
+
get: () => ({}),
|
|
278
|
+
},
|
|
160
279
|
};
|
|
161
280
|
const ejsBuiltInProperties = ['__append', '__line', 'escapeFn', 'include', 'undefined'];
|
|
162
281
|
const javascriptBuiltInProperties = ['parseInt', 'Boolean', 'JSON', 'Object', 'toString'];
|
|
163
|
-
const
|
|
282
|
+
const getPropertBuilder = ({ log = msg => console.log(msg) } = {}) => (context, prop) => {
|
|
164
283
|
if (typeof prop === 'symbol') {
|
|
165
284
|
return undefined;
|
|
166
285
|
}
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
286
|
+
const { generator, data } = context;
|
|
287
|
+
const value = prop in data ? data[prop] : undefined;
|
|
288
|
+
if (prop in jhipster7deprecatedProperties) {
|
|
289
|
+
const { replacement, get, behaviorOnlyReason } = jhipster7deprecatedProperties[prop];
|
|
290
|
+
const fallBackValue = get(context);
|
|
291
|
+
const valueDesc = prop in data ? `Value: ${value}, ` : '';
|
|
292
|
+
if (!behaviorOnlyReason) {
|
|
293
|
+
log(`Template data ${chalk.yellow(String(prop))} was removed and should be replaced with ${chalk.yellow(replacement)}. ${valueDesc}FallbackValue: ${fallBackValue}`);
|
|
294
|
+
}
|
|
295
|
+
return value ?? fallBackValue;
|
|
172
296
|
}
|
|
173
297
|
if (prop?.startsWith?.('DOCKER_')) {
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
298
|
+
const container = camelCase(prop.replace('DOCKER_', '').replace('_CONTAINER', ''));
|
|
299
|
+
log(`Template data ${chalk.yellow(String(prop))} was removed and should be replaced with ${chalk.yellow(`dockerContainers.${container}`)}.`);
|
|
300
|
+
return value ?? data.dockerContainers[container];
|
|
177
301
|
}
|
|
178
|
-
const { generator, data } = context;
|
|
179
302
|
if (prop in data) {
|
|
180
|
-
return
|
|
303
|
+
return value;
|
|
181
304
|
}
|
|
182
305
|
if (prop in generator) {
|
|
183
|
-
|
|
184
|
-
|
|
306
|
+
log(`Template data ${chalk.yellow(String(prop))} is a generator property.`);
|
|
307
|
+
log(`Change the template to '${chalk.yellow(`this.${String(prop)}`)}'`);
|
|
185
308
|
return generator[prop];
|
|
186
309
|
}
|
|
187
310
|
// console.log(`Template data '${chalk.yellow(String(prop))}' not found. Check your data.`);
|
|
@@ -191,47 +314,48 @@ const getProperty = (context, prop) => {
|
|
|
191
314
|
}
|
|
192
315
|
return undefined;
|
|
193
316
|
};
|
|
194
|
-
const createHandler = ({
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
if (!ignoreWarnings) {
|
|
223
|
-
console.log(`${chalk.yellow(prop)} is a javascript built in symbol, its use is discouraged inside templates`);
|
|
317
|
+
const createHandler = ({ log } = {}) => {
|
|
318
|
+
const getProperty = getPropertBuilder({ log });
|
|
319
|
+
return {
|
|
320
|
+
...Object.fromEntries([
|
|
321
|
+
'apply',
|
|
322
|
+
'construct',
|
|
323
|
+
'defineProperty',
|
|
324
|
+
'deleteProperty',
|
|
325
|
+
'getOwnPropertyDescriptor',
|
|
326
|
+
'getPrototypeOf',
|
|
327
|
+
'isExtensible',
|
|
328
|
+
'ownKeys',
|
|
329
|
+
'preventExtensions',
|
|
330
|
+
'setPrototypeOf',
|
|
331
|
+
'set',
|
|
332
|
+
].map(method => [method, (...args) => console.log(`Fixme: template data called ${method}(${args?.pop() ?? ''})`)])),
|
|
333
|
+
ownKeys: ({ data }) => {
|
|
334
|
+
return Reflect.ownKeys(data);
|
|
335
|
+
},
|
|
336
|
+
getPrototypeOf: ({ data }) => {
|
|
337
|
+
return Object.getPrototypeOf(data);
|
|
338
|
+
},
|
|
339
|
+
getOwnPropertyDescriptor: ({ data }, prop) => {
|
|
340
|
+
return Object.getOwnPropertyDescriptor(data, prop);
|
|
341
|
+
},
|
|
342
|
+
has: (context, prop) => {
|
|
343
|
+
if (ejsBuiltInProperties.includes(prop)) {
|
|
344
|
+
return false;
|
|
224
345
|
}
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
}
|
|
235
|
-
|
|
346
|
+
if (javascriptBuiltInProperties.includes(prop)) {
|
|
347
|
+
log(`${chalk.yellow(prop)} is a javascript built in symbol, its use is discouraged inside templates`);
|
|
348
|
+
return false;
|
|
349
|
+
}
|
|
350
|
+
const propValue = getProperty(context, prop);
|
|
351
|
+
if (propValue === undefined) {
|
|
352
|
+
return prop in context.data;
|
|
353
|
+
}
|
|
354
|
+
return propValue !== undefined;
|
|
355
|
+
},
|
|
356
|
+
get: getProperty,
|
|
357
|
+
};
|
|
358
|
+
};
|
|
359
|
+
export function createJHipster7Context(generator, data, options) {
|
|
236
360
|
return new Proxy({ generator, data }, createHandler(options));
|
|
237
361
|
}
|
|
@@ -21,7 +21,6 @@
|
|
|
21
21
|
* @param {string} packageName - name of the blueprint's package name
|
|
22
22
|
* @returns {string} namespace of the blueprint
|
|
23
23
|
*/
|
|
24
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
25
24
|
export function packageNameToNamespace(packageName) {
|
|
26
25
|
return packageName.replace('generator-', '');
|
|
27
26
|
}
|
|
@@ -16,5 +16,4 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
20
19
|
export const normalizePathEnd = (directory) => (directory.endsWith('/') ? directory : `${directory}/`);
|
|
@@ -26,8 +26,8 @@ export function stringHashCode(str) {
|
|
|
26
26
|
let hash = 0;
|
|
27
27
|
for (let i = 0; i < str.length; i++) {
|
|
28
28
|
const character = str.charCodeAt(i);
|
|
29
|
-
hash = (hash << 5) - hash + character;
|
|
30
|
-
hash |= 0;
|
|
29
|
+
hash = (hash << 5) - hash + character;
|
|
30
|
+
hash |= 0;
|
|
31
31
|
}
|
|
32
32
|
if (hash < 0) {
|
|
33
33
|
hash *= -1;
|
|
@@ -23,7 +23,6 @@ const isWin32 = platform() === 'win32';
|
|
|
23
23
|
* TODO move to utils when converted to typescripts
|
|
24
24
|
* Converts multiples EditFileCallback callbacks into one.
|
|
25
25
|
*/
|
|
26
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
27
26
|
export function joinCallbacks(...callbacks) {
|
|
28
27
|
return function (content, filePath) {
|
|
29
28
|
if (isWin32 && content.match(/\r\n/)) {
|
|
@@ -18,11 +18,11 @@
|
|
|
18
18
|
*/
|
|
19
19
|
import { upperFirst } from 'lodash-es';
|
|
20
20
|
import BaseGenerator from '../base/index.js';
|
|
21
|
-
import { CUSTOM_PRIORITIES, PRIORITY_NAMES, QUEUES } from './priorities.js';
|
|
22
21
|
import { JHIPSTER_CONFIG_DIR } from '../generator-constants.js';
|
|
23
|
-
import { getEntitiesFromDir } from './support/index.js';
|
|
24
22
|
import { mutateData } from '../base/support/config.js';
|
|
25
23
|
import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_BOOTSTRAP_APPLICATION_CLIENT, GENERATOR_BOOTSTRAP_APPLICATION_SERVER, } from '../generator-list.js';
|
|
24
|
+
import { getEntitiesFromDir } from './support/index.js';
|
|
25
|
+
import { CUSTOM_PRIORITIES, PRIORITY_NAMES, QUEUES } from './priorities.js';
|
|
26
26
|
const { LOADING, PREPARING, POST_PREPARING, CONFIGURING_EACH_ENTITY, LOADING_ENTITIES, PREPARING_EACH_ENTITY, PREPARING_EACH_ENTITY_FIELD, PREPARING_EACH_ENTITY_RELATIONSHIP, POST_PREPARING_EACH_ENTITY, DEFAULT, WRITING, POST_WRITING, WRITING_ENTITIES, POST_WRITING_ENTITIES, PRE_CONFLICTS, INSTALL, END, } = PRIORITY_NAMES;
|
|
27
27
|
const { CONFIGURING_EACH_ENTITY_QUEUE, LOADING_ENTITIES_QUEUE, PREPARING_EACH_ENTITY_QUEUE, PREPARING_EACH_ENTITY_FIELD_QUEUE, PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE, POST_PREPARING_EACH_ENTITY_QUEUE, WRITING_ENTITIES_QUEUE, POST_WRITING_ENTITIES_QUEUE, } = QUEUES;
|
|
28
28
|
const asPriority = BaseGenerator.asPriority;
|
|
@@ -271,7 +271,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
|
|
|
271
271
|
if ([PREPARING, LOADING].includes(priorityName)) {
|
|
272
272
|
return {
|
|
273
273
|
application,
|
|
274
|
-
applicationDefaults: data => mutateData(application, data),
|
|
274
|
+
applicationDefaults: data => mutateData(application, { __override__: false, ...data }),
|
|
275
275
|
};
|
|
276
276
|
}
|
|
277
277
|
if (LOADING_ENTITIES === priorityName) {
|
|
@@ -336,7 +336,6 @@ export default class BaseApplicationGenerator extends BaseGenerator {
|
|
|
336
336
|
}
|
|
337
337
|
const entitiesToLoad = [...new Set([...builtInEntities, ...this.getExistingEntityNames()])];
|
|
338
338
|
return entitiesToLoad.map(entityName => {
|
|
339
|
-
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
340
339
|
const generator = this;
|
|
341
340
|
if (!this.sharedData.hasEntity(entityName)) {
|
|
342
341
|
this.sharedData.setEntity(entityName, { name: entityName });
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
import {
|
|
19
|
+
import { PRIORITY_NAMES as PRIORITY_NAMES_BASE, QUEUES as QUEUES_BASE, QUEUE_PREFIX } from '../base/priorities.js';
|
|
20
20
|
const { DEFAULT, TRANSFORM, MULTISTEP_TRANSFORM } = PRIORITY_NAMES_BASE;
|
|
21
21
|
const CONFIGURING_EACH_ENTITY = 'configuringEachEntity';
|
|
22
22
|
const CONFIGURING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${CONFIGURING_EACH_ENTITY}`;
|
|
@@ -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
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
20
19
|
export const stringifyApplicationData = data => JSON.stringify(data, (key, value) => {
|
|
21
20
|
if (!value) {
|
|
22
21
|
return value;
|
|
@@ -28,7 +28,6 @@ const isSimpleText = (previousLine, text) => {
|
|
|
28
28
|
/**
|
|
29
29
|
* Format As Liquibase Remarks
|
|
30
30
|
*/
|
|
31
|
-
// eslint-disable-next-line import/prefer-default-export
|
|
32
31
|
export const formatDocAsSingleLine = (text) => {
|
|
33
32
|
let [description, ...rows] = text.split('\n');
|
|
34
33
|
// discard blank rows
|