generator-jhipster 7.3.1 → 7.4.0

package/generators/workspaces/index.js

@@ -42,13 +42,17 @@ module.exports = class extends BaseBlueprintGenerator {
 
     if (this.options.help) return;
 
-    this.useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('workspaces');
-
     // Generate workspaces file only when option passed or regenerating
     this.generateWorkspaces = this.options.workspaces !== false || !!this.packageJson.get('workspaces');
 
     // When generating workspaces, save to .yo-rc.json. Use a dummy config otherwise.
     this.workspacesConfig = this.generateWorkspaces ? this.jhipsterConfig : {};
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints('workspaces');
+    }
 
     this.loadRuntimeOptions();
   }
@@ -106,7 +110,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    return this.useBlueprints ? undefined : this._configuring();
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
   }
 
   _loading() {
@@ -122,7 +127,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    return this.useBlueprints ? undefined : this._loading();
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
   }
 
   _writing() {
@@ -146,7 +152,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    return this.useBlueprints ? undefined : this._writing();
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
   }
 
   _postWriting() {
@@ -179,7 +186,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    return this.useBlueprints ? undefined : this._postWriting();
+    if (this.delegateToBlueprint) return {};
+    return this._postWriting();
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -199,7 +207,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get install() {
-    return this.useBlueprints ? undefined : this._install();
+    if (this.delegateToBlueprint) return {};
+    return this._install();
   }
 
   _detectNodePackageManager() {

package/jdl/jhipster/default-application-options.js

@@ -169,10 +169,16 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
     [SKIP_USER_MANAGEMENT]: true,
     ...customOptions,
   };
-  delete options[CLIENT_FRAMEWORK];
+  let skipClient = options[SKIP_CLIENT];
+  if (skipClient === undefined) {
+    skipClient = options[CLIENT_FRAMEWORK] === undefined;
+  }
+  if (skipClient) {
+    delete options[CLIENT_FRAMEWORK];
+    delete options[SKIP_SERVER];
+  }
   delete options[CLIENT_THEME];
   delete options[CLIENT_THEME_VARIANT];
-  delete options[SKIP_SERVER];
   delete options[WITH_ADMIN_UI];
   if (typeof options[SKIP_USER_MANAGEMENT] !== 'boolean') {
     options[SKIP_USER_MANAGEMENT] = true;
@@ -186,7 +192,7 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
   return {
     ...options,
     [APPLICATION_TYPE]: MICROSERVICE,
-    [SKIP_CLIENT]: true,
+    [SKIP_CLIENT]: skipClient,
   };
 }
 
@@ -205,16 +211,12 @@ function getDefaultConfigForNewApplication(customOptions = {}) {
     [MESSAGE_BROKER]: OptionValues[MESSAGE_BROKER].false,
     [PROD_DATABASE_TYPE]: POSTGRESQL,
     [SEARCH_ENGINE]: OptionValues[SEARCH_ENGINE].false,
-    [SKIP_CLIENT]: OptionValues[SKIP_CLIENT],
     [TEST_FRAMEWORKS]: [],
     [WEBSOCKET]: OptionValues[WEBSOCKET].false,
     [ENABLE_GRADLE_ENTERPRISE]: OptionValues[ENABLE_GRADLE_ENTERPRISE],
     [GRADLE_ENTERPRISE_HOST]: OptionValues[GRADLE_ENTERPRISE_HOST],
     ...customOptions,
   };
-  if (typeof options[SKIP_SERVER] !== 'boolean') {
-    options[SKIP_SERVER] = OptionValues[SKIP_SERVER];
-  }
   if (!options[PACKAGE_NAME] && !options[PACKAGE_FOLDER]) {
     options[PACKAGE_FOLDER] = OptionValues[PACKAGE_FOLDER];
     options[PACKAGE_NAME] = OptionValues[PACKAGE_NAME];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.3.1",
+  "version": "7.4.0",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -75,23 +75,22 @@
     "prettier:check": "prettier --check \"{,**/}*.{js,cjs,mjs,json,md,yml,java}\"",
     "prettier:format": "prettier --write \"{,**/}*.{js,cjs,mjs,json,md,yml,java}\"",
     "pretest": "npm run lint",
-    "test": "mocha test generators --no-insight --forbid-only --parallel",
+    "test": "mocha test generators --no-insight --forbid-only --parallel --max-old-space-size=4096",
     "update-snapshot": "mocha --no-insight --no-parallel --updateSnapshot --",
     "update-snapshots": "npm run update-snapshot -- test generators"
   },
   "dependencies": {
-    "aws-sdk": "2.1009.0",
-    "axios": "0.23.0",
+    "aws-sdk": "2.1028.0",
+    "axios": "0.24.0",
     "chalk": "4.1.2",
     "chevrotain": "9.1.0",
-    "commander": "8.2.0",
+    "commander": "8.3.0",
     "conf": "10.0.3",
     "debug": "4.3.2",
     "didyoumean": "1.2.2",
     "ejs": "3.1.6",
     "faker": "5.5.3",
     "glob": "7.2.0",
-    "gulp-filter": "7.0.0",
     "insight": "0.11.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
@@ -100,39 +99,40 @@
     "normalize-path": "3.0.0",
     "os-locale": "5.0.0",
     "p-queue": "6.6.2",
+    "p-transform": "1.3.0",
     "parse-gitignore": "1.0.1",
     "pluralize": "8.0.0",
     "prettier": "2.4.1",
-    "prettier-plugin-java": "1.5.0",
-    "prettier-plugin-packagejson": "2.2.13",
+    "prettier-plugin-java": "1.6.0",
+    "prettier-plugin-packagejson": "2.2.15",
     "progress": "2.0.3",
     "randexp": "0.5.3",
     "semver": "7.3.5",
     "shelljs": "0.8.4",
-    "simple-git": "2.46.0",
+    "simple-git": "2.47.0",
     "then-request": "6.0.2",
     "uuid": "8.3.2",
     "winston": "3.3.3",
-    "yeoman-environment": "3.6.0",
+    "yeoman-environment": "3.8.0",
     "yeoman-generator": "5.4.2"
   },
   "devDependencies": {
     "chai": "4.3.4",
     "ejs-lint": "1.2.1",
-    "eslint": "8.0.1",
-    "eslint-config-airbnb-base": "14.2.1",
+    "eslint": "8.2.0",
+    "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-chai-friendly": "^0.7.1",
-    "eslint-plugin-import": "2.25.2",
+    "eslint-plugin-import": "2.25.3",
     "eslint-plugin-mocha": "9.0.0",
     "eslint-plugin-prettier": "4.0.0",
-    "expect": "27.2.5",
+    "expect": "27.3.1",
     "fs-extra": "10.0.0",
     "jsdoc": "3.6.7",
     "mocha": "9.1.3",
     "mocha-expect-snapshot": "1.1.1",
     "proxyquire": "2.1.3",
-    "sinon": "11.1.2",
+    "sinon": "12.0.1",
     "sinon-chai": "3.7.0",
     "yeoman-assert": "3.1.1",
     "yeoman-test": "6.2.0"

package/utils/entity.js

@@ -28,6 +28,7 @@ const { PaginationTypes, ServiceTypes } = require('../jdl/jhipster/entity-option
 const { GATEWAY, MICROSERVICE } = require('../jdl/jhipster/application-types');
 const { MapperTypes } = require('../jdl/jhipster/entity-options');
 const { OAUTH2 } = require('../jdl/jhipster/authentication-types');
+const { ANGULAR_X } = require('../jdl/jhipster/client-framework-types');
 const { CommonDBTypes } = require('../jdl/jhipster/field-types');
 
 const { BOOLEAN, LONG, STRING, UUID } = CommonDBTypes;
@@ -204,6 +205,16 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
     entityWithConfig.i18nAlertHeaderPrefix = `${entityWithConfig.microserviceAppName}.${entityWithConfig.entityTranslationKey}`;
   }
 
+  const { microserviceName, entityFileName, microfrontend } = entityWithConfig;
+  entityWithConfig.entityApi = microserviceName ? `services/${microserviceName.toLowerCase()}/` : '';
+  entityWithConfig.entityPage =
+    microfrontend &&
+    microserviceName &&
+    entityWithConfig.clientFramework !== ANGULAR_X &&
+    (entityWithConfig.applicationType === MICROSERVICE || entityWithConfig.applicationType === GATEWAY)
+      ? `${microserviceName.toLowerCase()}/${entityFileName}`
+      : `${entityFileName}`;
+
   const hasBuiltInUserField = entityWithConfig.relationships.some(relationship => generator.isBuiltInUser(relationship.otherEntityName));
   entityWithConfig.saveUserSnapshot =
     entityWithConfig.applicationType === MICROSERVICE &&
@@ -449,6 +460,9 @@ function loadRequiredConfigIntoEntity(entity, config) {
     jhiPrefix: config.jhiPrefix,
     authenticationType: config.authenticationType,
     reactive: config.reactive,
+    microfrontend: config.microfrontend,
+    // Workaround different paths
+    clientFramework: config.clientFramework,
   });
   return entity;
 }

