generator-jhipster 7.3.0 → 7.5.0

package/generators/common/index.js

@@ -25,8 +25,6 @@ const prettierConfigFiles = require('./files').prettierConfigFiles;
 const constants = require('../generator-constants');
 const packageJson = require('../../package.json');
 
-let useBlueprints;
-
 module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -37,8 +35,12 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
 
     this.loadStoredAppOptions();
     this.loadRuntimeOptions();
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('common');
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints('common');
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -64,7 +66,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -88,7 +90,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -122,7 +124,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -137,7 +139,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -149,7 +151,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -173,7 +175,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -195,7 +197,7 @@ module.exports = class JHipsterCommonGenerator extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 };

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

@@ -9,7 +9,7 @@ useTabs: false
 arrowParens: avoid
 
 # jsx and tsx rules:
-jsxBracketSameLine: false
+bracketSameLine: false
 <%_ if (!skipServer) { _%>
 
 # java rules:

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

@@ -46,6 +46,25 @@ This is a "<%= applicationType %>" application intended to be part of a microser
 This application is configured for Service Discovery and Configuration with <% if (serviceDiscoveryEureka) { %>the JHipster-Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %>. On launch, it will refuse to start if it is not able to connect to <% if (serviceDiscoveryEureka) { %>the JHipster-Registry at [http://localhost:8761](http://localhost:8761)<% } %><% if (serviceDiscoveryConsul) { %>Consul at [http://localhost:8500](http://localhost:8500)<% } %>.<% if (serviceDiscoveryEureka) { %> For more information, read our documentation on [Service Discovery and Configuration with the JHipster-Registry][].<% } %><% if (serviceDiscoveryConsul) { %> For more information, read our documentation on [Service Discovery and Configuration with Consul][].<% } %>
 <%_ } _%>
 
+## Project Structure
+
+Node is required for generation and recommended for development. `package.json` is always generated for a better development experience with prettier, commit hooks, scripts and so on.
+
+In the project root, JHipster generates configuration files for tools like git, prettier, eslint, husk, and others that are well known and you can find references in the web.
+
+<%_ if (configOptions.backendName === 'Java') { %>
+`/src/*` structure follows default <%= configOptions.backendName %> structure.
+
+<%_ } _%>
+- `.yo-rc.json` - Yeoman configuration file
+JHipster configuration is stored in this file at `generator-jhipster` key. You may find `generator-jhipster-*` for specific blueprints configuration.
+- `.yo-resolve` (optional) - Yeoman conflict resolver
+Allows to use a specific action when conflicts are found skipping prompts for files that matches a pattern. Each line should match `[pattern] [action]` with pattern been a [Minimatch](https://github.com/isaacs/minimatch#minimatch) pattern and action been one of skip (default if ommited) or force. Lines starting with `#` are considered comments and are ignored.
+- `.jhipster/*.json` - JHipster entity configuration files
+- `npmw` - wrapper to use locally installed npm.
+JHipster installs Node and npm locally using the build tool by default. This wrapper makes sure npm is installed locally and uses it avoiding some differences different versions can cause. By using `./npmw` instead of the traditional `npm` you can configure a Node-less environment to develop or test your application.
+- `/src/main/docker` - Docker configurations for the application and services that the application depends on
+
 ## Development
 
 <%_ if (skipClient) { _%>

package/generators/common/templates/package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "6.3.0",
-    "husky": "7.0.2",
-    "lint-staged": "11.2.0",
-    "npm": "7.24.2",
+    "concurrently": "6.5.1",
+    "husky": "7.0.4",
+    "lint-staged": "12.1.4",
+    "npm": "8.3.0",
     "wait-on": "6.0.0"
   }
 }

package/generators/cypress/index.js

@@ -23,7 +23,6 @@ const constants = require('../generator-constants');
 const { GENERATOR_CYPRESS } = require('../generator-list');
 const { CYPRESS } = require('../../jdl/jhipster/test-framework-types');
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -34,8 +33,12 @@ module.exports = class extends BaseBlueprintGenerator {
     }
 
     this.loadRuntimeOptions();
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CYPRESS);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_CYPRESS);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -48,7 +51,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -75,7 +78,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -95,7 +98,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -110,7 +113,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -120,7 +123,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -139,7 +142,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -227,7 +230,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 };

