generator-jhipster 8.3.0 → 8.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/generators/angular/generator.js +34 -0
- package/dist/generators/angular/resources/package.json +7 -7
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.ts.ejs +10 -6
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +1 -1
- package/dist/generators/angular/templates/webpack/webpack.custom.js.ejs +1 -1
- package/dist/generators/app/generator.js +2 -20
- package/dist/generators/app/support/config.js +1 -3
- package/dist/generators/base-application/support/prepare-field.js +1 -1
- package/dist/generators/base-core/generator.js +5 -2
- package/dist/generators/base-entity-changes/generator.js +24 -0
- package/dist/generators/bootstrap-application-base/generator.js +42 -1
- package/dist/generators/bootstrap-application-server/generator.js +4 -7
- package/dist/generators/ci-cd/generator.js +0 -5
- package/dist/generators/client/generator.js +0 -22
- package/dist/generators/client/resources/package.json +6 -6
- package/dist/generators/client/templates/src/main/webapp/index.html.ejs +1 -1
- package/dist/generators/common/command.js +13 -0
- package/dist/generators/common/generator.js +12 -3
- package/dist/generators/common/resources/package.json +1 -1
- package/dist/generators/docker-compose/generator.js +1 -5
- package/dist/generators/export-jdl/generator.js +0 -5
- package/dist/generators/gatling/templates/buildSrc/src/main/groovy/jhipster.gatling-conventions.gradle.ejs +1 -1
- package/dist/generators/generate-blueprint/resources/package.json +1 -1
- package/dist/generators/generator-constants.js +1 -1
- package/dist/generators/heroku/generator.js +0 -5
- package/dist/generators/init/resources/.node-version +1 -1
- package/dist/generators/java/generators/domain/generator.js +16 -0
- package/dist/generators/jdl/generator.js +0 -4
- package/dist/generators/kubernetes/generator.js +0 -5
- package/dist/generators/kubernetes-helm/generator.js +0 -5
- package/dist/generators/kubernetes-knative/generator.js +0 -5
- package/dist/generators/languages/files.js +2 -2
- package/dist/generators/languages/generator.js +0 -6
- package/dist/generators/languages/templates/src/main/webapp/i18n/al/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ar-ly/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/az-Latn-az/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/bg/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/bn/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/by/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ca/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/cs/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/da/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/de/global.json.ejs +2 -2
- package/dist/generators/languages/templates/src/main/webapp/i18n/de/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/el/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/en/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/es/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/et/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/fa/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/fi/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/fr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/gl/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/hi/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/hr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/hu/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/hy/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/id/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/it/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ja/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ko/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/kr-Latn-kr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/mr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/my/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/nl/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/pa/{home.json → home.json.ejs} +2 -2
- package/dist/generators/languages/templates/src/main/webapp/i18n/pl/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/pt-br/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/pt-pt/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ro/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ru/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/si/{home.json → home.json.ejs} +6 -6
- package/dist/generators/languages/templates/src/main/webapp/i18n/sk/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/sr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/sv/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ta/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/te/{home.json → home.json.ejs} +1 -1
- package/dist/generators/languages/templates/src/main/webapp/i18n/th/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/tr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ua/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/vi/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/zh-cn/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/zh-tw/home.json.ejs +19 -0
- package/dist/generators/liquibase/generator.js +59 -12
- package/dist/generators/liquibase/support/prepare-field.js +16 -1
- package/dist/generators/liquibase/support/relationship.js +1 -0
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs +1 -1
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs +3 -3
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +26 -1
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs +3 -3
- package/dist/generators/react/resources/package.json +18 -18
- package/dist/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs +7 -7
- package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs +0 -8
- package/dist/generators/server/generator.js +16 -51
- package/dist/generators/server/resources/Dockerfile +9 -9
- package/dist/generators/server/resources/gradle/libs.versions.toml +8 -8
- package/dist/generators/server/resources/pom.xml +7 -7
- package/dist/generators/server/support/prepare-field.js +7 -2
- package/dist/generators/server/support/prepare-relationship.js +7 -2
- package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs +2 -2
- package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs +2 -2
- package/dist/generators/server/templates/pom.xml.ejs +0 -4
- package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +56 -6
- package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs +1 -1
- package/dist/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs +1 -1
- package/dist/generators/server/templates/src/main/resources/static/index_microservices.html.ejs +8 -8
- package/dist/generators/spring-boot/cleanup.js +3 -0
- package/dist/generators/spring-boot/command.js +10 -1
- package/dist/generators/spring-boot/files.js +0 -5
- package/dist/generators/spring-boot/generator.js +17 -0
- package/dist/generators/{server → spring-boot}/prompts.js +2 -2
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +111 -111
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +2 -2
- package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs +4 -0
- package/dist/generators/{app/prompts.js → spring-data-relational/support/h2-reserved-keywords.js} +4 -15
- package/dist/generators/upgrade/generator.js +0 -4
- package/dist/generators/vue/resources/package.json +14 -14
- package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.vue.ejs +7 -7
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs +1 -1
- package/dist/generators/vue/templates/vitest.config.mts.ejs +1 -1
- package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs +0 -9
- package/dist/types/generators/base/api.d.ts +1 -1
- package/dist/types/generators/base-application/types.d.ts +15 -0
- package/dist/types/generators/base-entity-changes/types.d.ts +2 -0
- package/dist/types/generators/generator-constants.d.ts +1 -1
- package/dist/types/generators/spring-data-relational/support/h2-reserved-keywords.d.ts +20 -0
- package/package.json +10 -11
- package/dist/generators/languages/templates/src/main/webapp/i18n/al/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ar-ly/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/az-Latn-az/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/bg/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/bn/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/by/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ca/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/cs/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/da/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/de/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/el/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/en/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/es/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/et/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/fa/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/fi/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/fr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/gl/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/hi/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/hr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/hu/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/hy/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/id/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/it/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ja/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ko/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/kr-Latn-kr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/mr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/my/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/nl/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/pl/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/pt-br/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/pt-pt/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ro/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ru/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/sk/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/sr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/sv/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ta/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/th/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/tr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ua/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json +0 -148
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/vi/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/zh-cn/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/zh-tw/home.json +0 -19
- package/dist/generators/server/templates/src/main/java/_package_/config/LocaleConfiguration_imperative.java.ejs +0 -43
- package/dist/generators/server/templates/src/main/java/_package_/config/LocaleConfiguration_reactive.java.ejs +0 -184
- package/dist/generators/statistics.js +0 -223
|
@@ -113,6 +113,40 @@ export default class AngularGenerator extends BaseApplicationGenerator {
|
|
|
113
113
|
get [BaseApplicationGenerator.PREPARING_EACH_ENTITY]() {
|
|
114
114
|
return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
|
|
115
115
|
}
|
|
116
|
+
get preparingEachEntityField() {
|
|
117
|
+
return this.asPreparingEachEntityFieldTaskGroup({
|
|
118
|
+
prepareField({ field }) {
|
|
119
|
+
mutateData(field, {
|
|
120
|
+
fieldTsDefaultValue: ({ fieldTsDefaultValue, defaultValue, fieldTypeCharSequence, fieldTypeTimed }) => {
|
|
121
|
+
let returnValue;
|
|
122
|
+
if (fieldTsDefaultValue !== undefined || defaultValue !== undefined) {
|
|
123
|
+
let fieldDefaultValue;
|
|
124
|
+
if (fieldTsDefaultValue !== undefined) {
|
|
125
|
+
fieldDefaultValue = fieldTsDefaultValue;
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
fieldDefaultValue = defaultValue;
|
|
129
|
+
}
|
|
130
|
+
fieldDefaultValue = String(fieldDefaultValue).replace(/'/g, "\\'");
|
|
131
|
+
if (fieldTypeCharSequence) {
|
|
132
|
+
returnValue = `'${fieldDefaultValue}'`;
|
|
133
|
+
}
|
|
134
|
+
else if (fieldTypeTimed) {
|
|
135
|
+
returnValue = `dayjs('${fieldDefaultValue}')`;
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
returnValue = fieldDefaultValue;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
return returnValue;
|
|
142
|
+
},
|
|
143
|
+
});
|
|
144
|
+
},
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_FIELD]() {
|
|
148
|
+
return this.delegateTasksToBlueprint(() => this.preparingEachEntityField);
|
|
149
|
+
}
|
|
116
150
|
get default() {
|
|
117
151
|
return this.asDefaultTaskGroup({
|
|
118
152
|
loadEntities() {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@angular/common": "17.3.
|
|
3
|
+
"@angular/common": "17.3.6",
|
|
4
4
|
"@fortawesome/angular-fontawesome": "0.14.1",
|
|
5
5
|
"@fortawesome/fontawesome-svg-core": "6.5.2",
|
|
6
6
|
"@fortawesome/free-solid-svg-icons": "6.5.2",
|
|
@@ -24,11 +24,11 @@
|
|
|
24
24
|
"@angular-builders/custom-webpack": "17.0.2",
|
|
25
25
|
"@angular-builders/jest": "17.0.3",
|
|
26
26
|
"@angular-eslint/eslint-plugin": "17.3.0",
|
|
27
|
-
"@angular/cli": "17.3.
|
|
27
|
+
"@angular/cli": "17.3.6",
|
|
28
28
|
"@types/jest": "29.5.12",
|
|
29
29
|
"@types/node": "20.11.25",
|
|
30
30
|
"@types/sockjs-client": "1.5.4",
|
|
31
|
-
"@typescript-eslint/eslint-plugin": "7.
|
|
31
|
+
"@typescript-eslint/eslint-plugin": "7.7.1",
|
|
32
32
|
"browser-sync": "3.0.2",
|
|
33
33
|
"browser-sync-webpack-plugin": "2.3.0",
|
|
34
34
|
"buffer": "6.0.3",
|
|
@@ -38,17 +38,17 @@
|
|
|
38
38
|
"eslint-webpack-plugin": "4.1.0",
|
|
39
39
|
"folder-hash": "4.0.4",
|
|
40
40
|
"jest": "29.7.0",
|
|
41
|
-
"jest-date-mock": "1.0.
|
|
41
|
+
"jest-date-mock": "1.0.10",
|
|
42
42
|
"jest-junit": "16.0.0",
|
|
43
43
|
"jest-preset-angular": "14.0.3",
|
|
44
44
|
"jest-sonar": "0.2.16",
|
|
45
45
|
"merge-jsons-webpack-plugin": "2.0.1",
|
|
46
|
-
"postcss-rtlcss": "5.1.
|
|
46
|
+
"postcss-rtlcss": "5.1.2",
|
|
47
47
|
"rimraf": "5.0.5",
|
|
48
48
|
"ts-jest": "29.1.2",
|
|
49
|
-
"typescript": "5.4.
|
|
49
|
+
"typescript": "5.4.5",
|
|
50
50
|
"webpack": "5.91.0",
|
|
51
|
-
"webpack-bundle-analyzer": "4.10.
|
|
51
|
+
"webpack-bundle-analyzer": "4.10.2",
|
|
52
52
|
"webpack-merge": "5.10.0",
|
|
53
53
|
"webpack-notifier": "1.15.0"
|
|
54
54
|
}
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
<div class="alert alert-danger">__jhiTranslateTag__('global.messages.error.dontmatch')</div>
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
<form name="form"
|
|
35
|
+
<form name="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
|
|
36
36
|
<div class="mb-3">
|
|
37
37
|
<label class="form-label" for="currentPassword">__jhiTranslateTag__('global.form.currentpassword.label')</label>
|
|
38
38
|
<input
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
|
|
51
51
|
@if (key() && !success()) {
|
|
52
52
|
<div>
|
|
53
|
-
<form name="form"
|
|
53
|
+
<form name="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
|
|
54
54
|
<div class="mb-3">
|
|
55
55
|
<label class="form-label" for="newPassword">__jhiTranslateTag__('global.form.newpassword.label')</label>
|
|
56
56
|
<input
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
<div class="alert alert-warning">
|
|
28
28
|
<span>__jhiTranslateTag__('reset.request.messages.info')</span>
|
|
29
29
|
</div>
|
|
30
|
-
<form name="form"
|
|
30
|
+
<form name="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
|
|
31
31
|
<div class="mb-3">
|
|
32
32
|
<label class="form-label" for="email">__jhiTranslateTag__('global.form.email.label')</label>
|
|
33
33
|
<input
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
<div class="d-flex justify-content-center">
|
|
47
47
|
<div class="col-md-8">
|
|
48
48
|
@if (!success()) {
|
|
49
|
-
<form name="form"
|
|
49
|
+
<form name="form" (ngSubmit)="register()" [formGroup]="registerForm">
|
|
50
50
|
<div class="mb-3">
|
|
51
51
|
<label class="form-label" for="login">__jhiTranslateTag__('global.form.username.label')</label>
|
|
52
52
|
<input
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
<<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
|
|
31
31
|
|
|
32
32
|
@if (settingsForm.value.login) {
|
|
33
|
-
<form name="form"
|
|
33
|
+
<form name="form" (ngSubmit)="save()" [formGroup]="settingsForm" novalidate>
|
|
34
34
|
<div class="mb-3">
|
|
35
35
|
<label class="form-label" for="firstName">__jhiTranslateTag__('settings.form.firstname')</label>
|
|
36
36
|
<input
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
<div class="d-flex justify-content-center">
|
|
20
20
|
<div class="col-8">
|
|
21
|
-
<form name="editForm"
|
|
21
|
+
<form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
|
|
22
22
|
<h2 id="myUserLabel">__jhiTranslateTag__('userManagement.home.createOrEditLabel')</h2>
|
|
23
23
|
|
|
24
24
|
<<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
|
|
@@ -200,12 +200,16 @@ _%>
|
|
|
200
200
|
<%_ for (field of fields) {
|
|
201
201
|
const { fieldName, fieldTypeBoolean, fieldTypeTimed, fieldTypeLocalDate } = field;
|
|
202
202
|
_%>
|
|
203
|
-
<%_ if (field.
|
|
204
|
-
|
|
205
|
-
<%_ } else
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
203
|
+
<%_ if (field.fieldTsDefaultValue) { _%>
|
|
204
|
+
<%= fieldName %>: <%- field.fieldTsDefaultValue %>,
|
|
205
|
+
<%_ } else { _%>
|
|
206
|
+
<%_ if (field.id) { _%>
|
|
207
|
+
<%= fieldName %>: null,
|
|
208
|
+
<%_ } else if (fieldTypeBoolean) { _%>
|
|
209
|
+
<%= fieldName %>: false,
|
|
210
|
+
<%_ } else if (fieldTypeTimed) { _%>
|
|
211
|
+
<%= fieldName %>: currentTime,
|
|
212
|
+
<%_ } _%>
|
|
209
213
|
<%_ } _%>
|
|
210
214
|
<%_ } _%>
|
|
211
215
|
<%_ for (const relationship of relationships.filter(({ persistableRelationship }) => persistableRelationship)) {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
<div class="d-flex justify-content-center">
|
|
20
20
|
<div class="col-8">
|
|
21
|
-
<form name="editForm"
|
|
21
|
+
<form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
|
|
22
22
|
<h2 id="<%= jhiPrefixDashed %>-<%= entityFileName %>-heading" data-cy="<%= entityClass %>CreateUpdateHeading">__jhiTranslateTag__('<%- i18nKeyPrefix %>.home.createOrEditLabel')</h2>
|
|
23
23
|
|
|
24
24
|
<div>
|
|
@@ -51,15 +51,15 @@
|
|
|
51
51
|
<p>__jhiTranslateTag__('home.question')</p>
|
|
52
52
|
|
|
53
53
|
<ul>
|
|
54
|
-
<li><a href="
|
|
55
|
-
<li><a href="
|
|
56
|
-
<li><a href="
|
|
57
|
-
<li><a href="
|
|
58
|
-
<li><a href="
|
|
54
|
+
<li><a href="<%- hipsterDocumentationLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.homepage')</a></li>
|
|
55
|
+
<li><a href="<%- hipsterStackoverflowLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.stackoverflow')</a></li>
|
|
56
|
+
<li><a href="<%- hipsterBugTrackerLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.bugtracker')</a></li>
|
|
57
|
+
<li><a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.chat')</a></li>
|
|
58
|
+
<li><a href="<%- hipsterTwitterLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.link.follow')</a></li>
|
|
59
59
|
</ul>
|
|
60
60
|
|
|
61
61
|
<p>
|
|
62
|
-
<span>__jhiTranslateTag__('home.like')</span> <a href="
|
|
62
|
+
<span>__jhiTranslateTag__('home.like')</span> <a href="<%- hipsterProjectLink %>" target="_blank" rel="noopener noreferrer">__jhiTranslateTag__('home.github')</a>!
|
|
63
63
|
</p>
|
|
64
64
|
</div>
|
|
65
65
|
</div>
|
package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs
CHANGED
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
data-cy="loginError"
|
|
26
26
|
>__jhiTranslateTag__('login.messages.error.authentication')</div>
|
|
27
27
|
}
|
|
28
|
-
<form class="form"
|
|
28
|
+
<form class="form" (ngSubmit)="login()" [formGroup]="loginForm">
|
|
29
29
|
<div class="mb-3">
|
|
30
30
|
<label class="username-label" for="username">__jhiTranslateTag__('global.form.username.label')</label>
|
|
31
31
|
<input
|
|
@@ -62,7 +62,7 @@ module.exports = async (config, options, targetOptions) => {
|
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
// configuring proxy for back end service
|
|
65
|
-
const tls =
|
|
65
|
+
const tls = config.devServer?.server?.type === 'https';
|
|
66
66
|
if (config.devServer) {
|
|
67
67
|
config.devServer.proxy = proxyConfig({ tls });
|
|
68
68
|
}
|
|
@@ -18,19 +18,16 @@
|
|
|
18
18
|
*/
|
|
19
19
|
/* eslint-disable consistent-return, import/no-named-as-default-member */
|
|
20
20
|
import chalk from 'chalk';
|
|
21
|
-
import { camelCase
|
|
21
|
+
import { camelCase } from 'lodash-es';
|
|
22
22
|
import BaseApplicationGenerator from '../base-application/index.js';
|
|
23
23
|
import { checkNode, loadStoredAppOptions } from './support/index.js';
|
|
24
24
|
import cleanupOldFilesTask from './cleanup.js';
|
|
25
|
-
import { askForInsightOptIn } from './prompts.js';
|
|
26
|
-
import statistics from '../statistics.js';
|
|
27
25
|
import { GENERATOR_COMMON, GENERATOR_CLIENT, GENERATOR_SERVER } from '../generator-list.js';
|
|
28
26
|
import { getDefaultAppName } from '../project-name/support/index.js';
|
|
29
27
|
import { packageJson } from '../../lib/index.js';
|
|
30
|
-
import { applicationTypes
|
|
28
|
+
import { applicationTypes } from '../../jdl/jhipster/index.js';
|
|
31
29
|
import command from './command.js';
|
|
32
30
|
const { MICROSERVICE } = applicationTypes;
|
|
33
|
-
const { JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY } = applicationOptions.OptionNames;
|
|
34
31
|
export default class JHipsterAppGenerator extends BaseApplicationGenerator {
|
|
35
32
|
command = command;
|
|
36
33
|
async beforeQueue() {
|
|
@@ -70,7 +67,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
|
|
|
70
67
|
}
|
|
71
68
|
get prompting() {
|
|
72
69
|
return this.asPromptingTaskGroup({
|
|
73
|
-
askForInsightOptIn,
|
|
74
70
|
async prompting({ control }) {
|
|
75
71
|
if (control.existingProject && this.options.askAnswered !== true)
|
|
76
72
|
return;
|
|
@@ -156,20 +152,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
|
|
|
156
152
|
get [BaseApplicationGenerator.COMPOSING]() {
|
|
157
153
|
return this.delegateTasksToBlueprint(() => this.composing);
|
|
158
154
|
}
|
|
159
|
-
get default() {
|
|
160
|
-
return this.asDefaultTaskGroup({
|
|
161
|
-
insight({ control }) {
|
|
162
|
-
const yorc = {
|
|
163
|
-
...omit(this.jhipsterConfig, [JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY]),
|
|
164
|
-
};
|
|
165
|
-
yorc.applicationType = this.jhipsterConfig.applicationType;
|
|
166
|
-
statistics.sendYoRc(yorc, control.existingProject, this.jhipsterConfig.jhipsterVersion);
|
|
167
|
-
},
|
|
168
|
-
});
|
|
169
|
-
}
|
|
170
|
-
get [BaseApplicationGenerator.DEFAULT]() {
|
|
171
|
-
return this.delegateTasksToBlueprint(() => this.default);
|
|
172
|
-
}
|
|
173
155
|
get writing() {
|
|
174
156
|
return this.asWritingTaskGroup({
|
|
175
157
|
cleanupOldFilesTask,
|
|
@@ -10,7 +10,7 @@ import { packageJson } from '../../../lib/index.js';
|
|
|
10
10
|
const { GATLING, CUCUMBER, CYPRESS } = testFrameworkTypes;
|
|
11
11
|
const { GATEWAY, MONOLITH } = applicationTypes;
|
|
12
12
|
const { JWT, OAUTH2, SESSION } = authenticationTypes;
|
|
13
|
-
const {
|
|
13
|
+
const { NO: NO_DATABASE } = databaseTypes;
|
|
14
14
|
/**
|
|
15
15
|
* Load common options to be stored.
|
|
16
16
|
* @deprecated
|
|
@@ -159,6 +159,4 @@ export const loadDerivedAppConfig = ({ application }) => {
|
|
|
159
159
|
application.generateUserManagement =
|
|
160
160
|
!application.skipUserManagement && application.databaseType !== NO_DATABASE && authenticationApiWithUserManagement;
|
|
161
161
|
application.generateInMemoryUserCredentials = !application.generateUserManagement && authenticationApiWithUserManagement;
|
|
162
|
-
application.generateBuiltInUserEntity = application.generateUserManagement || application.syncUserWithIdp;
|
|
163
|
-
application.generateBuiltInAuthorityEntity = application.generateBuiltInUserEntity && application.databaseType !== CASSANDRA;
|
|
164
162
|
};
|
|
@@ -247,7 +247,7 @@ function _derivedProperties(field) {
|
|
|
247
247
|
fieldTypeNumeric: fieldType === INTEGER || fieldType === LONG || fieldType === FLOAT || fieldType === DOUBLE || fieldType === BIG_DECIMAL,
|
|
248
248
|
fieldTypeBinary: fieldType === BYTES || fieldType === BYTE_BUFFER,
|
|
249
249
|
fieldTypeTimed: fieldType === ZONED_DATE_TIME || fieldType === INSTANT,
|
|
250
|
-
fieldTypeCharSequence: fieldType === STRING || fieldType === UUID,
|
|
250
|
+
fieldTypeCharSequence: fieldType === STRING || fieldType === UUID || fieldType === TEXT_BLOB,
|
|
251
251
|
fieldTypeTemporal: fieldType === ZONED_DATE_TIME || fieldType === INSTANT || fieldType === LOCAL_DATE,
|
|
252
252
|
fieldValidationRequired: validationRules.includes(REQUIRED),
|
|
253
253
|
fieldValidationMin: validationRules.includes(MIN),
|
|
@@ -263,10 +263,13 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
|
|
|
263
263
|
const config = this.jhipsterConfigWithDefaults;
|
|
264
264
|
Object.entries(generatorCommand.configs).forEach(([name, def]) => {
|
|
265
265
|
if (def.scope === 'storage') {
|
|
266
|
-
context[name] = context[name] ?? config?.[name] ?? this.config.get(name);
|
|
266
|
+
context[name] = context[name] ?? config?.[name] ?? this.config.get(name) ?? def.default;
|
|
267
|
+
}
|
|
268
|
+
if (def.scope === 'generator') {
|
|
269
|
+
context[name] = context[name] ?? this[name] ?? def.default;
|
|
267
270
|
}
|
|
268
271
|
if (def.scope === 'blueprint') {
|
|
269
|
-
context[name] = context[name] ?? this.blueprintStorage?.get(name);
|
|
272
|
+
context[name] = context[name] ?? this.blueprintStorage?.get(name) ?? def.default;
|
|
270
273
|
}
|
|
271
274
|
});
|
|
272
275
|
}
|
|
@@ -33,6 +33,8 @@ const baseChangelog = () => ({
|
|
|
33
33
|
addedRelationships: [],
|
|
34
34
|
removedRelationships: [],
|
|
35
35
|
relationshipsToRecreateForeignKeysOnly: [],
|
|
36
|
+
removedDefaultValueFields: [],
|
|
37
|
+
addedDefaultValueFields: [],
|
|
36
38
|
changelogData: {},
|
|
37
39
|
});
|
|
38
40
|
/**
|
|
@@ -127,6 +129,20 @@ export default class GeneratorBaseEntityChanges extends GeneratorBaseApplication
|
|
|
127
129
|
const relationshipsToRecreateForeignKeysOnly = addedRelationships
|
|
128
130
|
.filter(addedRelationship => removedRelationships.some(removedRelationship => relationshipNeedsForeignKeyRecreationOnly(removedRelationship, addedRelationship)))
|
|
129
131
|
.concat(removedRelationships.filter(removedRelationship => addedRelationships.some(addedRelationship => relationshipNeedsForeignKeyRecreationOnly(addedRelationship, removedRelationship))));
|
|
132
|
+
const oldFieldsWithDefaultValues = oldFields.filter(field => this.hasAnyDefaultValue(field));
|
|
133
|
+
const newFieldsWithDefaultValues = newFields.filter(field => this.hasAnyDefaultValue(field));
|
|
134
|
+
// find the old fields that have not been deleted anyway or otherwise where the default value is different on the same new field
|
|
135
|
+
const removedDefaultValueFields = oldFieldsWithDefaultValues
|
|
136
|
+
.filter(oldField => !removedFieldNames.includes(oldField.fieldName))
|
|
137
|
+
.filter(
|
|
138
|
+
// field was not removed, so check its default value
|
|
139
|
+
oldField => this.doDefaultValuesDiffer(oldField, newFields.find(newField => newField.fieldName === oldField.fieldName)));
|
|
140
|
+
// find the new fields that have not been added newly anyway or otherwise where the old field had a different default value
|
|
141
|
+
const addedDefaultValueFields = newFieldsWithDefaultValues
|
|
142
|
+
.filter(newField => !addedFieldNames.includes(newField.fieldName))
|
|
143
|
+
.filter(
|
|
144
|
+
// field was not added newly, so check its default value
|
|
145
|
+
newField => this.doDefaultValuesDiffer(oldFields.find(oldField => oldField.fieldName === newField.fieldName), newField));
|
|
130
146
|
return {
|
|
131
147
|
...baseChangelog(),
|
|
132
148
|
previousEntity: oldConfig,
|
|
@@ -139,7 +155,15 @@ export default class GeneratorBaseEntityChanges extends GeneratorBaseApplication
|
|
|
139
155
|
addedRelationships,
|
|
140
156
|
removedRelationships,
|
|
141
157
|
relationshipsToRecreateForeignKeysOnly,
|
|
158
|
+
removedDefaultValueFields,
|
|
159
|
+
addedDefaultValueFields,
|
|
142
160
|
};
|
|
143
161
|
});
|
|
144
162
|
}
|
|
163
|
+
hasAnyDefaultValue(field) {
|
|
164
|
+
return field.defaultValue !== undefined || field.defaultValueComputed;
|
|
165
|
+
}
|
|
166
|
+
doDefaultValuesDiffer(field1, field2) {
|
|
167
|
+
return field1.defaultValue !== field2.defaultValue || field1.defaultValueComputed !== field2.defaultValueComputed;
|
|
168
|
+
}
|
|
145
169
|
}
|
|
@@ -88,13 +88,17 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
|
|
|
88
88
|
}
|
|
89
89
|
get loading() {
|
|
90
90
|
return this.asLoadingTaskGroup({
|
|
91
|
-
loadApplication({ application, control }) {
|
|
91
|
+
loadApplication({ application, control, applicationDefaults }) {
|
|
92
92
|
loadAppConfig({
|
|
93
93
|
config: this.jhipsterConfigWithDefaults,
|
|
94
94
|
application,
|
|
95
95
|
useVersionPlaceholders: this.useVersionPlaceholders,
|
|
96
96
|
});
|
|
97
97
|
loadLanguagesConfig({ application, config: this.jhipsterConfigWithDefaults, control });
|
|
98
|
+
applicationDefaults({
|
|
99
|
+
backendType: this.jhipsterConfig.backendType ?? 'Java',
|
|
100
|
+
syncUserWithIdp: this.jhipsterConfig.syncUserWithIdp,
|
|
101
|
+
});
|
|
98
102
|
},
|
|
99
103
|
loadNodeDependencies({ application }) {
|
|
100
104
|
this.loadNodeDependencies(application.nodeDependencies, {
|
|
@@ -114,10 +118,47 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
|
|
|
114
118
|
prepareApplication({ application, applicationDefaults }) {
|
|
115
119
|
loadDerivedAppConfig({ application });
|
|
116
120
|
applicationDefaults({
|
|
121
|
+
__override__: false,
|
|
117
122
|
nodePackageManager: 'npm',
|
|
118
123
|
dockerServicesDir: JAVA_DOCKER_DIR,
|
|
119
124
|
// TODO drop clientPackageManager
|
|
120
125
|
clientPackageManager: ({ nodePackageManager }) => nodePackageManager,
|
|
126
|
+
hipsterName: 'Java Hipster',
|
|
127
|
+
hipsterProductName: 'JHipster',
|
|
128
|
+
hipsterHomePageProductName: 'JHipster',
|
|
129
|
+
hipsterStackOverflowProductName: 'JHipster',
|
|
130
|
+
hipsterBugTrackerProductName: 'JHipster',
|
|
131
|
+
hipsterChatProductName: 'JHipster',
|
|
132
|
+
hipsterTwitterUsername: '@jhipster',
|
|
133
|
+
hipsterDocumentationLink: 'https://www.jhipster.tech/',
|
|
134
|
+
hipsterTwitterLink: 'https://twitter.com/jhipster',
|
|
135
|
+
hipsterProjectLink: 'https://github.com/jhipster/generator-jhipster',
|
|
136
|
+
hipsterStackoverflowLink: 'https://stackoverflow.com/tags/jhipster/info',
|
|
137
|
+
hipsterBugTrackerLink: 'https://github.com/jhipster/generator-jhipster/issues?state=open',
|
|
138
|
+
hipsterChatLink: 'https://gitter.im/jhipster/generator-jhipster',
|
|
139
|
+
backendTypeSpringBoot: ({ backendType }) => backendType === 'Java',
|
|
140
|
+
backendTypeJavaAny: ({ backendTypeSpringBoot }) => backendTypeSpringBoot,
|
|
141
|
+
});
|
|
142
|
+
},
|
|
143
|
+
syncUserWithIdp({ application, applicationDefaults }) {
|
|
144
|
+
if (!application.backendTypeSpringBoot)
|
|
145
|
+
return;
|
|
146
|
+
if (application.syncUserWithIdp === undefined && application.authenticationType === 'oauth2') {
|
|
147
|
+
applicationDefaults({
|
|
148
|
+
__override__: false,
|
|
149
|
+
syncUserWithIdp: data => data.databaseType !== 'no' &&
|
|
150
|
+
(data.applicationType === 'gateway' ||
|
|
151
|
+
this.getExistingEntities().some(entity => (entity.definition.relationships ?? []).some(relationship => relationship.otherEntityName.toLowerCase() === 'user'))),
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
else if (application.syncUserWithIdp && application.authenticationType !== 'oauth2') {
|
|
155
|
+
throw new Error('syncUserWithIdp is only supported with oauth2 authenticationType');
|
|
156
|
+
}
|
|
157
|
+
},
|
|
158
|
+
userManagement({ applicationDefaults }) {
|
|
159
|
+
applicationDefaults({
|
|
160
|
+
generateBuiltInUserEntity: ({ generateUserManagement, syncUserWithIdp }) => generateUserManagement || syncUserWithIdp,
|
|
161
|
+
generateBuiltInAuthorityEntity: ({ generateBuiltInUserEntity, databaseType }) => generateBuiltInUserEntity && databaseType !== 'cassandra',
|
|
121
162
|
});
|
|
122
163
|
},
|
|
123
164
|
});
|
|
@@ -25,7 +25,7 @@ import { getPomVersionProperties } from '../maven/support/index.js';
|
|
|
25
25
|
import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.js';
|
|
26
26
|
import { getDockerfileContainers } from '../docker/utils.js';
|
|
27
27
|
import { normalizePathEnd } from '../base/support/path.js';
|
|
28
|
-
import { getFrontendAppName
|
|
28
|
+
import { getFrontendAppName } from '../base/support/index.js';
|
|
29
29
|
import { getMainClassName } from '../java/support/index.js';
|
|
30
30
|
import { loadConfig, loadDerivedConfig } from '../../lib/internal/index.js';
|
|
31
31
|
import serverCommand from '../server/command.js';
|
|
@@ -44,11 +44,9 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
|
|
|
44
44
|
}
|
|
45
45
|
get loading() {
|
|
46
46
|
return this.asLoadingTaskGroup({
|
|
47
|
-
async loadApplication({ application }) {
|
|
47
|
+
async loadApplication({ application, applicationDefaults }) {
|
|
48
48
|
loadConfig(serverCommand.configs, { config: this.jhipsterConfigWithDefaults, application });
|
|
49
49
|
loadServerConfig({ config: this.jhipsterConfigWithDefaults, application });
|
|
50
|
-
application.javaVersion = this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION;
|
|
51
|
-
application.backendType = this.jhipsterConfig.backendType ?? 'Java';
|
|
52
50
|
const pomFile = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/pom.xml'))?.toString();
|
|
53
51
|
const gradleLibsVersions = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/gradle/libs.versions.toml'))?.toString();
|
|
54
52
|
const applicationJavaDependencies = this.prepareDependencies({
|
|
@@ -60,7 +58,8 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
|
|
|
60
58
|
...dockerContainers,
|
|
61
59
|
...getDockerfileContainers(dockerfile),
|
|
62
60
|
}, 'docker');
|
|
63
|
-
|
|
61
|
+
applicationDefaults({
|
|
62
|
+
javaVersion: this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION,
|
|
64
63
|
packageInfoJavadocs: [],
|
|
65
64
|
javaProperties: {},
|
|
66
65
|
javaManagedProperties: {},
|
|
@@ -99,8 +98,6 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
|
|
|
99
98
|
application.testResourceDir = SERVER_TEST_RES_DIR;
|
|
100
99
|
application.srcMainDir = MAIN_DIR;
|
|
101
100
|
application.srcTestDir = TEST_DIR;
|
|
102
|
-
application.backendTypeSpringBoot = application.backendType === 'Java';
|
|
103
|
-
application.backendTypeJavaAny = application.backendTypeJavaAny ?? application.backendTypeSpringBoot;
|
|
104
101
|
},
|
|
105
102
|
});
|
|
106
103
|
}
|
|
@@ -19,8 +19,6 @@
|
|
|
19
19
|
/* eslint-disable consistent-return */
|
|
20
20
|
import chalk from 'chalk';
|
|
21
21
|
import BaseApplicationGenerator from '../base-application/index.js';
|
|
22
|
-
import statistics from '../statistics.js';
|
|
23
|
-
import { GENERATOR_CI_CD } from '../generator-list.js';
|
|
24
22
|
import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
|
|
25
23
|
import { createPomStorage } from '../maven/support/pom-store.js';
|
|
26
24
|
import command from './command.js';
|
|
@@ -97,9 +95,6 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
|
|
|
97
95
|
// Public API method used by the getter and also by Blueprints
|
|
98
96
|
get writing() {
|
|
99
97
|
return this.asWritingTaskGroup({
|
|
100
|
-
insight() {
|
|
101
|
-
statistics.sendSubGenEvent('generator', GENERATOR_CI_CD);
|
|
102
|
-
},
|
|
103
98
|
async writeFiles({ application }) {
|
|
104
99
|
await this.writeFiles({
|
|
105
100
|
blocks: [
|
|
@@ -21,7 +21,6 @@ import { askForClientTheme, askForClientThemeVariant } from './prompts.js';
|
|
|
21
21
|
import { writeFiles as writeCommonFiles } from './files-common.js';
|
|
22
22
|
import { addEnumerationFiles } from './entity-files.js';
|
|
23
23
|
import { LOGIN_REGEX_JS } from '../generator-constants.js';
|
|
24
|
-
import statistics from '../statistics.js';
|
|
25
24
|
import { GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js';
|
|
26
25
|
import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
|
|
27
26
|
import { createNeedleCallback } from '../base/support/index.js';
|
|
@@ -176,23 +175,6 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
|
|
|
176
175
|
get [BaseApplicationGenerator.PREPARING_EACH_ENTITY]() {
|
|
177
176
|
return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
|
|
178
177
|
}
|
|
179
|
-
get default() {
|
|
180
|
-
return this.asDefaultTaskGroup({
|
|
181
|
-
insight({ application }) {
|
|
182
|
-
statistics.sendSubGenEvent('generator', GENERATOR_CLIENT, {
|
|
183
|
-
app: {
|
|
184
|
-
clientFramework: application.clientFramework,
|
|
185
|
-
enableTranslation: application.enableTranslation,
|
|
186
|
-
nativeLanguage: application.nativeLanguage,
|
|
187
|
-
languages: application.languages,
|
|
188
|
-
},
|
|
189
|
-
});
|
|
190
|
-
},
|
|
191
|
-
});
|
|
192
|
-
}
|
|
193
|
-
get [BaseApplicationGenerator.DEFAULT]() {
|
|
194
|
-
return this.delegateTasksToBlueprint(() => this.default);
|
|
195
|
-
}
|
|
196
178
|
// Public API method used by the getter and also by Blueprints
|
|
197
179
|
get writing() {
|
|
198
180
|
return this.asWritingTaskGroup({
|
|
@@ -228,10 +210,6 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
|
|
|
228
210
|
}
|
|
229
211
|
const packageJsonStorage = this.createStorage(this.destinationPath(application.clientRootDir, 'package.json'));
|
|
230
212
|
const scriptsStorage = packageJsonStorage.createStorage('scripts');
|
|
231
|
-
const packageJsonConfigStorage = packageJsonStorage.createStorage('config').createProxy();
|
|
232
|
-
if (process.env.JHI_PROFILE) {
|
|
233
|
-
packageJsonConfigStorage.default_environment = process.env.JHI_PROFILE.includes('dev') ? 'dev' : 'prod';
|
|
234
|
-
}
|
|
235
213
|
const devDependencies = packageJsonStorage.createStorage('devDependencies');
|
|
236
214
|
devDependencies.set('wait-on', application.nodeDependencies['wait-on']);
|
|
237
215
|
devDependencies.set('concurrently', application.nodeDependencies.concurrently);
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"dayjs": "1.11.
|
|
3
|
+
"dayjs": "1.11.11"
|
|
4
4
|
},
|
|
5
5
|
"devDependencies": {
|
|
6
|
-
"@cypress/code-coverage": "3.12.
|
|
6
|
+
"@cypress/code-coverage": "3.12.37",
|
|
7
7
|
"babel-loader": "9.1.3",
|
|
8
8
|
"babel-plugin-istanbul": "6.1.1",
|
|
9
|
-
"cypress": "13.
|
|
9
|
+
"cypress": "13.8.1",
|
|
10
10
|
"cypress-audit": "1.1.0",
|
|
11
|
-
"eslint-plugin-cypress": "
|
|
12
|
-
"lighthouse": "
|
|
11
|
+
"eslint-plugin-cypress": "3.0.2",
|
|
12
|
+
"lighthouse": "12.0.0",
|
|
13
13
|
"nyc": "15.1.0",
|
|
14
|
-
"swagger-ui-dist": "5.
|
|
14
|
+
"swagger-ui-dist": "5.17.2"
|
|
15
15
|
}
|
|
16
16
|
}
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
|
|
90
90
|
<h3>If you want to chat with contributors and other users</h3>
|
|
91
91
|
<p>
|
|
92
|
-
Join our chat room on <a href="
|
|
92
|
+
Join our chat room on <a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer">Gitter.im</a>. Please note that this is a public chat room, and that we expect you to respect other people and write in a correct English language!
|
|
93
93
|
</p>
|
|
94
94
|
<!-- end of troubleshooting content -->
|
|
95
95
|
</div>
|
|
@@ -12,6 +12,19 @@ const command = {
|
|
|
12
12
|
scope: 'storage',
|
|
13
13
|
},
|
|
14
14
|
},
|
|
15
|
+
configs: {
|
|
16
|
+
defaultEnvironment: {
|
|
17
|
+
description: 'Default environment for the application',
|
|
18
|
+
cli: {
|
|
19
|
+
type: String,
|
|
20
|
+
hide: true,
|
|
21
|
+
env: 'JHI_PROFILE',
|
|
22
|
+
},
|
|
23
|
+
choices: ['prod', 'dev'],
|
|
24
|
+
default: 'prod',
|
|
25
|
+
scope: 'storage',
|
|
26
|
+
},
|
|
27
|
+
},
|
|
15
28
|
import: [GENERATOR_BOOTSTRAP_APPLICATION_BASE],
|
|
16
29
|
};
|
|
17
30
|
export default command;
|