generator-jhipster 8.0.0-rc.1 → 8.1.0

package/dist/generators/common/generator.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 /* eslint-disable consistent-return */
-import { isFilePending } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { writeFiles, prettierConfigFiles } from './files.mjs';
 import { MAIN_DIR, TEST_DIR, SERVER_MAIN_RES_DIR, JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, } from '../generator-constants.mjs';
@@ -149,6 +149,20 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING]() {
         return this.delegateTasksToBlueprint(() => this.preparing);
     }
+    get default() {
+        return this.asDefaultTaskGroup({
+            async formatSonarProperties() {
+                this.queueTransformStream({
+                    name: 'prettifying sonar-project.properties',
+                    filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && file.path.endsWith('sonar-project.properties'),
+                    refresh: false,
+                }, await createPrettierTransform.call(this, { extensions: 'properties', prettierProperties: true }));
+            },
+        });
+    }
+    get [BaseApplicationGenerator.DEFAULT]() {
+        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
+    }
     // Public API method used by the getter and also by Blueprints
     get writing() {
         return {
@@ -164,6 +178,11 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                         this.removeFile('npmw.cmd');
                     }
                 }
+                if (this.isJhipsterVersionLessThan('8.0.0-rc.2')) {
+                    if (!application.skipCommitHook) {
+                        this.removeFile('.lintstagedrc.js');
+                    }
+                }
             },
             writePrettierConfig({ application }) {
                 return this.writeFiles({
@@ -189,12 +208,6 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                     },
                 });
             },
-            async formatSonarProperties() {
-                this.queueTransformStream(await createPrettierTransform.call(this, { extensions: 'properties', prettierProperties: true }), {
-                    name: 'prettifying sonar-project.properties',
-                    streamOptions: { filter: file => isFilePending(file) && file.path.endsWith('sonar-project.properties') },
-                });
-            },
             addCommitHookDependencies({ application }) {
                 if (application.skipCommitHook)
                     return;
@@ -205,8 +218,17 @@ export default class CommonGenerator extends BaseApplicationGenerator {
                     devDependencies: {
                         husky: application.nodeDependencies.husky,
                         'lint-staged': application.nodeDependencies['lint-staged'],
+                        prettier: application.nodeDependencies.prettier,
+                        'prettier-plugin-packagejson': application.nodeDependencies['prettier-plugin-packagejson'],
                     },
                 });
+                if (application.backendTypeJavaAny) {
+                    this.packageJson.merge({
+                        devDependencies: {
+                            'prettier-plugin-java': application.nodeDependencies['prettier-plugin-java'],
+                        },
+                    });
+                }
             },
         });
     }

package/dist/generators/common/resources/package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "8.2.1",
+    "concurrently": "8.2.2",
     "husky": "8.0.3",
-    "lint-staged": "14.0.1",
-    "npm": "10.2.0",
-    "wait-on": "7.0.1"
+    "lint-staged": "15.2.0",
+    "npm": "10.2.4",
+    "wait-on": "7.2.0"
   }
 }

package/dist/generators/common/templates/.lintstagedrc.cjs.ejs

@@ -0,0 +1,21 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+module.exports = {
+  '{,**/}*.{<%= prettierExtensions %>}': ['prettier --write'],
+};

package/dist/generators/common/templates/.prettierrc.ejs

@@ -13,7 +13,7 @@ bracketSameLine: false
 
 plugins:
   - prettier-plugin-packagejson