package/generators/cypress/templates/cypress.json.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 {
-  "baseUrl": "http://localhost:<%= serverPort %>/",
+  "baseUrl": "http://localhost:<%= gatewayServerPort || serverPort %>/",
   "testFiles": "**/*.spec.ts",
   "supportFile": "<%= CLIENT_TEST_SRC_DIR %>cypress/support/index.ts",
   "video": false,
@@ -26,7 +26,21 @@
   "pluginsFile": "<%= CLIENT_TEST_SRC_DIR %>cypress/plugins/index.ts",
   "screenshotsFolder": "<%= BUILD_DIR %>cypress/screenshots",
   "chromeWebSecurity": <% if(authenticationTypeOauth2) { %>false<% } else { %>true<% } %>,
+<%_ if (clientFrameworkReact) { _%>
+  "scrollBehavior": "center",
+<%_ } _%>
   "viewportWidth": 1200,
   "viewportHeight": 720,
-  "retries": 2
+  "retries": 2,
+<%_ if (authenticationTypeJwt) { _%>
+  "env": {
+    "authenticationUrl": "/api/authenticate",
+    "jwtStorageName": "<%= jhiPrefixDashed %>-authenticationToken"
+  },
+<%_ } else if (authenticationTypeSession) { _%>
+  "env": {
+    "authenticationUrl": "/api/authentication"
+  },
+<%_ } _%>
+  "experimentalSessionSupport": true,
 }

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/login-page.spec.ts.ejs

