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

package/dist/generators/openapi-client/generator.mjs

@@ -25,6 +25,9 @@ import { askActionType, askExistingAvailableDocs, askGenerationInfos } from './p
 import { writeFiles, customizeFiles } from './files.mjs';
 import { openapiOptions } from '../../jdl/jhipster/index.mjs';
 import { createPomStorage } from '../maven/support/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
+import { loadLanguagesConfig } from '../languages/support/index.mjs';
 const { OpenAPIOptionsNames, OpenAPIDefaultValues } = openapiOptions;
 export default class OpenapiClientGenerator extends BaseGenerator {
     constructor(args, options, features) {
@@ -49,12 +52,13 @@ export default class OpenapiClientGenerator extends BaseGenerator {
             },
             getConfig() {
                 this.openApiClients = this.config.get('openApiClients') || {};
-                this.loadAppConfig();
-                this.loadServerConfig();
-                this.loadTranslationConfig();
-                this.loadPlatformConfig();
-                this.loadDerivedAppConfig();
-                this.loadDerivedServerConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadLanguagesConfig({ application: this, config: this.jhipsterConfigWithDefaults });
+                loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadDerivedAppConfig({ application: this });
+                loadDerivedPlatformConfig({ application: this });
+                loadDerivedServerConfig({ application: this });
             },
         };
     }
@@ -127,7 +131,7 @@ export default class OpenapiClientGenerator extends BaseGenerator {
                     const generatorName = this.clientsToGenerate[cliName].generatorName;
                     const { stdout, stderr } = shelljs.exec(`${this.clientPackageManager} run openapi-client:${cliName}`, { silent: this.silent });
                     if (!stderr) {
-                        this.success(`Succesfully generated ${cliName} ${generatorName} client`);
+                        this.log.ok(`Succesfully generated ${cliName} ${generatorName} client`);
                     }
                     else {
                         this.log.error(`Something went wrong while generating client ${cliName}: ${stdout} ${stderr}`);
@@ -178,4 +182,17 @@ export default class OpenapiClientGenerator extends BaseGenerator {
             additionalContent: other,
         });
     }
+    /**
+     * @private
+     * Rewrite the specified file with provided content at the needle location
+     *
+     * @param {string} filePath - path of the source file to rewrite
+     * @param {string} needle - needle to look for where content will be inserted
+     * @param {string} content - content to be written
+     * @returns {boolean} true if the body has changed.
+     */
+    rewriteFile(filePath, needle, content) {
+        const rewriteFileModel = this.needleApi.base.generateFileModel(filePath, needle, content);
+        return this.needleApi.base.addBlockContentToFile(rewriteFileModel);
+    }
 }

package/dist/generators/openshift/generator.mjs

@@ -20,14 +20,19 @@
 import chalk from 'chalk';
 import shelljs from 'shelljs';
 import runAsync from 'run-async';
-import BaseDockerGenerator from '../base-docker/index.mjs';
+import BaseWorkspacesGenerator from '../base-workspaces/index.mjs';
 import prompts from './prompts.mjs';
 import { GENERATOR_OPENSHIFT } from '../generator-list.mjs';
-import { loadFromYoRc, checkImages, generateJwtSecret, configureImageNames, setAppsFolderPaths } from '../base-docker/docker-base.mjs';
+import { loadFromYoRc, checkImages, generateJwtSecret, configureImageNames } from '../base-workspaces/internal/docker-base.mjs';
 import { setupKubernetesConstants } from '../kubernetes/kubernetes-base.mjs';
 import statistics from '../statistics.mjs';
 import { applicationTypes, databaseTypes, messageBrokerTypes, monitoringTypes, openshiftPlatformTypes, searchEngineTypes, serviceDiscoveryTypes, } from '../../jdl/jhipster/index.mjs';
 import { writeFiles } from './files.mjs';
+import { getJdbcUrl } from '../spring-data-relational/support/index.mjs';
+import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.mjs';
+import { checkDocker } from '../docker/support/index.mjs';
+import { loadDerivedServerConfig } from '../server/support/index.mjs';
+import { loadDerivedAppConfig } from '../app/support/index.mjs';
 const { KAFKA } = messageBrokerTypes;
 const { PROMETHEUS } = monitoringTypes;
 const { ELASTICSEARCH } = searchEngineTypes;
