generator-jhipster 8.0.0-beta.3 → 8.0.0-rc.1

package/dist/generators/vue/templates/vite.config.ts.ejs

@@ -0,0 +1,175 @@
+<%#
+ 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.
+-%>
+import { fileURLToPath, URL } from 'node:url';
+import { dirname, join } from 'node:path';
+import { existsSync } from 'node:fs';
+
+import { mergeConfig, defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import copy from 'rollup-plugin-copy';
+<%_ if (microfrontend) { _%>
+import federation from "@originjs/vite-plugin-federation";
+
+const sharedAppVersion = '0.0.0';
+<%_ } _%>
+
+const getFileFromRepo = (file: string) =>
+  existsSync(fileURLToPath(new URL(`../node_modules/${file}`, import.meta.url)))
+    ? fileURLToPath(new URL(`../node_modules/${file}`, import.meta.url))
+    : fileURLToPath(new URL(`./node_modules/${file}`, import.meta.url));
+
+// eslint-disable-next-line prefer-const
+let config = defineConfig({
+  plugins: [
+    vue({
+      template: {
+        compilerOptions: {
+          compatConfig: {
+            MODE: 2,
+          },
+        },
+      },
+    }),
+    copy({
+      targets: [
+        {
+          src: [
+            `${require('swagger-ui-dist').getAbsoluteFSPath()}/*.{js,css,html,png}`,
+            `!${require('swagger-ui-dist').getAbsoluteFSPath()}/**/index.html`,
+            getFileFromRepo('axios/dist/axios.min.js'),
+            fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/index.html', import.meta.url)),
+          ],
+          dest: '<%= this.relativeDir(clientRootDir, clientDistDir) %>swagger-ui',
+        },
+      ],
+      hook: 'writeBundle',
+    }),
+  ],
+  root: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>', import.meta.url)),
+  publicDir: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientDistDir) %>public', import.meta.url)),
+  cacheDir: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, temporaryDir) %>.vite-cache', import.meta.url)),
+  build: {
+    emptyOutDir: true,
+    outDir: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientDistDir) %>', import.meta.url)),
+    rollupOptions: {
+      input: {
+        app: fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>index.html', import.meta.url)),
+      },
+    },
+  },
+  resolve: {
+    alias: {
+      vue: '@vue/compat/dist/vue.esm-bundler.js',
+      '@': fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>app/', import.meta.url)),
+    },
+  },
+  define: {
+    I18N_HASH: '"generated_hash"',
+    SERVER_API_URL: '"/"',
+    APP_VERSION: `"${process.env.APP_VERSION ? process.env.APP_VERSION : 'DEV'}"`,
+  },
+  server: {
+    proxy: Object.fromEntries(
+      [
+        '/api',
+        '/management',
+        '/v3/api-docs',
+<%_ if (databaseTypeSql && devDatabaseTypeH2Any) { _%>
+        '/h2-console',
+<%_ } _%>
+<%_ if (authenticationTypeOauth2) { _%>
+        '/oauth2',
+        '/login',
+<%_ } _%>
+<%_ if (authenticationTypeSession) { _%>
+        '/login',
+<%_ } _%>
+<%_ if (applicationTypeGateway || applicationTypeMicroservice) { _%>
+        '/services',
+<%_ } _%>
+      ].map(res => [
+        res,
+        {
+          target: 'http://localhost:<%= applicationTypeMicroservice ? gatewayServerPort : serverPort %>',
+        },
+      ])
+    ),
+  },
+});
+
+<%_ if (microfrontend) { _%>
+config = mergeConfig(config, {
+  build: {
+    modulePreload: false,
+    minify: false,
+    target: ["chrome89", "edge89", "firefox89", "safari15"],
+  },
+  plugins: [
+    federation({
+      name: '<%= lowercaseBaseName %>',
+<%_ if (applicationTypeGateway) { _%>
+      remotes: {
+  <%_ for (const remote of microfrontends) { _%>
+        '@<%= remote.lowercaseBaseName %>': `/<%= remote.endpointPrefix %>/assets/remoteEntry.js`,
+  <%_ } _%>
+      },
+<%_ } _%>
+<%_ if (applicationTypeMicroservice) { _%>
+      exposes: {
+        './entities-router': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/router/entities',
+        './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/entities-menu.vue',
+      },
+<%_ } _%>
+      shared: {
+        '@vuelidate/core': {},
+        '@vuelidate/validators': {},
+        axios: {},
+        // 'bootstrap-vue': {},
+        vue: {
+          packagePath: '@vue/compat/dist/vue.esm-bundler.js',
+        },
+        'vue-i18n': {},
+        'vue-router': {},
+        pinia: {},
+        '@/shared/security/authority': {
+          packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/shared/security/authority',
+<%_ if (applicationTypeGateway) { _%>
+          version: sharedAppVersion,
+<%_ } _%>
+        },
+        '@/shared/alert/alert.service': {
+          packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/shared/alert/alert.service',
+<%_ if (applicationTypeGateway) { _%>
+          version: sharedAppVersion,
+<%_ } _%>
+        },
+        '@/locale/translation.service': {
+          packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/locale/translation.service',
+<%_ if (applicationTypeGateway) { _%>
+          version: sharedAppVersion,
+<%_ } _%>
+        },
+      },
+    }),
+  ],
+});
+<%_ } _%>
+// jhipster-needle-add-vite-config - JHipster will add custom config
+
+export default config;