@@ -25,17 +25,10 @@ import {
 } from '../../support/commands';
 
 describe('login modal', () => {
-  const username = Cypress.env('E2E_USERNAME') ?? 'admin';
-  const password = Cypress.env('E2E_PASSWORD') ?? 'admin';
+  const username = Cypress.env('E2E_USERNAME') ?? 'user';
+  const password = Cypress.env('E2E_PASSWORD') ?? 'user';
 
-  before(() => {
-    cy.window().then(win => {
-      win.sessionStorage.clear();
-    });
-<%_ if (authenticationTypeSession) { _%>
-    cy.clearCookie('SESSION');
-<%_ } _%>
-    cy.clearCookies();
+  beforeEach(() => {
     cy.visit('');
     cy.clickOnLoginItem();
   });
@@ -56,7 +49,6 @@ describe('login modal', () => {
     <%_ } _%>
     // login page should stay open when login fails
     cy.get(titleLoginSelector).should('be.visible');
-    cy.get(passwordLoginSelector).clear();
   });
 
   it('requires password', () => {
@@ -69,7 +61,6 @@ describe('login modal', () => {
     // login page should stay open when login fails
     cy.get(titleLoginSelector).should('be.visible');
     <%_ } _%>
-    cy.get(usernameLoginSelector).clear();
   });
 
   it('errors when password is incorrect', () => {
@@ -78,8 +69,6 @@ describe('login modal', () => {
     cy.get(submitLoginSelector).click();
     cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(401));
     cy.get(errorLoginSelector).should('be.visible');
-    cy.get(usernameLoginSelector).clear();
-    cy.get(passwordLoginSelector).clear();
   });
 
   it('go to login page when successfully logs in', () => {

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/password-page.spec.ts.ejs

@@ -26,77 +26,71 @@ import {
 } from '../../support/commands';
 
 describe('/account/password', () => {
-  before(() => {
-    cy.window().then((win) => {
-      win.sessionStorage.clear()
-    });
-<%_ if (authenticationTypeSession) { _%>
-    cy.clearCookie('SESSION');
-<%_ } _%>
-    cy.clearCookies();
-    cy.visit('');
-    cy.login('user', 'user');
-    cy.clickOnPasswordItem();
+  const username = Cypress.env('E2E_USERNAME') ?? 'user';
+  const password = Cypress.env('E2E_PASSWORD') ?? 'user';
+
+  beforeEach(() => {
+    cy.login(username, password);
+    cy.visit('/account/password');
   });
 
   beforeEach(() => {
     cy.intercept('POST', '/api/account/change-password').as('passwordSave');
   });
 
+  it('should be accessible through menu', () => {
+    cy.visit('');
+    cy.clickOnPasswordItem();
+    cy.url().should('match', /\/account\/password$/);
+  });
+
   it("requires current password", () => {
     <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitPasswordSelector).click({ force: true });
+    cy.get(submitPasswordSelector).click();
     <%_ } _%>
     cy.get(currentPasswordSelector)
       .should('have.class', classInvalid)
-      .type('wrong-current-password');
-    <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitPasswordSelector).click({ force: true });
-    <%_ } _%>
-    cy.get(currentPasswordSelector).should('have.class', classValid);
-    cy.get(currentPasswordSelector).clear();
+      .type('wrong-current-password')
+      .blur()
+      .should('have.class', classValid);
   });
 
   it("requires new password", () => {
-    cy.get(newPasswordSelector)
-      .should('have.class', classInvalid)
-      .type('jhipster');
     <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitPasswordSelector).click({ force: true });
+    cy.get(submitPasswordSelector).click();
     <%_ } _%>
-    cy.get(newPasswordSelector).should('have.class', classValid);
-    cy.get(newPasswordSelector).clear();
+    cy.get(newPasswordSelector)
+      .should('have.class', classInvalid)
+      .type('jhipster')
+      .blur()
+      .should('have.class', classValid);
   });
 
   it("requires confirm new password", () => {
+    <%_ if (clientFrameworkReact) { _%>
+    cy.get(submitPasswordSelector).click();
+    <%_ } _%>
     cy.get(newPasswordSelector).type('jhipster');
     cy.get(confirmPasswordSelector)
       .should('have.class', classInvalid)
-      .type('jhipster');
-    <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitPasswordSelector).click({ force: true });
-    <%_ } _%>
-    cy.get(confirmPasswordSelector).should('have.class', classValid);
-    cy.get(newPasswordSelector).clear();
-    cy.get(confirmPasswordSelector).clear();
+      .type('jhipster')
+      .blur()
+      .should('have.class', classValid);
   });
 
   it("should fail to update password when using incorrect current password", () => {
     cy.get(currentPasswordSelector).type('wrong-current-password');
     cy.get(newPasswordSelector).type('jhipster');
     cy.get(confirmPasswordSelector).type('jhipster');
-    cy.get(submitPasswordSelector).click({force: true});
+    cy.get(submitPasswordSelector).click();
     cy.wait('@passwordSave').then(({ response }) => expect(response.statusCode).to.equal(400));
-    cy.get(currentPasswordSelector).clear();
-    cy.get(newPasswordSelector).clear();
-    cy.get(confirmPasswordSelector).clear();
   });
 
   it("should be able to update password", () => {
-    cy.get(currentPasswordSelector).type('user');
-    cy.get(newPasswordSelector).type('user');
-    cy.get(confirmPasswordSelector).type('user');
-    cy.get(submitPasswordSelector).click({force: true});
+    cy.get(currentPasswordSelector).type(password);
+    cy.get(newPasswordSelector).type(password);
+    cy.get(confirmPasswordSelector).type(password);
+    cy.get(submitPasswordSelector).click();
     cy.wait('@passwordSave').then(({ response }) => expect(response.statusCode).to.equal(200));
   });
 });

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/register-page.spec.ts.ejs

@@ -26,101 +26,95 @@ import {
   classValid,
 } from '../../support/commands';
 
-describe('/account/register', () => {
-  before(() => {
-    cy.window().then((win) => {
-      win.sessionStorage.clear()
-    });
-<%_ if (authenticationTypeSession) { _%>
-    cy.clearCookie('SESSION');
-<%_ } _%>
-    cy.clearCookies();
-    cy.visit('');
-    cy.clickOnRegisterItem();
+<% const registerPage = clientFrameworkVue ? '/register' : '/account/register'; _%>
+describe('<%= registerPage %>', () => {
+  beforeEach(() => {
+    cy.visit('<%= registerPage %>');
   });
 
   beforeEach(() => {
     cy.intercept('POST', '/api/register').as('registerSave');
   });
 
+  it('should be accessible through menu', () => {
+    cy.visit('');
+    cy.clickOnRegisterItem();
+    cy.url().should('match', /<%= registerPage.replaceAll('/', '\\/') %>$/);
+  });
+
   it('should load the register page', () => {
     cy.get(submitRegisterSelector).should('be.visible');
   });
 
   it('requires username', () => {
     <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
+    cy.get(submitRegisterSelector).click();
     <%_ } _%>
     cy.get(usernameRegisterSelector)
       .should('have.class', classInvalid)
-      .type('test');
-    <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
-    <%_ } _%>
-    cy.get(usernameRegisterSelector).should('have.class', classValid)
-      .clear();
+      .type('test')
+      .blur()
+      .should('have.class', classValid);
   });
 
-  it('requires email', () => {
-    cy.get(emailRegisterSelector)
-      .should('have.class', classInvalid)
-      .type('testtest.fr');
+  it('should not accept invalid email', () => {
     <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
+    cy.get(submitRegisterSelector).click();
     <%_ } _%>
-    cy.get(emailRegisterSelector).should('have.class', classInvalid)
-      .clear();
+    cy.get(emailRegisterSelector)
+      .should('have.class', classInvalid)
+      .type('testtest.fr')
+      .blur()
+      .should('have.class', classInvalid);
   });
 
   it('requires email in correct format', () => {
-    cy.get(emailRegisterSelector)
-      .should('have.class', classInvalid)
-      .type('test@test.fr');
     <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
+    cy.get(submitRegisterSelector).click();
     <%_ } _%>
-    cy.get(emailRegisterSelector).should('have.class', classValid)
-      .clear();
+    cy.get(emailRegisterSelector)
+      .should('have.class', classInvalid)
+      .type('test@test.fr')
+      .blur()
+      .should('have.class', classValid);
   });
 
   it('requires first password', () => {
-    cy.get(firstPasswordRegisterSelector)
-      .should('have.class', classInvalid)
-      .type('test@test.fr');
     <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
+    cy.get(submitRegisterSelector).click();
     <%_ } _%>
-    cy.get(firstPasswordRegisterSelector).should('have.class', classValid)
-      .clear();
+    cy.get(firstPasswordRegisterSelector)
+      .should('have.class', classInvalid)
+      .type('test@test.fr')
+      .blur()
+      .should('have.class', classValid);
   });
 
   it('requires password and confirm password to be same', () => {
-    cy.get(firstPasswordRegisterSelector)
-      .should('have.class', classInvalid)
-      .type('test');
     <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
+    cy.get(submitRegisterSelector).click();
     <%_ } _%>
-    cy.get(firstPasswordRegisterSelector).should('have.class', classValid);
+    cy.get(firstPasswordRegisterSelector)
+      .should('have.class', classInvalid)
+      .type('test')
+      .blur()
+      .should('have.class', classValid);
     cy.get(secondPasswordRegisterSelector)
       .should('have.class', classInvalid)
-      .type('test');
-    <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
-    <%_ } _%>
-    cy.get(secondPasswordRegisterSelector).should('have.class', classValid);
-    cy.get(firstPasswordRegisterSelector).clear();
-    cy.get(secondPasswordRegisterSelector).clear();
+      .type('test')
+      .blur()
+      .should('have.class', classValid);
   });
 
   it('requires password and confirm password have not the same value', () => {
-    cy.get(firstPasswordRegisterSelector)
-      .should('have.class', classInvalid)
-      .type('test');
     <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
+    cy.get(submitRegisterSelector).click();
     <%_ } _%>
-    cy.get(firstPasswordRegisterSelector).should('have.class', classValid);
+    cy.get(firstPasswordRegisterSelector)
+      .should('have.class', classInvalid)
+      .type('test')
+      .blur()
+      .should('have.class', classValid);
 <%_ if (clientFrameworkAngular) { _%>
     cy.get(secondPasswordRegisterSelector)
       .should('have.class', classInvalid)
@@ -129,14 +123,10 @@ describe('/account/register', () => {
 <%_ } else { _%>
     cy.get(secondPasswordRegisterSelector)
       .should('have.class', classInvalid)
-      .type('otherPassword');
-    <%_ if (clientFrameworkReact) { _%>
-    cy.get(submitRegisterSelector).click({ force: true });
-    <%_ } _%>
-    cy.get(secondPasswordRegisterSelector).should('have.class', classInvalid);
+      .type('otherPassword')
+      .blur()
+      .should('have.class', classInvalid);
 <%_ } _%>
-    cy.get(firstPasswordRegisterSelector).clear();
-    cy.get(secondPasswordRegisterSelector).clear();
   });
 
   it('register a valid user', () => {
@@ -146,7 +136,7 @@ describe('/account/register', () => {
     cy.get(emailRegisterSelector).type(randomEmail);
     cy.get(firstPasswordRegisterSelector).type('jondoe');
     cy.get(secondPasswordRegisterSelector).type('jondoe');
-    cy.get(submitRegisterSelector).click({force: true});
+    cy.get(submitRegisterSelector).click();
     cy.wait('@registerSave').then(({ response }) => expect(response.statusCode).to.equal(201));
   });
 });

package/generators/cypress/templates/src/test/javascript/cypress/integration/account/reset-password-page.spec.ts.ejs

@@ -26,16 +26,9 @@ import {
 } from '../../support/commands';
 
 describe('forgot your password', () => {
-  const username = Cypress.env('E2E_USERNAME') ?? 'admin';
+  const username = Cypress.env('E2E_USERNAME') ?? 'user';
 
-  before(() => {
-    cy.window().then((win) => {
-      win.sessionStorage.clear()
-    });
-<%_ if (authenticationTypeSession) { _%>
-    cy.clearCookie('SESSION');
-<%_ } _%>
-    cy.clearCookies();
+  beforeEach(() => {
     cy.visit('');
     cy.clickOnLoginItem();
     cy.get(usernameLoginSelector).type(username);
@@ -57,7 +50,6 @@ describe('forgot your password', () => {
     cy.get(submitInitResetPasswordSelector).click({ force: true });
     <%_ } _%>
     cy.get(emailResetPasswordSelector).should('have.class', classValid);
-    cy.get(emailResetPasswordSelector).clear();
   });
 
   it('should be able to init reset password', () => {