@@ -40,9 +45,9 @@ const { EPHEMERAL, PERSISTENT } = StorageTypes;
 /* eslint-disable consistent-return */
 /**
  * @class
- * @extends {BaseDockerGenerator}
+ * @extends {BaseWorkspacesGenerator}
  */
-export default class OpenshiftGenerator extends BaseDockerGenerator {
+export default class OpenshiftGenerator extends BaseWorkspacesGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_OPENSHIFT);
@@ -54,7 +59,8 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
                 this.log.log(chalk.white(`${chalk.bold('⭕')} [*BETA*] Welcome to the JHipster OpenShift Generator ${chalk.bold('⭕')}`));
                 this.log.log(chalk.white(`Files will be generated in folder: ${chalk.yellow(this.destinationRoot())} or in the root directory path that you select in the subsequent step`));
             },
-            ...super.initializing,
+            loadDockerDependenciesTask,
+            checkDocker,
             checkOpenShift: runAsync(function () {
                 if (this.skipChecks)
                     return;
@@ -77,7 +83,7 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             setupKubernetesConstants,
         };
     }
-    get [BaseDockerGenerator.INITIALIZING]() {
+    get [BaseWorkspacesGenerator.INITIALIZING]() {
         return this.delegateTasksToBlueprint(() => this.initializing);
     }
     get prompting() {
@@ -94,7 +100,7 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             askForDockerPushCommand: prompts.askForDockerPushCommand,
         };
     }
-    get [BaseDockerGenerator.PROMPTING]() {
+    get [BaseWorkspacesGenerator.PROMPTING]() {
         return this.delegateTasksToBlueprint(() => this.prompting);
     }
     get configuring() {
@@ -105,7 +111,6 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             checkImages,
             generateJwtSecret,
             configureImageNames,
-            setAppsFolderPaths,
             // place holder for future changes (may be prompt or something else)
             setRegistryReplicas() {
                 this.registryReplicas = 2;
@@ -136,30 +141,28 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             },
         };
     }
