generator-jhipster 8.0.0-rc.1 → 8.1.0

package/dist/generators/bootstrap/support/multi-step-transform/index.mjs

@@ -16,39 +16,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Duplex } from 'stream';
-import PQueue from 'p-queue';
-import { isFilePending } from 'mem-fs-editor/state';
+import { transform } from 'p-transform';
 import TemplateFileFs from './template-file-fs.mjs';
 // eslint-disable-next-line import/prefer-default-export
 export const createMultiStepTransform = () => {
-    const twoStepTemplateQueue = new PQueue({ concurrency: 1, autoStart: false });
     const templateFileFs = new TemplateFileFs({});
-    const pendingFiles = [];
-    const duplex = Duplex.from(async function* (source) {
-        for await (const file of source) {
-            if (file.contents && templateFileFs.isTemplate(file.path)) {
-                const templateFile = templateFileFs.add(file.path, file.contents.toString());
-                if (templateFile.rootTemplate) {
-                    // If multi-step root, postpone.
-                    twoStepTemplateQueue.add(() => {
-                        if (pendingFiles.includes(templateFile.basePath)) {
-                            return;
-                        }
-                        file.path = templateFile.basePath;
-                        file.contents = Buffer.from(templateFile.render().concat('\n'));
-                    });
-                }
-                else {
-                    delete file.state;
-                }
-            }
-            else if (isFilePending(file)) {
-                pendingFiles.push(file.path);
-            }
-            yield file;
+    const templateFiles = [];
+    const duplex = transform((file) => {
+        if (!templateFileFs.isTemplate(file.path)) {
+            throw new Error(`File ${file.path} is not supported`);
+        }
+        const templateFile = templateFileFs.add(file);
+        if (templateFile.rootTemplate) {
+            templateFiles.push(templateFile);
+        }
+        return undefined;
+    }, async function () {
+        for (const templateFile of templateFiles) {
+            const file = templateFile.file;
+            file.path = templateFile.basePath;
+            file.contents = Buffer.from(templateFile.render().concat('\n'));
+            this.push(templateFile.file);
         }
-        await twoStepTemplateQueue.start().onIdle();
     });
     duplex.templateFileFs = templateFileFs;
     return duplex;

package/dist/generators/bootstrap/support/multi-step-transform/template-file-fs.mjs

@@ -21,6 +21,10 @@ import path from 'path';
 import { minimatch } from 'minimatch';
 import TemplateFile from './template-file.mjs';
 export default class TemplateFileFs {
+    fragmentFiles;
+    rootFiles = [];
+    extension;
+    delimiter;
     constructor(options = {}) {
         this.extension = options.extension || 'jhi';
         this.delimiter = options.delimiter || '&';
@@ -35,12 +39,14 @@ export default class TemplateFileFs {
     isDerivedTemplate(filePath) {
         return minimatch(filePath, `**/*.${this.extension}.*`, { dot: true });
     }
-    add(filePath, contents) {
-        assert(filePath, 'filePath is required');
-        assert(contents, 'contents is required');
-        const templateFile = this.get(filePath);
-        templateFile.compile(filePath, contents, { delimiter: this.delimiter });
-        if (!templateFile.rootTemplate) {
+    add(file) {
+        assert(file.contents, 'contents is required');
+        const templateFile = this.get(file.path);
+        templateFile.compile(file.path, file.contents.toString(), { delimiter: this.delimiter });
+        if (templateFile.rootTemplate) {
+            templateFile.file = file;
+        }
+        else {
             this.get(templateFile.parentPath).addFragment(templateFile);
         }
         return templateFile;

package/dist/generators/bootstrap/support/multi-step-transform/template-file.mjs

@@ -4,6 +4,7 @@ import debugBuilder from 'debug';
 import ejs from 'ejs';
 import TemplateData from './template-data.mjs';
 export default class TemplateFile {
+    file;
     constructor(filename, extension) {
         this._filename = filename;
         this._extension = extension;

package/dist/generators/bootstrap/support/prettier-support.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { passthrough } from 'p-transform';
-import { isFileStateDeleted } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import prettier from 'prettier';
 import prettierPluginJava from 'prettier-plugin-java';
 import prettierPluginProperties from 'prettier-plugin-properties';
@@ -34,7 +34,7 @@ export const createPrettierTransform = async function (options = {}) {
     const globExpression = extensions.includes(',') ? `**/*.{${extensions}}` : `**/*.${extensions}`;
     const minimatch = new Minimatch(globExpression, { dot: true });
     return passthrough(async (file) => {
-        if (!minimatch.match(file.path) || isFileStateDeleted(file)) {
+        if (!minimatch.match(file.path) || !isFileStateModified(file)) {
             return;
         }
         if (!file.contents) {

package/dist/generators/bootstrap-application/generator.mjs

@@ -22,8 +22,6 @@ import { validations } from '../../jdl/jhipster/index.mjs';
 import { stringifyApplicationData, derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, preparePostEntityCommonDerivedProperties, } from '../base-application/support/index.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_BOOTSTRAP_APPLICATION_CLIENT, GENERATOR_BOOTSTRAP_APPLICATION_SERVER, } from '../generator-list.mjs';
 import { preparePostEntityServerDerivedProperties } from '../server/support/index.mjs';
-import { getDefaultAppName } from '../project-name/support/index.mjs';
-import { packageJson } from '../../lib/index.mjs';
 import { loadStoredAppOptions } from '../app/support/index.mjs';
 import { JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, JHIPSTER_DOCUMENTATION_URL } from '../generator-constants.mjs';
 const { Validations: { MAX, MIN, MAXLENGTH, MINLENGTH, MAXBYTES, MINBYTES, PATTERN }, SUPPORTED_VALIDATION_RULES, } = validations;
@@ -44,22 +42,6 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
     }
-    get configuring() {
-        return this.asConfiguringTaskGroup({
-            defaults() {
-                if (!this.options.reproducible) {
-                    this.config.defaults({
-                        jhipsterVersion: packageJson.version,
-                        baseName: getDefaultAppName(this),
-                        creationTimestamp: new Date().getTime(),
-                    });
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.CONFIGURING]() {
-        return this.configuring;
-    }
     get preparing() {
         return this.asPreparingTaskGroup({
             preparing({ application, applicationDefaults }) {
@@ -76,9 +58,6 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
                     if (application.clientFrameworkVue) {
                         prettierExtensions = `${prettierExtensions},vue`;
                     }
-                    if (application.clientFrameworkSvelte) {
-                        prettierExtensions = `${prettierExtensions},svelte`;
-                    }
                 }
                 if (!application.skipServer) {
                     prettierExtensions = `${prettierExtensions},java`;
@@ -149,6 +128,16 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
             postPreparingEntities({ entities }) {
                 preparePostEntitiesCommonDerivedProperties(entities);
             },
+            checkProperties({ entities }) {
+                for (const entity of entities) {
+                    const properties = [...entity.fields.map(entity => entity.propertyName), ...entity.relationships.map(rel => rel.propertyName)];
+                    if (new Set(properties).size !== properties.length) {
+                        // Has duplicated properties.
+                        const duplicated = [...new Set(properties.filter((v, i, a) => a.indexOf(v) !== i))];
+                        throw new Error(`You have duplicate properties in entity ${entity.name}: ${duplicated.join(', ')}`);
+                    }
+                }
+            },
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {

package/dist/generators/bootstrap-application-base/command.mjs

@@ -0,0 +1,30 @@
+import { parseCreationTimestamp } from '../base/support/timestamp.mjs';
+const command = {
+    options: {
+        baseName: {
+            description: 'Application base name',
+            type: String,
+            scope: 'storage',
+        },
+        skipJhipsterDependencies: {
+            description: "Don't write jhipster dependencies to package.json.",
+            type: Boolean,
+            scope: 'storage',
+        },
+        creationTimestamp: {
+            description: 'Project creation timestamp (used for reproducible builds)',
+            type: parseCreationTimestamp,
+            scope: 'storage',
+        },
+    },
+    configs: {
+        jdlStore: {
+            description: 'JDL store',
+            cli: {
+                type: String,
+            },
+            scope: 'storage',
+        },
+    },
+};
+export default command;

package/dist/generators/bootstrap-application-base/generator.mjs

@@ -21,6 +21,7 @@ import os from 'os';
 import * as _ from 'lodash-es';
 import chalk from 'chalk';
 import { passthrough } from '@yeoman/transform';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { addFakerToEntity, loadEntitiesAnnotations, loadEntitiesOtherSide, stringifyApplicationData, prepareEntity as prepareEntityForTemplates, prepareField as prepareFieldForTemplates, prepareRelationship, } from '../base-application/support/index.mjs';
 import { createUserEntity } from './utils.mjs';
@@ -29,6 +30,8 @@ import { GENERATOR_BOOTSTRAP, GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_CO
 import { packageJson } from '../../lib/index.mjs';
 import { loadLanguagesConfig } from '../languages/support/index.mjs';
 import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../app/support/index.mjs';
+import { exportJDLTransform, importJDLTransform } from './support/index.mjs';
+import command from './command.mjs';
 const isWin32 = os.platform() === 'win32';
 const { lowerFirst } = _;
 export default class BootstrapApplicationBase extends BaseApplicationGenerator {
@@ -45,7 +48,8 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
         }
-        await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
+        const projectNameGenerator = (await this.dependsOnJHipster(GENERATOR_PROJECT_NAME));
+        projectNameGenerator.javaApplication = true;
         await this.composeWithJHipster(GENERATOR_BOOTSTRAP);
     }
     get initializing() {
@@ -53,6 +57,19 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
             displayLogo() {
                 this.printDestinationInfo();
             },
+            parseOptions() {
+                this.parseJHipsterCommand(command);
+            },
+            async jdlStore() {
+                if (this.jhipsterConfig.jdlStore) {
+                    this.logger.warn('Storing configuration inside a JDL file is experimental');
+                    this.logger.info(`Using JDL store ${this.jhipsterConfig.jdlStore}`);
+                    const destinationPath = this.destinationPath();
+                    const jdlStorePath = this.destinationPath(this.jhipsterConfig.jdlStore);
+                    this.features.commitTransformFactory = () => exportJDLTransform({ destinationPath, jdlStorePath });
+                    await this.pipeline({ refresh: true, pendingFiles: false }, importJDLTransform({ destinationPath, jdlStorePath }));
+                }
+            },
         });
     }
     get [BaseApplicationGenerator.INITIALIZING]() {
@@ -112,9 +129,14 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     get configuringEachEntity() {
         return this.asConfiguringEachEntityTaskGroup({
             configureEntity({ entityStorage, entityConfig }) {
-                entityStorage.defaults({ fields: [], relationships: [] });
-                if (entityConfig.changelogDate === undefined) {
-                    entityConfig.changelogDate = this.dateFormatForLiquibase();
+                entityStorage.defaults({ fields: [], relationships: [], annotations: {} });
+                if (entityConfig.changelogDate) {
+                    entityConfig.annotations.changelogDate = entityConfig.changelogDate;
+                    delete entityConfig.changelogDate;
+                }
+                if (!entityConfig.annotations.changelogDate) {
+                    entityConfig.annotations.changelogDate = this.dateFormatForLiquibase();
+                    entityStorage.save();
                 }
             },
             configureRelationships({ entityName, entityStorage, entityConfig }) {
@@ -171,8 +193,9 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
                         }
                     }
                     else {
-                        const entity = entityStorage.getAll();
+                        let entity = entityStorage.getAll();
                         entity.name = entity.name ?? entityName;
+                        entity = { ...entity, ...entity.annotations };
                         this.sharedData.setEntity(entityName, entity);
                     }
                 }
@@ -243,18 +266,20 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
                         }
                     }
                 };
-                this.queueTransformStream(passthrough(file => {
-                    if (file.contents && isPackageJson(file)) {
+                this.queueTransformStream({
+                    name: 'updating package.json dependencies versions',
+                    filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && isPackageJson(file),
+                    refresh: false,
+                }, passthrough(file => {
+                    const contents = file.contents.toString();
+                    if (contents.includes('null')) {
                         const content = JSON.parse(file.contents.toString());
                         populateNullValues(content.dependencies);
                         populateNullValues(content.devDependencies);
                         populateNullValues(content.peerDependencies);
                         file.contents = Buffer.from(`${JSON.stringify(content, null, 2)}\n`);
                     }
-                }), {
-                    name: 'updating package.json dependency versions',
-                    streamOptions: { filter: isPackageJson },
-                });
+                }));
             },
         });
     }

package/dist/generators/bootstrap-application-base/index.mjs

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export { default } from './generator.mjs';
+export { default as command } from './command.mjs';

package/dist/generators/bootstrap-application-base/support/export-jdl-transform.mjs

@@ -0,0 +1,61 @@
+import { basename, join } from 'path';
+import { Duplex } from 'stream';
+import { loadFile } from 'mem-fs';
+import { Minimatch } from 'minimatch';
+import { setModifiedFileState } from 'mem-fs-editor/state';
+import { GENERATOR_JHIPSTER } from '../../generator-constants.mjs';
+import { getJDLObjectFromSingleApplication } from '../../../jdl/converters/json-to-jdl-converter.js';
+export const exportJDLTransform = ({ destinationPath, jdlStorePath, throwOnMissingConfig = true, keepEntitiesConfig, }) => Duplex.from(async function* (files) {
+    const yoRcFilePath = join(destinationPath, '.yo-rc.json');
+    const entitiesMatcher = new Minimatch(`${destinationPath}/.jhipster/*.json`);
+    const entitiesFiles = [];
+    const entitiesMap = new Map();
+    let yoRcFileInMemory;
+    let jdlStoreFileInMemory;
+    for await (const file of files) {
+        if (file.path === yoRcFilePath) {
+            yoRcFileInMemory = file;
+        }
+        else if (file.path === jdlStorePath) {
+            jdlStoreFileInMemory = file;
+        }
+        else if (file.contents && entitiesMatcher.match(file.path)) {
+            entitiesMap.set(basename(file.path).replace('.json', ''), JSON.parse(file.contents.toString()));
+            entitiesFiles.push(file);
+        }
+        else {
+            yield file;
+        }
+    }
+    const yoRcFile = loadFile(yoRcFilePath);
+    const yoRcContents = yoRcFileInMemory?.contents ?? yoRcFile.contents;
+    if (yoRcContents) {
+        const contents = JSON.parse(yoRcContents.toString());
+        if (contents[GENERATOR_JHIPSTER]?.jdlStore) {
+            const { jdlStore, jwtSecretKey, rememberMeKey, jhipsterVersion, creationTimestamp, incrementalChangelog, ...rest } = contents[GENERATOR_JHIPSTER];
+            const jdlObject = getJDLObjectFromSingleApplication({ ...contents, [GENERATOR_JHIPSTER]: { ...rest, incrementalChangelog } }, entitiesMap);
+            const jdlContents = jdlObject.toString();
+            const jdlStoreFile = jdlStoreFileInMemory ?? loadFile(jdlStorePath);
+            jdlStoreFile.contents = Buffer.from(jdlContents);
+            setModifiedFileState(jdlStoreFile);
+            jdlStoreFile.conflicter = 'force';
+            yield jdlStoreFile;
+            yoRcFile.contents = Buffer.from(JSON.stringify({ [GENERATOR_JHIPSTER]: { jdlStore, jwtSecretKey, rememberMeKey, jhipsterVersion, creationTimestamp } }, null, 2));
+            setModifiedFileState(yoRcFile);
+            yoRcFile.conflicter = 'force';
+            yield yoRcFile;
+            // Incremental changelog requires entities files to be kept for incremental change at next run
+            if (keepEntitiesConfig || incrementalChangelog) {
+                for (const file of entitiesFiles) {
+                    yield file;
+                }
+            }
+        }
+        else if (throwOnMissingConfig) {
+            throw new Error(`File ${yoRcFilePath} is not a valid JHipster configuration file`);
+        }
+    }
+    else if (throwOnMissingConfig) {
+        throw new Error(`File ${yoRcFilePath} has no contents`);
+    }
+});

package/dist/generators/bootstrap-application-base/support/import-jdl-transform.mjs

@@ -0,0 +1,64 @@
+import { Duplex } from 'stream';
+import { join } from 'path';
+import { loadFile } from 'mem-fs';
+import { Minimatch } from 'minimatch';
+import { upperFirst } from 'lodash-es';
+import { GENERATOR_JHIPSTER } from '../../generator-constants.mjs';
+import { createImporterFromContent } from '../../../jdl/jdl-importer.js';
+import { mergeYoRcContent } from '../../../jdl/index.js';
+export const importJDLTransform = ({ destinationPath, jdlStorePath }) => Duplex.from(async function* (files) {
+    const yoRcFilePath = join(destinationPath, '.yo-rc.json');
+    const entitiesFolder = join(destinationPath, '.jhipster');
+    const entitiesMatcher = new Minimatch(`${entitiesFolder}/*.json`);
+    const entityFields = [];
+    let jdlStoreFileInMemory;
+    let yoRcFileInMemory;
+    for await (const file of files) {
+        if (file.path === jdlStorePath) {
+            jdlStoreFileInMemory = file;
+            yield jdlStoreFileInMemory;
+        }
+        else if (file.path === yoRcFilePath) {
+            yoRcFileInMemory = file;
+        }
+        else if (entitiesMatcher.match(file.path)) {
+            entityFields.push(file);
+        }
+        else {
+            yield file;
+        }
+    }
+    const jdlStoreContents = jdlStoreFileInMemory?.contents ?? loadFile(jdlStorePath).contents;
+    if (!jdlStoreContents) {
+        if (yoRcFileInMemory) {
+            yield yoRcFileInMemory;
+        }
+        for (const file of entityFields) {
+            yield file;
+        }
+        return;
+    }
+    if (entityFields.length > 0) {
+        throw new Error('Entities configuration files are not supported by jdlStore');
+    }
+    const importer = createImporterFromContent(jdlStoreContents.toString());
+    const importState = importer.import();
+    const applicationWithEntities = Object.values(importState.exportedApplicationsWithEntities);
+    if (applicationWithEntities.length !== 1) {
+        throw new Error(`JDL stores supports only jdls  with 1 application, found ${applicationWithEntities.length}`);
+    }
+    const { config, namespaceConfigs, entities } = applicationWithEntities[0];
+    const yoRcFile = loadFile(yoRcFilePath);
+    const yoRcContents = yoRcFileInMemory?.contents ?? yoRcFile.contents;
+    yoRcFile.contents = Buffer.from(JSON.stringify(mergeYoRcContent(yoRcContents ? JSON.parse(yoRcContents.toString()) : {}, {
+        ...namespaceConfigs,
+        [GENERATOR_JHIPSTER]: config,
+    }), null, 2));
+    yield yoRcFile;
+    for (const entity of entities) {
+        const configFile = join(entitiesFolder, `${upperFirst(entity.name)}.json`);
+        const file = loadFile(configFile);
+        file.contents = Buffer.from(JSON.stringify(entity, null, 2));
+        yield file;
+    }
+});

package/dist/generators/bootstrap-application-base/support/index.mjs

@@ -0,0 +1,2 @@
+export * from './export-jdl-transform.mjs';
+export * from './import-jdl-transform.mjs';

package/dist/generators/bootstrap-application-server/generator.mjs

@@ -122,10 +122,10 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
             prepareEntity({ entity }) {
                 prepareEntityServerForTemplates(entity);
             },
-            preparePrimaryKey({ entity }) {
+            preparePrimaryKey({ entity, application }) {
                 // If primaryKey doesn't exist, create it.
                 if (!entity.embedded && !entity.primaryKey) {
-                    prepareEntityPrimaryKeyForTemplates(entity, this);
+                    prepareEntityPrimaryKeyForTemplates.call(this, { entity, application });
                 }
             },
         });

package/dist/generators/client/command.mjs

@@ -20,6 +20,7 @@ import chalk from 'chalk';
 import * as _ from 'lodash-es';
 import { testFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, clientFrameworkTypes } from '../../jdl/index.js';
+import { GENERATOR_COMMON } from '../generator-list.mjs';
 const { CYPRESS } = testFrameworkTypes;
 const { intersection } = _;
 const { ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
@@ -116,5 +117,6 @@ const command = {
             },
         },
     },
+    import: [GENERATOR_COMMON],
 };
 export default command;

package/dist/generators/client/resources/package.json

@@ -3,14 +3,14 @@
     "dayjs": "1.11.10"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.3",
+    "@cypress/code-coverage": "3.12.13",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.3.1",
+    "cypress": "13.6.1",
     "cypress-audit": "1.1.0",
     "eslint-plugin-cypress": "2.15.1",
-    "lighthouse": "11.2.0",
+    "lighthouse": "11.3.0",
     "nyc": "15.1.0",
-    "swagger-ui-dist": "5.9.0"
+    "swagger-ui-dist": "5.10.3"
   }
 }

package/dist/generators/client/support/entity-definition.mjs

@@ -34,14 +34,14 @@ const { ANGULAR, VUE } = clientFrameworkTypes;
  * @param {string} dto - dto
  * @param [customDateType]
  * @param {boolean} embedded - either the actual entity is embedded or not
- * @param { string} clientFramwork
+ * @param { string} clientFramework
  * @returns variablesWithTypes: Array
  */
-const generateEntityClientFields = (primaryKey, fields, relationships, dto, customDateType = 'dayjs.Dayjs', embedded = false, clientFramwork = ANGULAR) => {
+const generateEntityClientFields = (primaryKey, fields, relationships, dto, customDateType = 'dayjs.Dayjs', embedded = false, clientFramework = ANGULAR) => {
     const variablesWithTypes = [];
     if (!embedded && primaryKey) {
         const tsKeyType = getTypescriptKeyType(primaryKey);
-        if (clientFramwork === VUE) {
+        if (clientFramework === VUE) {
             variablesWithTypes.push(`id?: ${tsKeyType}`);
         }
     }

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

@@ -109,7 +109,7 @@ The service worker initialization code is commented out by default. To enable it
 Note: [Workbox](https://developers.google.com/web/tools/workbox/) powers JHipster's service worker. It dynamically generates the `service-worker.js` file.
   <%_ } _%>
   <%_ if (clientFrameworkAngular) { _%>
-The service worker initialization code is disabled by default. To enable it, uncomment the following code in `<%= clientSrcDir %>app/app.module.ts`:
+The service worker initialization code is disabled by default. To enable it, uncomment the following code in `<%= clientSrcDir %>app/app.config.ts`:
 
 ```typescript
 ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
@@ -132,7 +132,7 @@ To benefit from TypeScript type definitions from [DefinitelyTyped][] repository
 
 Then you would import the JS and CSS files specified in library's installation instructions so that [Webpack][] knows about them:
   <%_ if (clientFrameworkAngular) { _%>
-Edit [<%= clientSrcDir %>app/app.module.ts](<%= clientSrcDir %>app/app.module.ts) file:
+Edit [<%= clientSrcDir %>app/app.config.ts](<%= clientSrcDir %>app/app.config.ts) file:
 
 ```
 import 'leaflet/dist/leaflet.js';

package/dist/generators/client/templates/src/main/webapp/content/css/loading.css.ejs

@@ -151,7 +151,7 @@
   left: -8px;
   width: 24px;
   height: 10px;
-  background-image: url('../images/logo-jhipster.png');
+  background-image: url('/content/images/logo-jhipster.png');
   background-size: contain;
   -webkit-animation: lds-pacman-3 1s linear infinite;
   animation: lds-pacman-3 1.5s linear infinite;

package/dist/generators/client/templates/src/main/webapp/index.html.ejs

@@ -43,7 +43,7 @@
       </p>
     <![endif]-->
 <%_ if (clientFrameworkAngular) { _%>
-    <<%= jhiPrefixDashed %>-main>
+    <<%= jhiPrefixDashed %>-app>
 <%_ } else { _%>
     <div id="<% if (clientFrameworkReact) { %>root<% } else { %>app<% } %>">
 <%_ } _%>
@@ -95,7 +95,7 @@
         </div>
       </div>
     <%_ if (clientFrameworkAngular) { _%>
-    </<%= jhiPrefixDashed %>-main>
+    </<%= jhiPrefixDashed %>-app>
     <%_ } else { _%>
     </div>
     <%_ } _%>

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

@@ -20,6 +20,7 @@
  // Register sections and max allowed fragments, 0 for unlimited.
  fragments.registerSections({
    importsSection:0,
+   configSection: 0,
    moduleFederationSection: 0,
    pluginsSection: 0,
  });
@@ -28,7 +29,18 @@ _&>
 const ModuleFederationPlugin = require('webpack/lib/container/ModuleFederationPlugin');
 <&- fragments.importsSection() &>
 const packageJson = require('../package.json');
-const appVersion = packageJson.version;
+// Microfrontend api, should match across gateway and microservices.
+const apiVersion = '0.0.1';
+
+const sharedDefaults = { singleton: true, strictVersion: true, requiredVersion: apiVersion };
+const shareMappings = (...mappings) => Object.fromEntries(mappings.map(map => [map, { ...sharedDefaults, version: apiVersion }]));
+
+const shareDependencies = ({ skipList = [] } = {}) =>
+  Object.fromEntries(
+    Object.entries(packageJson.dependencies)
+      .filter(([dependency]) => !skipList.includes(dependency))
+      .map(([dependency, version]) => [dependency, { ...sharedDefaults, version, requiredVersion: version }]),
+  );
 
 module.exports = ({ serve }) => {
   return {
@@ -37,6 +49,7 @@ module.exports = ({ serve }) => {
       chunkIds: 'named',
       runtimeChunk: false,
     },
+<&- fragments.configSection() &>
     plugins: [
       new ModuleFederationPlugin({
 <%_ if (applicationTypeMicroservice) { _%>

package/dist/generators/common/command.mjs

@@ -1,3 +1,4 @@
+import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.mjs';
 const command = {
     options: {
         prettierTabWidth: {
@@ -11,5 +12,6 @@ const command = {
             scope: 'storage',
         },
     },
+    import: [GENERATOR_BOOTSTRAP_APPLICATION_BASE],
 };
 export default command;

package/dist/generators/common/files.mjs

@@ -41,7 +41,7 @@ export const commonFiles = {
     commitHooks: [
         {
             condition: generator => !generator.skipCommitHook,
-            templates: ['.lintstagedrc.js', '.husky/pre-commit'],
+            templates: ['.lintstagedrc.cjs', '.husky/pre-commit'],
         },
     ],
 };