package/utils/multi-step-transform/index.js

@@ -1,12 +1,12 @@
 const { default: PQueue } = require('p-queue');
-const OOOTransform = require('yeoman-environment/lib/util/out-of-order-transform');
+const { PTransform } = require('p-transform');
 const { isFilePending } = require('mem-fs-editor/lib/state');
 
 const { TemplateFileFs } = require('./template-file-fs');
 
-module.exports.MultiStepTransform = class MultiStepTransform extends OOOTransform {
+module.exports.MultiStepTransform = class MultiStepTransform extends PTransform {
   constructor(options = {}) {
-    super(options);
+    super({ logName: 'jhipster:multi-step-transform', ...options });
 
     this.twoStepTemplateQueue = new PQueue({ concurrency: 1, autoStart: false });
     this.templateFileFs = new TemplateFileFs(options);
@@ -15,7 +15,7 @@ module.exports.MultiStepTransform = class MultiStepTransform extends OOOTransfor
     this.pendingFiles = [];
   }
 
-  async _executeTransform(file, enc) {
+  async queuedTransform(file, enc) {
     try {
       if (file.contents && this.templateFileFs.isTemplate(file.path)) {
         const templateFile = this.templateFileFs.add(file.path, file.contents.toString());
@@ -43,10 +43,10 @@ module.exports.MultiStepTransform = class MultiStepTransform extends OOOTransfor
     }
   }
 
-  async _final(...args) {
+  _flush(callback) {
     // Clear normal queue before templates.
-    await this.queue.onIdle();
-    await this.twoStepTemplateQueue.start().onIdle();
-    super._final(...args);
+    this.flushQueue()
+      .then(() => this.twoStepTemplateQueue.start().onIdle())
+      .then(() => super._flush(callback));
   }
 };