-<%_ if (!skipServer) { _%>
+<%_ if (backendTypeJavaAny) { _%>
   - prettier-plugin-java
   
 # java rules:

package/dist/generators/common/templates/README.md.jhi.ejs

@@ -34,6 +34,8 @@
 _&>
 # <%= baseName %>
 
+This application was generated using JHipster <%= jhipsterVersion %>, you can find documentation and help at [<%= documentationArchiveUrl %>](<%= documentationArchiveUrl %>).
+
 <&- fragments.introSection() &>
 ## Project Structure
 

package/dist/generators/common/templates/sonar-project.properties.ejs

@@ -1,7 +1,7 @@
 sonar.projectKey=<%= baseName %>
 sonar.projectName=<%= baseName %> generated by jhipster
 
-# Typescript tests files must be inside sources and tests, othewise `INFO: Test execution data ignored for 80 unknown files, including:` is shown.
+# Typescript tests files must be inside sources and tests, otherwise `INFO: Test execution data ignored for 80 unknown files, including:` is shown.
 sonar.sources=src
 sonar.tests=src
 sonar.host.url=http://localhost:9001

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/settings-page.cy.ts.ejs

@@ -79,6 +79,7 @@ describe('/account/settings', () => {
 
   it("should be able to change 'user' lastname settings", () => {
     cy.get(lastNameSettingsSelector).clear();
+    cy.get(firstNameSettingsSelector).type('jhipster');
     cy.get(lastNameSettingsSelector).type('retspihj');
     cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(200));
@@ -86,6 +87,7 @@ describe('/account/settings', () => {
 
   it("should be able to change 'user' email settings", () => {
     cy.get(emailSettingsSelector).clear();
+    cy.get(firstNameSettingsSelector).type('jhipster');
     cy.get(emailSettingsSelector).type('user@localhost.fr');
     cy.get(submitSettingsSelector).click();
     cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(200));
@@ -114,6 +116,7 @@ describe('/account/settings', () => {
 
     it("should not be able to change 'user' email to same value", () => {
       cy.get(emailSettingsSelector).clear();
+      cy.get(firstNameSettingsSelector).type('jhipster');
       cy.get(emailSettingsSelector).type(testAdminEmail);
       cy.get(submitSettingsSelector).click();
       cy.wait('@settingsSave').then(({ response }) => expect(response?.statusCode).to.equal(400));

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs

@@ -335,7 +335,6 @@ describe('<%= entityClass %> e2e test', () => {
     <%_ } _%>
   <%_ }); _%>
   <%_ for (relationship of requiredRelationships) {
-    const ownerSide = relationship.ownerSide;
     const relationshipName = relationship.relationshipName;
   _%>
        cy.get(`[data-cy="<%= relationship.relationshipFieldName %>"]`).select(<%= relationship.collection ? '[0]' : '1' %>);

package/dist/generators/docker/generator.mjs

@@ -209,7 +209,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
                         });
                         if (application.databaseTypeCassandra) {
                             // Wait for migration
-                            postServicesSleep = 5;
+                            postServicesSleep = 10;
                         }
                     }
                     else {

package/dist/generators/docker/templates/docker/cassandra.yml.ejs

@@ -33,10 +33,10 @@ services:
       - 127.0.0.1:9042:9042
       - 127.0.0.1:9160:9160
     healthcheck:
-      test: ['CMD-SHELL', '[ $$(nodetool statusgossip) = running ]']
+      test: ['CMD', 'cqlsh', '-e', 'describe keyspaces']
       interval: 5s
       timeout: 25s
-      retries: 10
+      retries: 20
   cassandra-migration:
     environment:
       - CASSANDRA_CONTACT_POINT=<%= baseName.toLowerCase() %>-cassandra

package/dist/generators/docker/templates/docker/keycloak.yml.ejs

@@ -21,7 +21,7 @@ name: <%= baseName.toLowerCase() %>
 services:
   keycloak:
     image: <%- dockerContainers.keycloak %>
-    command: ['start-dev --import-realm']
+    command: 'start-dev --import-realm'
     volumes:
       - ./realm-config:/opt/keycloak/data/import
       - ./realm-config/keycloak-health-check.sh:/opt/keycloak/health-check.sh

package/dist/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs

@@ -475,6 +475,7 @@
     "totpAppFreeOTPName",
     "totpAppMicrosoftAuthenticatorName"
   ],
+  "localizationTexts": {},
   "webAuthnPolicyRpEntityName": "keycloak",
   "webAuthnPolicySignatureAlgorithms": [
     "ES256"
@@ -487,6 +488,7 @@
   "webAuthnPolicyCreateTimeout": 0,
   "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyExtraOrigins": [],
   "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
   "webAuthnPolicyPasswordlessSignatureAlgorithms": [
     "ES256"
@@ -499,6 +501,7 @@
   "webAuthnPolicyPasswordlessCreateTimeout": 0,
   "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessExtraOrigins": [],
   "users": [
     {
       "id": "f742ba6f-1d8a-4dec-bf15-e02dab508283",
@@ -2576,7 +2579,7 @@
     "frontendUrl": "",
     "acr.loa.map": "[]"
   },
-  "keycloakVersion": "22.0.1",
+  "keycloakVersion": "23.0.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

package/dist/generators/docker-compose/generator.mjs

@@ -66,18 +66,11 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
             async checkDockerCompose() {
                 if (this.skipChecks)
                     return;
-                const { stdout, exitCode } = await this.spawnCommand('docker compose version', { reject: false, stdio: 'pipe' });
+                const { exitCode } = await this.spawnCommand('docker compose version', { reject: false, stdio: 'pipe' });
                 if (exitCode !== 0) {
-                    this.log.error(chalk.red('Docker Compose 1.6.0 or later is not installed on your computer.\n' +
-                        '         Read https://docs.docker.com/compose/install/\n'));
-                }
-                const composeVersion = stdout.split(' ')[2].replace(/,/g, '');
-                const composeVersionMajor = composeVersion.split('.')[0];
-                const composeVersionMinor = composeVersion.split('.')[1];
-                if (composeVersionMajor < 1 || (composeVersionMajor === 1 && composeVersionMinor < 6)) {
-                    this.log.error(chalk.red(`$Docker Compose version 1.6.0 or later is not installed on your computer.
-                                             Docker Compose version found: ${composeVersion}
-                                             Read https://docs.docker.com/compose/install`));
+                    throw new Error(`Docker Compose V2 is not installed on your computer.
+         Read https://docs.docker.com/compose/install/
+`);
                 }
             },
         };

package/dist/generators/docker-compose/templates/docker-compose.yml.ejs

@@ -110,7 +110,7 @@ services:
 <%_ if (usesOauth2) { _%>
   keycloak:
     image: <%- dockerContainers.keycloak %>
-    command: ['start-dev --import-realm']
+    command: 'start-dev --import-realm'
     volumes:
       - ./realm-config:/opt/keycloak/data/import
       - ./realm-config/keycloak-health-check.sh:/opt/keycloak/health-check.sh

package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs

@@ -475,6 +475,7 @@
     "totpAppFreeOTPName",
     "totpAppMicrosoftAuthenticatorName"
   ],
+  "localizationTexts": {},
   "webAuthnPolicyRpEntityName": "keycloak",
   "webAuthnPolicySignatureAlgorithms": [
     "ES256"
@@ -487,6 +488,7 @@
   "webAuthnPolicyCreateTimeout": 0,
   "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyExtraOrigins": [],
   "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
   "webAuthnPolicyPasswordlessSignatureAlgorithms": [
     "ES256"
@@ -499,6 +501,7 @@
   "webAuthnPolicyPasswordlessCreateTimeout": 0,
   "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessExtraOrigins": [],
   "users": [
     {
       "id": "f742ba6f-1d8a-4dec-bf15-e02dab508283",
@@ -2578,7 +2581,7 @@
     "frontendUrl": "",
     "acr.loa.map": "[]"
   },
-  "keycloakVersion": "22.0.1",
+  "keycloakVersion": "23.0.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []