generator-jhipster 7.3.1 → 7.4.0

package/generators/common/templates/package.json

@@ -1,9 +1,9 @@
 {
   "devDependencies": {
-    "concurrently": "6.3.0",
-    "husky": "7.0.2",
-    "lint-staged": "11.2.3",
-    "npm": "8.1.0",
+    "concurrently": "6.4.0",
+    "husky": "7.0.4",
+    "lint-staged": "12.0.2",
+    "npm": "8.1.4",
     "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

@@ -26,6 +26,9 @@
   "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<%_ if (authenticationTypeJwt) { _%>,

package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs

@@ -28,15 +28,15 @@
 
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
-import fs = require('fs');;
+import fs = require('fs');
 import { lighthouse, pa11y, prepareAudit } from 'cypress-audit';
 import ReportGenerator = require('lighthouse/report/generator/report-generator');
 /**
  * @type {Cypress.PluginConfig}
  */
-module.exports = (on, config) => {
+module.exports = (on<%_ if (cypressCoverage) { _%>, config<%_ } _%>) => {
   // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
+  <%_ if (cypressCoverage) { _%>// `config` is the resolved Cypress config<%_ } _%>
   on('before:browser:launch', (browser, launchOptions) => {
     prepareAudit(launchOptions);
     if (browser.name === 'chrome' && browser.isHeadless) {

package/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs

@@ -75,8 +75,8 @@ Cypress.Commands.add('setFieldSelectToLastOfEntity', (fieldName: string) => {
   return cy.get(`[data-cy="${fieldName}"]`).then(select => {
     const selectSize = (select[0] as HTMLSelectElement)?.options?.length || Number(select.attr('size')) || 0;
     if (selectSize > 0) {
-      return cy.get(`[data-cy="${fieldName}"] option`).then((options: any) => {
-        const elements = [...options].map(o => o.label);
+      return cy.get(`[data-cy="${fieldName}"] option`).then((options: JQuery<HTMLElement>) => {
+        const elements = [...options].map((o: HTMLElement) => (o as HTMLOptionElement).label);
         const lastElement = elements.length - 1;
         cy.get(`[data-cy="${fieldName}"]`).select(lastElement).type('{downarrow}');
       });

package/generators/database-changelog/index.js

@@ -28,7 +28,6 @@ const BASE_CHANGELOG = {
   removedRelationships: [],
 };
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -45,37 +44,49 @@ module.exports = class extends BaseBlueprintGenerator {
     }
     this.info(`Creating changelog for entities ${this.options.entities}`);
     this.configOptions.oldSharedEntities = this.configOptions.oldSharedEntities || [];
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_DATABASE_CHANGELOG);
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_DATABASE_CHANGELOG);
+    }
   }
 
   _default() {
     return {
-      calculateChangelogs() {
+      async calculateChangelogs() {
         const diff = this._generateChangelogFromFiles();
 
-        diff.forEach(([fieldChanges, _relationshipChanges]) => {
-          if (fieldChanges.type === 'entity-new') {
-            this._composeWithIncrementalChangelogProvider(fieldChanges);
-          } else if (fieldChanges.addedFields.length > 0 || fieldChanges.removedFields.length > 0) {
-            this._composeWithIncrementalChangelogProvider(fieldChanges);
-          }
-        });
-
-        diff.forEach(([_fieldChanges, relationshipChanges]) => {
-          if (
-            relationshipChanges &&
-            relationshipChanges.incremental &&
-            (relationshipChanges.addedRelationships.length > 0 || relationshipChanges.removedRelationships.length > 0)
-          ) {
-            this._composeWithIncrementalChangelogProvider(relationshipChanges);
-          }
-        });
+        await Promise.all(
+          diff.map(([fieldChanges, _relationshipChanges]) => {
+            if (fieldChanges.type === 'entity-new') {
+              return this._composeWithIncrementalChangelogProvider(fieldChanges);
+            }
+            if (fieldChanges.addedFields.length > 0 || fieldChanges.removedFields.length > 0) {
+              return this._composeWithIncrementalChangelogProvider(fieldChanges);
+            }
+            return undefined;
+          })
+        );
+
+        await Promise.all(
+          diff.map(([_fieldChanges, relationshipChanges]) => {
+            if (
+              relationshipChanges &&
+              relationshipChanges.incremental &&
+              (relationshipChanges.addedRelationships.length > 0 || relationshipChanges.removedRelationships.length > 0)
+            ) {
+              return this._composeWithIncrementalChangelogProvider(relationshipChanges);
+            }
+            return undefined;
+          })
+        );
       },
     };
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -85,7 +96,7 @@ module.exports = class extends BaseBlueprintGenerator {
 
   _composeWithIncrementalChangelogProvider(databaseChangelog) {
     const skipWriting = !this.options.entities.includes(databaseChangelog.entityName);
-    this.composeWithJHipster(GENERATOR_DATABASE_CHANGELOG_LIQUIBASE, {
+    return this.composeWithJHipster(GENERATOR_DATABASE_CHANGELOG_LIQUIBASE, {
       databaseChangelog,
       skipWriting,
       configOptions: this.configOptions,

package/generators/database-changelog-liquibase/index.js

@@ -35,7 +35,6 @@ const { prepareFieldForTemplates } = require('../../utils/field');
 const { prepareRelationshipForTemplates } = require('../../utils/relationship');
 const { prepareFieldForLiquibaseTemplates } = require('../../utils/liquibase');
 
-let useBlueprints;
 /* eslint-disable consistent-return */
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -51,7 +50,12 @@ module.exports = class extends BaseBlueprintGenerator {
 
     // Set number of rows to be generated
     this.numberOfRows = 10;
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_DATABASE_CHANGELOG_LIQUIBASE);
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_DATABASE_CHANGELOG_LIQUIBASE);
+    }
   }
 
   _loading() {
@@ -69,7 +73,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -149,7 +153,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -194,7 +198,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparingRelationships() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparingRelationships();
   }
 
@@ -209,7 +213,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -253,7 +257,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     if (this.options.skipWriting) {
       return {};
     }
@@ -286,7 +290,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     if (this.options.skipWriting) {
       return {};
     }

package/generators/docker-compose/index.js

@@ -34,13 +34,12 @@ const { GENERATOR_DOCKER_COMPOSE } = require('../generator-list');
 
 const NO_DATABASE = databaseTypes.NO;
 
-let useBlueprints;
-
 /* eslint-disable consistent-return */
 module.exports = class extends BaseDockerGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_DOCKER_COMPOSE);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_DOCKER_COMPOSE);
+    }
   }
 
   _initializing() {
@@ -81,7 +80,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -90,7 +89,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -118,7 +117,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -264,7 +263,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -277,7 +276,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -286,7 +285,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -313,7 +312,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/entities/index.js

@@ -21,8 +21,6 @@ const { JHIPSTER_CONFIG_DIR } = require('../generator-constants');
 const { SQL } = require('../../jdl/jhipster/database-types');
 const { GENERATOR_ENTITIES, GENERATOR_ENTITIES_CLIENT, GENERATOR_ENTITY, GENERATOR_DATABASE_CHANGELOG } = require('../generator-list');
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -75,10 +73,12 @@ module.exports = class extends BaseBlueprintGenerator {
       defaults: true,
       hide: true,
     });
+  }
 
-    if (this.options.help) return;
-
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITIES);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_ENTITIES);
+    }
 
     if (this.options.entitiesToImport) {
       const entities = this.jhipsterConfig.entities || [];
@@ -123,28 +123,31 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    return useBlueprints ? undefined : this._initializing();
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
   }
 
   // Public API method used by the getter and also by Blueprints
   _composing() {
     return {
-      composeEachEntity() {
-        this.getExistingEntityNames().forEach(entityName => {
-          if (this.options.composedEntities && this.options.composedEntities.includes(entityName)) return;
-          const selectedEntity = this.options.entities.includes(entityName);
-          const { regenerate = !selectedEntity } = this.options;
-          this.composeWithJHipster(GENERATOR_ENTITY, [entityName], {
-            skipWriting: !this.options.writeEveryEntity && !selectedEntity,
-            regenerate,
-            skipDbChangelog: this.jhipsterConfig.databaseType === SQL || this.options.skipDbChangelog,
-            skipInstall: true,
-            skipPrompts: this.options.skipPrompts,
-          });
-        });
+      async composeEachEntity() {
+        return Promise.all(
+          this.getExistingEntityNames().map(async entityName => {
+            if (this.options.composedEntities && this.options.composedEntities.includes(entityName)) return;
+            const selectedEntity = this.options.entities.includes(entityName);
+            const { regenerate = !selectedEntity } = this.options;
+            await this.composeWithJHipster(GENERATOR_ENTITY, [entityName], {
+              skipWriting: !this.options.writeEveryEntity && !selectedEntity,
+              regenerate,
+              skipDbChangelog: this.jhipsterConfig.databaseType === SQL || this.options.skipDbChangelog,
+              skipInstall: true,
+              skipPrompts: this.options.skipPrompts,
+            });
+          })
+        );
       },
 
-      databaseChangelog() {
+      async databaseChangelog() {
         if (this.jhipsterConfig.skipServer || this.jhipsterConfig.databaseType !== SQL || this.options.skipDbChangelog) {
           return;
         }
@@ -153,19 +156,23 @@ module.exports = class extends BaseBlueprintGenerator {
           return;
         }
 
-        this.composeWithJHipster(GENERATOR_DATABASE_CHANGELOG, this.options.writeEveryEntity ? existingEntities : this.options.entities);
+        await this.composeWithJHipster(
+          GENERATOR_DATABASE_CHANGELOG,
+          this.options.writeEveryEntity ? existingEntities : this.options.entities
+        );
       },
     };
   }
 
   get composing() {
-    return useBlueprints ? undefined : this._composing();
+    if (this.delegateToBlueprint) return {};
+    return this._composing();
   }
 
   // Public API method used by the getter and also by Blueprints
   _default() {
     return {
-      composeEntitiesClient() {
+      async composeEntitiesClient() {
         if (this.options.entities.length !== this.jhipsterConfig.entities.length) return;
         const clientEntities = this.getExistingEntityNames()
           .map(entityName => {
@@ -177,7 +184,7 @@ module.exports = class extends BaseBlueprintGenerator {
           })
           .filter(entity => !entity.skipClient);
         if (clientEntities.length === 0) return;
-        this.composeWithJHipster(GENERATOR_ENTITIES_CLIENT, clientEntities, {
+        await this.composeWithJHipster(GENERATOR_ENTITIES_CLIENT, clientEntities, {
           skipInstall: this.options.skipInstall,
         });
       },
@@ -185,7 +192,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    return useBlueprints ? undefined : this._default();
+    if (this.delegateToBlueprint) return {};
+    return this._default();
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -194,6 +202,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    return useBlueprints ? undefined : this._writing();
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
   }
 };

package/generators/entities-client/index.js

@@ -19,14 +19,17 @@
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const { GENERATOR_ENTITIES_CLIENT } = require('../generator-list');
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
     if (this.options.help) return;
     this.clientEntities = this.options.clientEntities;
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITIES_CLIENT);
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_ENTITIES_CLIENT);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -39,7 +42,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    return useBlueprints ? undefined : this._initializing();
+    return this.delegateToBlueprint ? undefined : this._initializing();
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -52,7 +55,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    return useBlueprints ? undefined : this._loading();
+    return this.delegateToBlueprint ? undefined : this._loading();
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -67,7 +70,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    return useBlueprints ? undefined : this._default();
+    return this.delegateToBlueprint ? undefined : this._default();
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -82,6 +85,6 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    return useBlueprints ? undefined : this._end();
+    return this.delegateToBlueprint ? undefined : this._end();
   }
 };