-    get [BaseDockerGenerator.CONFIGURING]() {
+    get [BaseWorkspacesGenerator.CONFIGURING]() {
         return this.delegateTasksToBlueprint(() => this.configuring);
     }
     get loading() {
         return {
             loadSharedConfig() {
                 this.appConfigs.forEach(element => {
-                    this.loadAppConfig(element, element);
-                    this.loadServerConfig(element, element);
-                    this.loadDerivedAppConfig(element);
-                    this.loadDerivedServerConfig(element);
+                    loadDerivedAppConfig({ application: element });
+                    loadDerivedServerConfig({ application: element });
                 });
-                this.loadDeploymentConfig(this);
+                loadDeploymentConfig.call(this);
                 this._loadDerivedOpenshiftConfig(this);
             },
         };
     }
-    get [BaseDockerGenerator.LOADING]() {
+    get [BaseWorkspacesGenerator.LOADING]() {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
     get writing() {
         return writeFiles();
     }
-    get [BaseDockerGenerator.WRITING]() {
+    get [BaseWorkspacesGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
     get end() {
@@ -224,11 +227,21 @@ export default class OpenshiftGenerator extends BaseDockerGenerator {
             },
         };
     }
-    get [BaseDockerGenerator.END]() {
+    get [BaseWorkspacesGenerator.END]() {
         return this.delegateTasksToBlueprint(() => this.end);
     }
     _loadDerivedOpenshiftConfig(dest = this) {
         dest.storageTypeEphemeral = dest.storageType === EPHEMERAL;
         dest.storageTypePersistent = dest.storageType === PERSISTENT;
     }
+    /**
+     * @private
+     * Returns the JDBC URL for a databaseType
+     *
+     * @param {string} databaseType
+     * @param {*} options: databaseName, and required infos that depends of databaseType (hostname, localDirectory, ...)
+     */
+    getJDBCUrl(databaseType, options = {}) {
+        return getJdbcUrl(databaseType, options);
+    }
 }

package/dist/generators/openshift/prompts.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { databaseTypes, monitoringTypes, searchEngineTypes, openshiftPlatformTypes } from '../../jdl/jhipster/index.mjs';
-import dockerPrompts from '../base-docker/docker-prompts.mjs';
+import dockerPrompts from '../base-workspaces/internal/docker-prompts.mjs';
 const { ELASTICSEARCH } = searchEngineTypes;
 const { PROMETHEUS } = monitoringTypes;
 const { StorageTypes } = openshiftPlatformTypes;
@@ -46,7 +46,7 @@ export async function askForStorageType() {
     if (this.regenerate)
         return;
     let storageEnabled = false;
-    this.appConfigs.some((appConfig, index) => {
+    this.appConfigs.some(appConfig => {
         if (appConfig.prodDatabaseType !== NO_DATABASE || appConfig.searchEngine === ELASTICSEARCH || appConfig.monitoring === PROMETHEUS) {
             storageEnabled = true;
             return storageEnabled;

package/dist/generators/page/generator.mjs

@@ -50,7 +50,6 @@ export default class PageGenerator extends BaseApplicationGenerator {
         }
         this.pageName = this.options.pageName;
         this.page = this.options.page || {};
-        this.loadRuntimeOptions();
     }
     async beforeQueue() {
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);

package/dist/generators/project-name/generator.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 /* eslint-disable consistent-return */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { getDefaultAppName } from './support/index.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_PROJECT_NAME } from '../generator-list.mjs';
@@ -36,10 +36,7 @@ export default class ProjectNameGenerator extends BaseApplicationGenerator {
             }
         }
         this.sharedData.getControl().existingProject =
-            this.options.defaults ||
-                this.options.withEntities ||
-                this.options.applicationWithConfig ||
-                (this.jhipsterConfig.baseName !== undefined && this.config.existed);
+            this.options.defaults || this.options.applicationWithConfig || (this.jhipsterConfig.baseName !== undefined && this.config.existed);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_PROJECT_NAME);
         }

package/dist/generators/project-name/support/name-resolver.mjs

@@ -20,7 +20,7 @@ import path from 'path';
 import { isReproducible } from '../../base/support/index.mjs';
 const getDefaultName = generator => {
     const defaultName = 'jhipster';
-    if (isReproducible(generator)) {
+    if (generator && isReproducible(generator)) {
         return defaultName;
     }
     return /^[a-zA-Z0-9_-]+$/.test(path.basename(process.cwd()))

package/dist/generators/react/entity-files-react.mjs

@@ -16,42 +16,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationBlock } from '../client/utils.mjs';
+import { clientApplicationTemplatesBlock } from '../client/support/files.mjs';
 export const reactFiles = {
     client: [
         {
             condition: generator => !generator.embedded,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
-                'entities/_entityFolder/_entityFile-detail.tsx',
-                'entities/_entityFolder/_entityFile.tsx',
-                'entities/_entityFolder/_entityFile.reducer.ts',
-                'entities/_entityFolder/index.tsx',
+                'entities/_entityFolder_/_entityFile_-detail.tsx',
+                'entities/_entityFolder_/_entityFile_.tsx',
+                'entities/_entityFolder_/_entityFile_.reducer.ts',
+                'entities/_entityFolder_/index.tsx',
             ],
         },
         {
-            ...clientApplicationBlock,
-            renameTo: (data, filepath) => `${data.clientSrcDir}app/shared/model/${data.entityModelFileName}.model.ts`,
-            templates: ['entities/_entityFolder/_entityModel.model.ts'],
+            ...clientApplicationTemplatesBlock(),
+            renameTo: data => `${data.clientSrcDir}app/shared/model/${data.entityModelFileName}.model.ts`,
+            templates: ['entities/_entityFolder_/_entityModel_.model.ts'],
         },
         {
             condition: generator => !generator.readOnly && !generator.embedded,
-            ...clientApplicationBlock,
-            templates: ['entities/_entityFolder/_entityFile-delete-dialog.tsx', 'entities/_entityFolder/_entityFile-update.tsx'],
+            ...clientApplicationTemplatesBlock(),
+            templates: ['entities/_entityFolder_/_entityFile_-delete-dialog.tsx', 'entities/_entityFolder_/_entityFile_-update.tsx'],
         },
     ],
     test: [
         {
             condition: generator => !generator.embedded,
-            ...clientApplicationBlock,
-            templates: ['entities/_entityFolder/_entityFile-reducer.spec.ts'],
+            ...clientApplicationTemplatesBlock(),
+            templates: ['entities/_entityFolder_/_entityFile_-reducer.spec.ts'],
         },
     ],
 };
-export async function writeEntitiesFiles({ application, entities, control }) {
-    if (!application.enableTranslation) {
-        await control.loadClientTranslations?.();
-    }
+export async function writeEntitiesFiles({ application, entities }) {
     for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) {
         await this.writeFiles({
             sections: reactFiles,

package/dist/generators/react/files-react.mjs

@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { clientApplicationBlock, clientSrcBlock } from '../client/utils.mjs';
+import { clientApplicationTemplatesBlock, clientRootTemplatesBlock, clientSrcTemplatesBlock } from '../client/support/files.mjs';
 export const files = {
     common: [
-        {
+        clientRootTemplatesBlock({
             templates: [
                 'package.json',
                 '.eslintrc.json',
@@ -33,16 +33,16 @@ export const files = {
                 'webpack/utils.js',
                 'webpack/logo-jhipster.png',
             ],
-        },
+        }),
     ],
     sass: [
-        {
+        clientRootTemplatesBlock({
             templates: ['postcss.config.js'],
-        },
+        }),
     ],
     reactApp: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'app.tsx',
                 'index.tsx',
@@ -61,48 +61,48 @@ export const files = {
         },
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['config/translation.ts'],
         },
         {
             condition: generator => generator.communicationSpringWebsocket,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['config/websocket-middleware.ts'],
         },
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['app.scss', '_bootstrap-variables.scss'],
         },
     ],
     reactEntities: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['entities/reducers.ts', 'entities/menu.tsx', 'entities/routes.tsx'],
         },
     ],
     reactMain: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['modules/home/home.tsx', 'modules/login/logout.tsx'],
         },
         {
             condition: generator => !generator.authenticationTypeOauth2,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['modules/login/login.tsx', 'modules/login/login-modal.tsx'],
         },
         {
             condition: generator => generator.authenticationTypeOauth2,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['modules/login/login-redirect.tsx'],
         },
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['modules/home/home.scss'],
         },
     ],
     reducers: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'shared/reducers/index.ts',
                 'shared/reducers/reducer.utils.ts',
@@ -112,19 +112,19 @@ export const files = {
         },
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['shared/reducers/locale.ts'],
         },
         {
             condition: generator => generator.authenticationTypeOauth2,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['shared/reducers/user-management.ts'],
         },
     ],
     accountModule: [
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'modules/account/index.tsx',
                 'modules/account/activate/activate.tsx',
@@ -142,13 +142,13 @@ export const files = {
         },
         {
             condition: generator => generator.authenticationTypeSession && generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['modules/account/sessions/sessions.tsx', 'modules/account/sessions/sessions.reducer.ts'],
         },
     ],
     adminModule: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'modules/administration/index.tsx',
                 'modules/administration/administration.reducer.ts',
@@ -158,7 +158,7 @@ export const files = {
         },
         {
             condition: generator => generator.withAdminUi,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'modules/administration/configuration/configuration.tsx',
                 'modules/administration/health/health.tsx',
@@ -169,12 +169,12 @@ export const files = {
         },
         {
             condition: generator => generator.communicationSpringWebsocket,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['modules/administration/tracker/tracker.tsx'],
         },
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'modules/administration/user-management/index.tsx',
                 'modules/administration/user-management/user-management.tsx',
@@ -186,13 +186,13 @@ export const files = {
         },
         {
             condition: generator => generator.applicationTypeGateway && generator.serviceDiscoveryAny,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['modules/administration/gateway/gateway.tsx'],
         },
     ],
     reactShared: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 // layouts
                 'shared/layout/footer/footer.tsx',
@@ -221,21 +221,21 @@ export const files = {
         },
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['shared/layout/menus/locale.tsx'],
         },
         {
             condition: generator => generator.authenticationTypeOauth2,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['shared/util/url-utils.ts'],
         },
         {
             condition: generator => generator.authenticationTypeSession && generator.communicationSpringWebsocket,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['shared/util/cookie-utils.ts'],
         },
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'shared/layout/header/header.scss',
                 'shared/layout/footer/footer.scss',
@@ -244,24 +244,24 @@ export const files = {
         },
     ],
     microfrontend: [
-        {
+        clientRootTemplatesBlock({
             condition: generator => generator.microfrontend,
             templates: ['webpack/webpack.microfrontend.js.jhi.react'],
-        },
+        }),
         {
             condition: generator => generator.microfrontend,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['main.tsx', 'shared/error/error-loading.tsx'],
         },
         {
             condition: generator => generator.microfrontend && generator.applicationTypeGateway,
-            ...clientSrcBlock,
+            ...clientSrcTemplatesBlock(),
             templates: ['microfrontends/entities-menu.tsx', 'microfrontends/entities-routes.tsx'],
         },
     ],
     clientTestFw: [
         {
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 'config/axios-interceptor.spec.ts',
                 'config/notification-middleware.spec.ts',
@@ -278,7 +278,7 @@ export const files = {
         },
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: [
                 // 'spec/app/modules/account/register/register.spec.tsx',
                 'modules/account/register/register.reducer.spec.ts',
@@ -289,27 +289,24 @@ export const files = {
         },
         {
             condition: generator => generator.generateUserManagement,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['modules/administration/user-management/user-management.reducer.spec.ts'],
         },
         {
             condition: generator => generator.enableTranslation,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['shared/reducers/locale.spec.ts'],
         },
         {
             condition: generator => generator.authenticationTypeOauth2,
-            ...clientApplicationBlock,
+            ...clientApplicationTemplatesBlock(),
             templates: ['shared/reducers/user-management.spec.ts'],
         },
     ],
 };
-export async function writeFiles({ application, control }) {
+export async function writeFiles({ application }) {
     if (!application.clientFrameworkReact)
         return;
-    if (!application.enableTranslation) {
-        await control.loadClientTranslations?.();
-    }
     await this.writeFiles({
         sections: files,
         context: application,

package/dist/generators/react/generator.mjs

@@ -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 { isFilePending } from 'mem-fs-editor/state';
 import chalk from 'chalk';
 import BaseApplicationGenerator from '../base-application/index.mjs';
@@ -28,6 +28,7 @@ import { prepareEntity } from './application/entities/index.mjs';
 import { fieldTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { generateEntityClientEnumImports as getClientEnumImportsFormat, generateEntityClientFields as getHydratedEntityClientFields, generateEntityClientImports as formatEntityClientImports, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, } from '../client/support/index.mjs';
 import { isTranslatedReactFile, translateReactFilesTransform } from './support/index.mjs';
+import { createNeedleCallback, upperFirstCamelCase } from '../base/support/index.mjs';
 const { CommonDBTypes } = fieldTypes;
 const TYPE_BOOLEAN = CommonDBTypes.BOOLEAN;
 const { REACT } = clientFrameworkTypes;
@@ -37,23 +38,13 @@ const { REACT } = clientFrameworkTypes;
  */
 export default class ReactGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
-        await this.dependsOnJHipster(GENERATOR_CLIENT);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_REACT);
         }
-    }
-    get composing() {
-        return this.asComposingTaskGroup({
-            async composing() {
-                const { enableTranslation } = this.jhipsterConfigWithDefaults;
-                if (!enableTranslation) {
-                    await this.composeWithJHipster(GENERATOR_LANGUAGES);
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.COMPOSING]() {
-        return this.asComposingTaskGroup(this.delegateTasksToBlueprint(() => this.composing));
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_CLIENT);
+            await this.dependsOnJHipster(GENERATOR_LANGUAGES);
+        }
     }
     get loading() {
         return this.asLoadingTaskGroup({
@@ -67,8 +58,16 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     }
     get preparing() {
         return this.asPreparingTaskGroup({
-            prepareForTemplates({ application }) {
+            prepareForTemplates({ application, source }) {
                 application.webappEnumerationsDir = `${application.clientSrcDir}app/shared/model/enumerations/`;
+                source.addWebpackConfig = args => {
+                    const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`;
+                    const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
+                    this.editFile(webpackPath, { ignoreNonExisting }, createNeedleCallback({
+                        needle: 'jhipster-needle-add-webpack-config',
+                        contentToAdd: `,${args.config}`,
+                    }));
+                };
             },
         });
     }
@@ -221,4 +220,11 @@ export default class ReactGenerator extends BaseApplicationGenerator {
     addAppSCSSStyle(style, comment) {
         this.needleApi.clientReact.addAppSCSSStyle(style, comment);
     }
+    /**
+     * get the an upperFirst camelCase value.
+     * @param {string} value string to convert
+     */
+    upperFirstCamelCase(value) {
+        return upperFirstCamelCase(value);
+    }
 }