package/dist/generators/vue/templates/vitest.config.ts.ejs

@@ -16,42 +16,40 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { defineConfig } from 'vitest/config';
-import config from './webpack/config';
-import vue from '@vitejs/plugin-vue';
+import { fileURLToPath } from 'node:url'
+import { mergeConfig, defineConfig, configDefaults } from 'vitest/config';
+import viteConfig from './vite.config'
 
-export default defineConfig({
-  plugins: [vue()],
-  resolve: {
-    alias: {
-      '@': './<%- clientSrcDir %>app/',
+export default mergeConfig(
+  viteConfig,
+  defineConfig({
+    resolve: {
+      alias: {
+        vue: 'vue',
+      },
     },
-  },
-  define: {
-    I18N_HASH: '"generated_hash"',
-    SERVER_API_URL: `"${config.serverApiUrl}"`,
-    VERSION: `"${config.version}"`,
-  },
-  test: {
-    globals: true,
-    environment: 'happy-dom', // happy-dom provides a better performance but doesn't have a default url.
-    setupFiles: ['./<%= clientSrcDir %>app/test-setup.ts'],
+    test: {
+      globals: true,
+      environment: 'happy-dom', // happy-dom provides a better performance but doesn't have a default url.
+      setupFiles: [fileURLToPath(new URL('./<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/test-setup.ts', import.meta.url))],
 <%_ if (applicationTypeGateway && microfrontend) { _%>
-    alias: {
+      alias: {
   <%_ for (const remote of microfrontends) { _%>
-      '@<%- remote.lowercaseBaseName %>': './<%- clientTestDir %>spec/app/microfrontends/',
+        '@<%- remote.lowercaseBaseName %>': fileURLToPath(new URL('./<%- clientTestDir %>spec/app/microfrontends/', import.meta.url)),
   <%_ } _%>
-    },
+      },
 <%_ } _%>
-    reporters: ['default', 'vitest-sonar-reporter'],
-    outputFile: {
-      'vitest-sonar-reporter': './<%= temporaryDir %>test-results/TESTS-results-vitest.xml',
-    },
-    coverage: {
-      provider: 'v8',
-      statements: 85,
-      branches: 75,
-      lines: 85,
+      reporters: ['default', 'vitest-sonar-reporter'],
+      outputFile: {
+        'vitest-sonar-reporter': fileURLToPath(new URL('./<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/TESTS-results-vitest.xml', import.meta.url)),
+      },
+      coverage: {
+        provider: 'v8',
+        statements: 85,
+        branches: 75,
+        lines: 85,
+        reportsDirectory: fileURLToPath(new URL('./target/vite-coverage', import.meta.url)),
+      },
     },
-  },
-});
+  }),
+);

package/dist/generators/vue/templates/webpack/webpack.common.js.ejs

@@ -20,7 +20,7 @@ function resolve(dir = '') {
 module.exports = async (env, options) => {
   const development = options.mode === 'development';
 <%_ if (enableTranslation) { _%>
-  const languagesHash = await hashElement(resolve('<%= clientSrcDir %>i18n'), {
+  const languagesHash = await hashElement(resolve('<%= this.relativeDir(clientRootDir, clientSrcDir) %>i18n'), {
     algo: 'md5',
     encoding: 'hex',
     files: { include: ['*.json'] },
@@ -37,16 +37,16 @@ module.exports = async (env, options) => {
       },
 <%_ } _%>
       entry: {
-        app: './<%= clientSrcDir %>app/<%= microfrontend ? 'index' : 'main' %>.ts',
+        app: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/<%= microfrontend ? 'index' : 'main' %>.ts',
       },
       output: {
-        path: resolve('<%= clientDistDir %>'),
+        path: resolve('<%= this.relativeDir(clientRootDir, clientDistDir) %>'),
       },
       resolve: {
         extensions: ['.ts', '.js', '.vue', '.json'],
         alias: {
           vue$: '@vue/compat/dist/vue.esm-bundler.js',
-          '@': resolve('<%= clientSrcDir %>app'),
+          '@': resolve('<%= this.relativeDir(clientRootDir, clientSrcDir) %>app'),
         },
       },
       devServer: {
@@ -54,7 +54,7 @@ module.exports = async (env, options) => {
         hot: config.dev.hotReload,
 <%_ } _%>
         static: {
-          directory: './<%= clientDistDir %>',
+          directory: './<%= this.relativeDir(clientRootDir, clientDistDir) %>',
         },
         port: <%= devServerPort %>,
         proxy: [
@@ -89,7 +89,7 @@ module.exports = async (env, options) => {
       cache: {
         // 1. Set cache type to filesystem
         type: 'filesystem',
-        cacheDirectory: resolve('<%= temporaryDir %>webpack'),
+        cacheDirectory: resolve('<%= this.relativeDir(clientRootDir, temporaryDir) %>webpack'),
         buildDependencies: {
           // 2. Add your config as buildDependency to get cache invalidation on config change
           config: [
@@ -125,6 +125,7 @@ module.exports = async (env, options) => {
                   appendTsSuffixTo: ['\\.vue$'],
                   happyPackMode: true,
                   transpileOnly: true,
+                  configFile: 'tsconfig.app.json',
                 },
               },
             ],
@@ -141,12 +142,12 @@ module.exports = async (env, options) => {
 <%_ if (enableTranslation) { _%>
           I18N_HASH: JSON.stringify(languagesHash.hash),
 <%_ } _%>
-          VERSION: JSON.stringify(config.version),
+          APP_VERSION: JSON.stringify(config.version),
           SERVER_API_URL: JSON.stringify(config.serverApiUrl),
         }),
         new HtmlWebpackPlugin({
           base: '/',
-          template: './<%= clientSrcDir %>index.html',
+          template: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>index.html',
         }),
         new VueLoaderPlugin(),
         new CopyWebpackPlugin({
@@ -162,15 +163,15 @@ module.exports = async (env, options) => {
               from: path.join(path.dirname(require.resolve('axios/package.json')), 'dist/axios.min.js'),
               to: 'swagger-ui/',
             },
-            { from: './<%= clientSrcDir %>swagger-ui/', to: 'swagger-ui/' },
-            { from: './<%= clientSrcDir %>content/', to: 'content/' },
-            { from: './<%= clientSrcDir %>favicon.ico', to: 'favicon.ico' },
+            { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/', to: 'swagger-ui/' },
+            { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/', to: 'content/' },
+            { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>favicon.ico', to: 'favicon.ico' },
             {
-              from: './<%= clientSrcDir %>manifest.webapp',
+              from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>manifest.webapp',
               to: 'manifest.webapp',
             },
             // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
-            { from: './<%= clientSrcDir %>robots.txt', to: 'robots.txt' },
+            { from: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>robots.txt', to: 'robots.txt' },
           ],
         })<% if (enableTranslation) { %>,
         new MergeJsonWebpackPlugin({

package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs

@@ -31,8 +31,8 @@ const { DefinePlugin } = require('webpack');
 <%_ } _%>
 <%_ if (applicationTypeMicroservice) { _%>
         exposes: {
-          './entities-router': './<%= clientSrcDir %>app/router/entities',
-          './entities-menu': './<%= clientSrcDir %>app/entities/entities-menu',
+          './entities-router': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/router/entities',
+          './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/entities-menu',
         },
 <%_ } _%>
         shared: {

package/dist/generators/workspaces/generator.mjs

@@ -32,10 +32,12 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
     generateWith;
     generateWorkspaces;
     async beforeQueue() {
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_WORKSPACES, { generatorOptions: { customWorkspacesConfig: true } });
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_WORKSPACES);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_WORKSPACES, { generatorOptions: { customWorkspacesConfig: true } });
+        }
     }
     get initializing() {
         return this.asInitializingTaskGroup({

package/dist/jdl/basic-types/relationships.js

@@ -0,0 +1,14 @@
+export const JDL_RELATIONSHIP_ONE_TO_ONE = 'OneToOne';
+export const JDL_RELATIONSHIP_ONE_TO_MANY = 'OneToMany';
+export const JDL_RELATIONSHIP_MANY_TO_ONE = 'ManyToOne';
+export const JDL_RELATIONSHIP_MANY_TO_MANY = 'ManyToMany';
+export const RELATIONSHIP_ONE_TO_ONE = 'one-to-one';
+export const RELATIONSHIP_ONE_TO_MANY = 'one-to-many';
+export const RELATIONSHIP_MANY_TO_ONE = 'many-to-one';
+export const RELATIONSHIP_MANY_TO_MANY = 'many-to-many';
+export const relationshipTypes = {
+    ONE_TO_ONE: JDL_RELATIONSHIP_ONE_TO_ONE,
+    ONE_TO_MANY: JDL_RELATIONSHIP_ONE_TO_MANY,
+    MANY_TO_ONE: JDL_RELATIONSHIP_MANY_TO_ONE,
+    MANY_TO_MANY: JDL_RELATIONSHIP_MANY_TO_MANY,
+};

package/dist/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js

@@ -40,7 +40,7 @@ function createJSONEntities(jdlEntities) {
         convertedEntities.set(entityName, new JSONEntity({
             entityName,
             entityTableName: getTableNameFromEntityName(jdlEntity.tableName),
-            javadoc: formatComment(jdlEntity.comment),
+            documentation: formatComment(jdlEntity.comment),
         }));
     });
     return convertedEntities;

package/dist/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { validations } from '../../jhipster/index.mjs';
 import formatComment from '../../utils/format-utils.js';
 import { camelCase } from '../../utils/string-utils.js';
@@ -52,13 +52,13 @@ function getConvertedFieldsForEntity(jdlEntity, jdlObject) {
         };
         const comment = formatComment(jdlField.comment);
         if (comment) {
-            fieldData.javadoc = comment;
+            fieldData.documentation = comment;
         }
         if (jdlObject.hasEnum(jdlField.type)) {
             fieldData.fieldValues = jdlObject.getEnum(fieldData.fieldType).getValuesAsString();
             const fieldTypeComment = jdlObject.getEnum(fieldData.fieldType).comment;
             if (fieldTypeComment) {
-                fieldData.fieldTypeJavadoc = fieldTypeComment;
+                fieldData.fieldTypeDocumentation = fieldTypeComment;
             }
             const fieldValuesJavadocs = jdlObject.getEnum(fieldData.fieldType).getValueJavadocs();
             if (fieldValuesJavadocs && Object.keys(fieldValuesJavadocs).length > 0) {

package/dist/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { relationshipOptions, validations } from '../../jhipster/index.mjs';
 import { camelCase, lowerFirst } from '../../utils/string-utils.js';
 const { Validations: { REQUIRED }, } = validations;
@@ -76,7 +76,7 @@ function setRelationshipsFromEntity(relatedRelationships, entityName) {
             convertedRelationship.relationshipValidateRules = REQUIRED;
         }
         if (relationshipToConvert.commentInFrom) {
-            convertedRelationship.javadoc = relationshipToConvert.commentInFrom;
+            convertedRelationship.documentation = relationshipToConvert.commentInFrom;
         }
         const splitField = extractField(relationshipToConvert.injectedFieldInFrom);
         convertedRelationship.relationshipName = camelCase(splitField.relationshipName || relationshipToConvert.to);
@@ -105,7 +105,7 @@ function setRelationshipsToEntity(relatedRelationships, entityName) {
             convertedRelationship.relationshipValidateRules = REQUIRED;
         }
         if (relationshipToConvert.commentInTo) {
-            convertedRelationship.javadoc = relationshipToConvert.commentInTo;
+            convertedRelationship.documentation = relationshipToConvert.commentInTo;
         }
         const splitField = extractField(relationshipToConvert.injectedFieldInTo);
         convertedRelationship.relationshipName = camelCase(splitField.relationshipName || relationshipToConvert.from);

package/dist/jdl/converters/json-to-jdl-entity-converter.js

@@ -25,7 +25,7 @@ import JDLUnaryOption from '../models/jdl-unary-option.js';
 import JDLBinaryOption from '../models/jdl-binary-option.js';
 import { lowerFirst, upperFirst } from '../utils/string-utils.js';
 import { fieldTypes, unaryOptions, binaryOptions, relationshipOptions } from '../jhipster/index.mjs';
-import { asJdlRelationshipType } from './parsed-jdl-to-jdl-object/relationship-converter.js';
+import { asJdlRelationshipType } from '../jhipster/relationship-types.js';
 const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
 const { BUILT_IN_ENTITY } = relationshipOptions;
 const { FILTER, NO_FLUENT_METHOD, READ_ONLY, EMBEDDED } = unaryOptions;
@@ -70,7 +70,7 @@ function convertJSONToJDLEntity(entity, entityName) {
     const jdlEntity = new JDLEntity({
         name: entityName,
         tableName: entity.entityTableName,
-        comment: entity.javadoc,
+        comment: entity.documentation,
     });
     addFields(jdlEntity, entity);
     return jdlEntity;
@@ -84,7 +84,7 @@ function convertJSONToJDLField(field) {
     const jdlField = new JDLField({
         name: lowerFirst(field.fieldName),
         type: field.fieldType,
-        comment: field.javadoc,
+        comment: field.documentation,
     });
     if (jdlField.type === BYTES) {
         jdlField.type = getTypeForBlob(field.fieldTypeBlobContent);
@@ -117,7 +117,7 @@ function addEnumsToJDL(entity) {
             jdlObject.addEnum(new JDLEnum({
                 name: field.fieldType,
                 values: getEnumValuesFromString(field.fieldValues),
-                comment: field.fieldTypeJavadoc,
+                comment: field.fieldTypeDocumentation,
             }));
         }
     });
@@ -206,7 +206,7 @@ function getSourceEntitySideAttributes(entityName, relationship) {
         sourceEntity: entityName,
         injectedFieldInSourceEntity: getInjectedFieldInSourceEntity(relationship),
         injectedFieldInSourceIsRequired: relationship.relationshipValidateRules,
-        commentForSourceEntity: relationship.javadoc,
+        commentForSourceEntity: relationship.documentation,
     };
 }
 function getDestinationEntitySideAttributes(isEntityTheDestinationSideEntity, destinationEntityRelationships) {
@@ -222,7 +222,7 @@ function getDestinationEntitySideAttributes(isEntityTheDestinationSideEntity, de
         injectedFieldInDestinationEntity += `(${foundDestinationSideEntity.otherEntityField})`;
     }
     const injectedFieldInDestinationIsRequired = !!foundDestinationSideEntity.relationshipValidateRules;
-    const commentForDestinationEntity = foundDestinationSideEntity.javadoc;
+    const commentForDestinationEntity = foundDestinationSideEntity.documentation;
     return {
         injectedFieldInDestinationEntity,
         injectedFieldInDestinationIsRequired,

package/dist/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.js

@@ -33,7 +33,7 @@ export function convertEntities(parsedEntities, jdlFieldGetterFunction) {
         const jdlEntity = new JDLEntity({
             name: parsedEntity.name,
             tableName: parsedEntity.tableName || parsedEntity.name,
-            comment: formatComment(parsedEntity.javadoc),
+            comment: formatComment(parsedEntity.documentation),
         });
         const jdlFields = jdlFieldGetterFunction.call(undefined, parsedEntity);
         jdlEntity.addFields(jdlFields);

package/dist/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.js

@@ -39,6 +39,6 @@ function convertEnum(enumeration) {
     return new JDLEnum({
         name: enumeration.name,
         values: enumeration.values,
-        comment: formatComment(enumeration.javadoc),
+        comment: formatComment(enumeration.documentation),
     });
 }

package/dist/jdl/converters/parsed-jdl-to-jdl-object/field-converter.js

@@ -34,8 +34,8 @@ export function convertField(field) {
         name,
         type: field.type,
     });
-    if (field.javadoc) {
-        jdlField.comment = formatComment(field.javadoc);
+    if (field.documentation) {
+        jdlField.comment = formatComment(field.documentation);
     }
     return jdlField;
 }

package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import JDLObject from '../../models/jdl-object.js';
 import JDLUnaryOption from '../../models/jdl-unary-option.js';
 import JDLBinaryOption from '../../models/jdl-binary-option.js';

package/dist/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js

@@ -16,13 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
 import JDLRelationship from '../../models/jdl-relationship.js';
-import { lowerFirst, upperFirst } from '../../utils/string-utils.js';
+import { lowerFirst } from '../../utils/string-utils.js';
 import { formatComment } from '../../utils/format-utils.js';
-const { camelCase } = _;
+import { asJdlRelationshipType } from '../../jhipster/relationship-types.js';
 export default { convertRelationships };
-export const asJdlRelationshipType = (type) => upperFirst(camelCase(type));
 /**
  * Converts parsed relationships to JDLRelationship objects.
  * @param {Array<Object>} parsedRelationships - the parsed relationships.
@@ -42,8 +40,8 @@ export function convertRelationships(parsedRelationships, annotationToOptionConv
             injectedFieldInTo: parsedRelationship.to.injectedField,
             isInjectedFieldInFromRequired: parsedRelationship.from.required,
             isInjectedFieldInToRequired: parsedRelationship.to.required,
-            commentInFrom: formatComment(parsedRelationship.from.javadoc),
-            commentInTo: formatComment(parsedRelationship.to.javadoc),
+            commentInFrom: formatComment(parsedRelationship.from.documentation),
+            commentInTo: formatComment(parsedRelationship.to.documentation),
             options: {
                 global: annotationToOptionConverter.call(undefined, parsedRelationship.options.global),
                 source: annotationToOptionConverter.call(undefined, parsedRelationship.options.source),

package/dist/jdl/jdl-importer.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import * as JDLReader from './readers/jdl-reader.js';
 import ParsedJDLToJDLObjectConverter from './converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js';
 import { readJSONFile } from './readers/json-file-reader.js';

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

@@ -63,6 +63,9 @@ export function getConfigForClientApplication(options = {}) {
     if (options[SKIP_CLIENT]) {
         options[CLIENT_FRAMEWORK] = NO_CLIENT_FRAMEWORK;
     }
+    if (options[OptionNames.MICROFRONTEND] === undefined) {
+        options[OptionNames.MICROFRONTEND] = Boolean(options[OptionNames.MICROFRONTENDS]?.length);
+    }
     const clientFramework = options[CLIENT_FRAMEWORK];
     if (clientFramework !== NO_CLIENT_FRAMEWORK) {
         if (!options[CLIENT_THEME]) {
@@ -207,11 +210,9 @@ export function getServerConfigForMicroserviceApplication(customOptions = {}) {
         [SERVER_PORT]: DEFAULT_SERVER_PORT,
         [SERVICE_DISCOVERY_TYPE]: CONSUL,
         [SKIP_USER_MANAGEMENT]: true,
+        [CLIENT_FRAMEWORK]: NO_CLIENT_FRAMEWORK,
         ...customOptions,
     };
-    if (options[SKIP_CLIENT] === undefined) {
-        options[SKIP_CLIENT] = options[CLIENT_FRAMEWORK] === undefined || options[CLIENT_FRAMEWORK] === NO_CLIENT_FRAMEWORK;
-    }
     options[WITH_ADMIN_UI] = false;
     return {
         ...options,

package/dist/jdl/jhipster/entity-table-name-creator.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 /**
  * Returns an entity table name based on the passed entity name.
  * @param entityName - the entity's name

package/dist/jdl/jhipster/field-types.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import validations from './validations.js';
 import JDLEnum from '../models/jdl-enum.js';
 import databaseTypes from './database-types.js';

package/dist/jdl/jhipster/index.mjs

@@ -25,6 +25,7 @@ export { default as serviceDiscoveryTypes } from './service-discovery-types.js';
 export { default as testFrameworkTypes } from './test-framework-types.js';
 export { default as unaryOptions } from './unary-options.js';
 export { default as validations } from './validations.js';
+export * from './validations.js';
 export { default as websocketTypes } from './websocket-types.js';
 export { default as checkAndReturnRelationshipOnValue } from './relationship-on-handler-options.js';
 export { IngressTypes as ingressTypes } from './kubernetes-platform-types.js';

package/dist/jdl/jhipster/json-entity.js

@@ -28,7 +28,7 @@ class JSONEntity {
      *        - entityName, the entity name (mandatory)
      *        - fields, a field iterable
      *        - relationships, a relationship iterable
-     *        - javadoc,
+     *        - documentation,
      *        - entityTableName, defaults to the snake-cased entity name,
      *        - dto, defaults to 'no',
      *        - pagination, defaults to 'no',
@@ -47,7 +47,7 @@ class JSONEntity {
         this.name = merged.name;
         this.fields = merged.fields;
         this.relationships = merged.relationships;
-        this.javadoc = merged.javadoc;
+        this.documentation = merged.documentation;
         this.entityTableName = merged.entityTableName;
         this.dto = merged.dto;
         this.pagination = merged.pagination;