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

package/dist/generators/azure-app-service/generator.mjs

@@ -19,6 +19,7 @@
 /* eslint-disable consistent-return */
 import fs from 'fs';
 import { exec } from 'child_process';
+import os from 'os';
 import chalk from 'chalk';
 import runAsync from 'run-async';
 import BaseGenerator from '../base/index.mjs';
@@ -28,7 +29,11 @@ import { JAVA_VERSION, SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
 import { GENERATOR_AZURE_APP_SERVICE } from '../generator-list.mjs';
 import { buildToolTypes } from '../../jdl/jhipster/index.mjs';
 import { mavenPluginConfiguration } from './templates.mjs';
-const { MAVEN } = buildToolTypes;
+import { buildApplication } from '../server/internal/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedServerConfig, loadServerConfig } from '../server/support/index.mjs';
+const isWin32 = os.platform() === 'win32';
+const { MAVEN, GRADLE } = buildToolTypes;
 // Local constants
 const AZURE_WEBAPP_MAVEN_PLUGIN_VERSION = '1.8.0';
 const AZURE_WEBAPP_RUNTIME = 'JAVA|11-java11';
@@ -67,8 +72,8 @@ export default class AzureAppServiceGenerator extends BaseGenerator {
                 this.log.log(chalk.bold('Azure App Service configuration is starting'));
             },
             getSharedConfig() {
-                this.loadAppConfig();
-                this.loadServerConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
             },
             getConfig() {
                 this.azureAppServiceResourceGroupName = ''; // This is not saved, as it is better to get the Azure default variable
@@ -101,7 +106,7 @@ export default class AzureAppServiceGenerator extends BaseGenerator {
                 if (this.abort)
                     return;
                 const done = this.async();
-                exec('az --version', err => {
+                exec('az --version', () => {
                     done(new Error(`You don't have the Azure CLI installed.
           Download it from:
           ${chalk.red('https://docs.microsoft.com/en-us/cli/azure/install-azure-cli/?WT.mc_id=generator-jhipster-judubois')}`));
@@ -264,7 +269,7 @@ export default class AzureAppServiceGenerator extends BaseGenerator {
                 const done = this.async();
                 this.log.log(chalk.bold(`\nChecking Azure App Service plan '${this.azureAppServicePlan}'...`));
                 let servicePlanAlreadyExists = false;
-                exec(`az appservice plan list --resource-group ${this.azureAppServiceResourceGroupName}`, (err, stdout, stderr) => {
+                exec(`az appservice plan list --resource-group ${this.azureAppServiceResourceGroupName}`, (err, stdout) => {
                     if (err) {
                         this.abort = true;
                         throw new Error('Could not list your Azure App Service plans');
@@ -307,7 +312,7 @@ which is free for the first 30 days`);
                     return;
                 const done = this.async();
                 this.log.log(chalk.bold(`\nChecking Azure App Service '${this.azureAppServiceName}'...`));
-                exec(`az webapp list --query "[]" --resource-group ${this.azureAppServiceResourceGroupName}`, (err, stdout, stderr) => {
+                exec(`az webapp list --query "[]" --resource-group ${this.azureAppServiceResourceGroupName}`, (err, stdout) => {
                     if (err) {
                         this.abort = true;
                         throw new Error('Could not list your Azure App Service instances');
@@ -352,7 +357,7 @@ which is free for the first 30 days`);
                 const done = this.async();
                 this.log.verboseInfo(`Configuring Azure App Service '${this.azureAppServiceName}'...`);
                 this.log.verboseInfo("Enabling 'prod' and 'azure' Spring Boot profiles");
-                exec(`az webapp config appsettings set --resource-group ${this.azureAppServiceResourceGroupName} --name ${this.azureAppServiceName} --settings SPRING_PROFILES_ACTIVE=prod,azure`, (err, stdout) => {
+                exec(`az webapp config appsettings set --resource-group ${this.azureAppServiceResourceGroupName} --name ${this.azureAppServiceName} --settings SPRING_PROFILES_ACTIVE=prod,azure`, err => {
                     if (err) {
                         this.abort = true;
                         throw new Error('Could not configure Azure App Service instance');
@@ -446,10 +451,10 @@ which is free for the first 30 days`);
         return this.delegateTasksToBlueprint(() => this.default);
     }
     _computeDerivedConfig(config = this.jhipsterConfigWithDefaults, dest = this) {
-        this.loadAppConfig(config, dest);
-        this.loadServerConfig(config, dest);
-        this.loadDerivedAppConfig(dest);
-        this.loadDerivedServerConfig(dest, dest);
+        loadAppConfig({ config, dest, useVersionPlaceholders: this.useVersionPlaceholders });
+        loadServerConfig({ config, application: dest });
+        loadDerivedAppConfig({ application: dest });
+        loadDerivedServerConfig({ application: dest });
         dest.azureAppInsightsInstrumentationKeyEmpty = config.azureAppInsightsInstrumentationKey === '';
     }
     // Public API method used by the getter and also by Blueprints
@@ -553,7 +558,7 @@ You need a GitHub project correctly configured in order to use GitHub Actions.`)
                     return;
                 const done = this.async();
                 this.log.log(chalk.bold('\nBuilding application'));
-                const child = this.buildApplication(this.buildTool, 'prod', false, err => {
+                const child = buildApplication(this.buildTool, 'prod', false, err => {
                     if (err) {
                         this.abort = true;
                         throw new Error(err);
@@ -591,4 +596,29 @@ You need a GitHub project correctly configured in order to use GitHub Actions.`)
     get [BaseGenerator.END]() {
         return this.delegateTasksToBlueprint(() => this.end);
     }
+    /**
+     * @private
+     * run a command using the configured Java build tool.
+     *
+     * @param {String} buildTool - maven | gradle
+     * @param {String} profile - dev | prod
+     * @param {String} command - the command (goal/task) to run
+     * @param {Function} cb - callback when build is complete
+     * @returns {object} the command line and its result
+     */
+    runJavaBuildCommand(buildTool, profile, command, cb) {
+        let buildCmd = `mvnw -ntp -DskipTests=true -B ${command}`;
+        if (buildTool === GRADLE) {
+            buildCmd = `gradlew -x ${command}`;
+        }
+        if (!isWin32) {
+            buildCmd = `./${buildCmd}`;
+        }
+        buildCmd += ` -P${profile}`;
+        this.log.verboseInfo(`Running command: '${chalk.bold(buildCmd)}'`);
+        return {
+            stdout: exec(buildCmd, { maxBuffer: 1024 * 10000 }, cb).stdout,
+            buildCmd,
+        };
+    }
 }

package/dist/generators/azure-spring-cloud/generator.mjs

@@ -27,6 +27,10 @@ import { cacheTypes, buildToolTypes } from '../../jdl/jhipster/index.mjs';
 import { GENERATOR_AZURE_SPRING_CLOUD } from '../generator-list.mjs';
 import { mavenProfile } from './templates.mjs';
 import { createPomStorage } from '../maven/support/pom-store.mjs';
+import { getFrontendAppName } from '../base/support/index.mjs';
+import { buildApplication } from '../server/internal/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
 const { MEMCACHED } = cacheTypes;
 const NO_CACHE_PROVIDER = cacheTypes.NO;
 const { MAVEN } = buildToolTypes;
@@ -58,18 +62,18 @@ export default class AzureSpringCloudGenerator extends BaseGenerator {
                 this.log.log(chalk.bold('Azure Spring Cloud configuration is starting'));
             },
             getSharedConfig() {
-                this.loadAppConfig();
-                this.loadServerConfig();
-                this.loadPlatformConfig();
-                this.loadDerivedAppConfig();
-                this.loadDerivedServerConfig();
-                this.loadDerivedPlatformConfig();
+                loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+                loadDerivedAppConfig({ application: this });
+                loadDerivedServerConfig({ application: this });
+                loadDerivedPlatformConfig({ application: this });
             },
             getConfig() {
                 this.env.options.appPath = this.config.get('appPath') || CLIENT_MAIN_SRC_DIR;
                 this.cacheProvider = this.cacheProvider || NO_CACHE_PROVIDER;
                 this.enableHibernateCache = this.enableHibernateCache && ![NO_CACHE_PROVIDER, MEMCACHED].includes(this.cacheProvider);
-                this.frontendAppName = this.getFrontendAppName();
+                this.frontendAppName = getFrontendAppName({ baseName: this.jhipsterConfig.baseName });
                 this.azureSpringCloudResourceGroupName = ''; // This is not saved, as it is better to get the Azure default variable
                 this.azureSpringCloudServiceName = ''; // This is not saved, as it is better to get the Azure default variable
                 this.azureSpringCloudAppName = this.config.get('azureSpringCloudAppName');
@@ -259,11 +263,11 @@ ${chalk.red('az extension add --name spring-cloud')}`);
                     return;
                 const done = this.async();
                 exec(`az spring-cloud app show --resource-group ${this.azureSpringCloudResourceGroupName} \
---service ${this.azureSpringCloudServiceName} --name ${this.azureSpringCloudAppName}`, (err, stdout) => {
+--service ${this.azureSpringCloudServiceName} --name ${this.azureSpringCloudAppName}`, err => {
                     if (err) {
                         this.log.log(chalk.bold('Application does not exist yet, creating it...'));
                         exec(`az spring-cloud app create --resource-group ${this.azureSpringCloudResourceGroupName} \
-            --service ${this.azureSpringCloudServiceName} --name ${this.azureSpringCloudAppName}`, (err, stdout) => {
+            --service ${this.azureSpringCloudServiceName} --name ${this.azureSpringCloudAppName}`, err => {
                             if (err) {
                                 this.abort = true;
                                 this.log.error(`Application creation failed! Here is the error: ${err}`);
@@ -289,9 +293,9 @@ ${chalk.red('az extension add --name spring-cloud')}`);
         return {
             derivedProperties() {
                 this.isPackageNameJhipsterTech = this.packageName !== 'tech.jhipster';
-                this.loadDerivedServerConfig();
-                this.loadDerivedPlatformConfig();
-                this.loadDerivedAppConfig();
+                loadDerivedServerConfig({ application: this });
+                loadDerivedPlatformConfig({ application: this });
+                loadDerivedAppConfig({ application: this });
             },
         };
     }
@@ -399,7 +403,7 @@ for more detailed information.`);
                     return;
                 const done = this.async();
                 this.log.log(chalk.bold('\nBuilding application'));
-                const child = this.buildApplication(this.buildTool, 'prod,azure', false, err => {
+                const child = buildApplication(this.buildTool, 'prod,azure', false, err => {
                     if (err) {
                         this.abort = true;
                         this.log.error(err);

package/dist/generators/base/command.mjs

@@ -1,3 +1,4 @@
+import { parseCreationTimestamp } from './support/timestamp.mjs';
 const command = {
     options: {
         useVersionPlaceholders: {
@@ -29,6 +30,25 @@ const command = {
             type: Boolean,
             scope: 'storage',
         },
+        creationTimestamp: {
+            description: 'Project creation timestamp (used for reproducible builds)',
+            type: parseCreationTimestamp,
+            scope: 'storage',
+        },
+        reproducible: {
+            description: 'Try to reproduce changelog',
+            type: Boolean,
+            scope: 'control',
+        },
+        skipPrompts: {
+            description: 'Skip prompts',
+            type: Boolean,
+        },
+        ignoreNeedlesError: {
+            description: 'Ignore needles failures',
+            type: Boolean,
+            hide: true,
+        },
     },
 };
 export default command;

package/dist/generators/base/{generator-base-blueprint.mjs → generator.mjs}

@@ -16,19 +16,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
+import chalk from 'chalk';
 import semver from 'semver';
+import * as _ from 'lodash-es';
 import { packageJson } from '../../lib/index.mjs';
-import { packageNameToNamespace } from './support/index.mjs';
-import JHipsterBaseGenerator from './generator-base-todo.mjs';
+import { packageNameToNamespace, removeFieldsWithNullishValues } from './support/index.mjs';
 import { mergeBlueprints, parseBluePrints, loadBlueprintsFromConfiguration, normalizeBlueprintName } from './internal/index.mjs';
 import { PRIORITY_NAMES } from './priorities.mjs';
+import CoreGenerator from '../base-core/index.mjs';
+import { LOCAL_BLUEPRINT_PACKAGE_NAMESPACE } from './support/constants.mjs';
+import { getConfigWithDefaults } from '../../jdl/index.js';
+import { loadStoredAppOptions } from '../app/support/index.mjs';
+const { defaults } = _;
 /**
  * Base class that contains blueprints support.
  */
-export default class JHipsterBaseBlueprintGenerator extends JHipsterBaseGenerator {
+export default class JHipsterBaseBlueprintGenerator extends CoreGenerator {
     fromBlueprint;
     sbsBlueprint;
     delegateToBlueprint;
@@ -40,8 +45,7 @@ export default class JHipsterBaseBlueprintGenerator extends JHipsterBaseGenerato
         if (this.options.help) {
             return;
         }
-        this.loadRuntimeOptions();
-        this.loadStoredAppOptions();
+        loadStoredAppOptions.call(this);
         this.sbsBlueprint = this.features.sbsBlueprint ?? false;
         this.fromBlueprint = this.rootGeneratorName() !== 'generator-jhipster';
         if (this.fromBlueprint) {
@@ -49,6 +53,11 @@ export default class JHipsterBaseBlueprintGenerator extends JHipsterBaseGenerato
             this.blueprintConfig = this.blueprintStorage.createProxy();
             // jhipsterContext is the original generator
             this.jhipsterContext = jhipsterContext;
+            if (this.getFeatures().checkBlueprint) {
+                if (!this.jhipsterContext) {
+                    throw new Error(`This is a JHipster blueprint and should be used only like ${chalk.yellow(`jhipster --blueprints ${this.options.namespace.split(':')[0]}`)}`);
+                }
+            }
             try {
                 // Fallback to the original generator if the file does not exists in the blueprint.
                 const blueprintedTemplatePath = this.jhipsterTemplatePath();
@@ -195,6 +204,20 @@ export default class JHipsterBaseBlueprintGenerator extends JHipsterBaseGenerato
     asPreparingTaskGroup(taskGroup) {
         return taskGroup;
     }
+    /**
+     * Priority API stub for blueprints.
+     *
+     * Preparing should be used to generate derived properties.
+     */
+    get postPreparing() {
+        return this.asPreparingTaskGroup({});
+    }
+    /**
+     * Utility method to get typed objects for autocomplete.
+     */
+    asPostPreparingTaskGroup(taskGroup) {
+        return taskGroup;
+    }
     /**
      * Priority API stub for blueprints.
      *
@@ -321,18 +344,32 @@ export default class JHipsterBaseBlueprintGenerator extends JHipsterBaseGenerato
     asEndTaskGroup(taskGroup) {
         return taskGroup;
     }
+    /**
+     * JHipster config with default values fallback
+     */
+    get jhipsterConfigWithDefaults() {
+        const configWithDefaults = getConfigWithDefaults(removeFieldsWithNullishValues(this.config.getAll()));
+        defaults(configWithDefaults, {
+            skipFakeData: false,
+            skipCheckLengthOfIdentifier: false,
+            enableGradleEnterprise: false,
+            pages: [],
+        });
+        return configWithDefaults;
+    }
     /**
      * @protected
      * Composes with blueprint generators, if any.
      */
     async composeWithBlueprints(subGen, options) {
         this.delegateToBlueprint = false;
-        if (!this.configOptions.blueprintConfigured) {
-            this.configOptions.blueprintConfigured = true;
+        const control = this.sharedData.getControl();
+        if (!control.blueprintConfigured) {
+            control.blueprintConfigured = true;
             await this._configureBlueprints();
         }
         let blueprints = this.jhipsterConfig.blueprints || [];
-        if (this.options.localBlueprint) {
+        if (this.options.composeWithLocalBlueprint) {
             blueprints = blueprints.concat({ name: '@jhipster/local' });
         }
         const composedBlueprints = [];
@@ -420,7 +457,7 @@ export default class JHipsterBaseBlueprintGenerator extends JHipsterBaseGenerato
      */
     async _composeBlueprint(blueprint, subGen, extraOptions = {}) {
         blueprint = normalizeBlueprintName(blueprint);
-        if (!this.skipChecks) {
+        if (!this.skipChecks && blueprint !== LOCAL_BLUEPRINT_PACKAGE_NAMESPACE) {
             this._checkBlueprint(blueprint);
         }
         const generatorName = packageNameToNamespace(blueprint);

package/dist/generators/base/index.mjs

@@ -16,5 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { default } from './generator-base-blueprint.mjs';
+export { default } from './generator.mjs';
 export { default as command } from './command.mjs';

package/dist/generators/base/priorities.mjs

@@ -25,6 +25,7 @@ const CONFIGURING = 'configuring';
 const DEFAULT = 'default';
 const WRITING = 'writing';
 const TRANSFORM = 'transform';
+// eslint-disable-next-line unused-imports/no-unused-vars
 const CONFLICTS = 'conflicts';
 const INSTALL = 'install';
 const END = 'end';
@@ -35,6 +36,8 @@ const LOADING = 'loading';
 const LOADING_QUEUE = `${QUEUE_PREFIX}${LOADING}`;
 const PREPARING = 'preparing';
 const PREPARING_QUEUE = `${QUEUE_PREFIX}${PREPARING}`;
+const POST_PREPARING = 'postPreparing';
+const POST_PREPARING_QUEUE = `${QUEUE_PREFIX}${POST_PREPARING}`;
 const MULTISTEP_TRANSFORM = 'multistepTransform';
 const MULTISTEP_TRANSFORM_QUEUE = `${QUEUE_PREFIX}${MULTISTEP_TRANSFORM}`;
 const POST_WRITING = 'postWriting';
@@ -79,9 +82,15 @@ export const CUSTOM_PRIORITIES = [
     {
         priorityName: PREPARING,
         queueName: PREPARING_QUEUE,
-        before: DEFAULT,
+        before: POST_PREPARING,
         args: generator => generator.getArgsForPriority(PREPARING),
     },
+    {
+        priorityName: POST_PREPARING,
+        queueName: POST_PREPARING_QUEUE,
+        before: DEFAULT,
+        args: generator => generator.getArgsForPriority(POST_PREPARING),
+    },
     {
         priorityName: DEFAULT,
         args: generator => generator.getArgsForPriority(DEFAULT),
@@ -100,14 +109,14 @@ export const CUSTOM_PRIORITIES = [
     {
         priorityName: POST_WRITING,
         queueName: POST_WRITING_QUEUE,
-        before: TRANSFORM,
+        before: PRE_CONFLICTS,
         args: generator => generator.getArgsForPriority(POST_WRITING),
     },
     {
         priorityName: PRE_CONFLICTS,
         queueName: PRE_CONFLICTS_QUEUE,
         args: generator => generator.getArgsForPriority(PRE_CONFLICTS),
-        before: CONFLICTS,
+        before: TRANSFORM,
     },
     {
         priorityName: INSTALL,
@@ -133,6 +142,7 @@ export const PRIORITY_NAMES = {
     COMPOSING,
     LOADING,
     PREPARING,
+    POST_PREPARING,
     DEFAULT,
     WRITING,
     MULTISTEP_TRANSFORM,
@@ -150,6 +160,7 @@ export const PRIORITY_NAMES_LIST = [
     COMPOSING,
     LOADING,
     PREPARING,
+    POST_PREPARING,
     DEFAULT,
     WRITING,
     MULTISTEP_TRANSFORM,
@@ -166,6 +177,7 @@ export const QUEUES = {
     COMPOSING_QUEUE,
     LOADING_QUEUE,
     PREPARING_QUEUE,
+    POST_PREPARING_QUEUE,
     DEFAULT_QUEUE: DEFAULT,
     WRITING_QUEUE: WRITING,
     MULTISTEP_TRANSFORM_QUEUE,

package/dist/generators/base/shared-data.mjs

@@ -1,3 +1,23 @@
+/**
+ * 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 * as _ from 'lodash-es';
+const { defaults } = _;
 export default class SharedData {
     _storage;
     constructor(storage, initialControl = {}) {
@@ -6,18 +26,22 @@ export default class SharedData {
         }
         // Backward compatibility sharedData
         this._storage = storage;
-        this._storage.sharedEntities = this._storage.sharedEntities || {};
-        this._storage.sharedApplication = this._storage.sharedApplication || {
-            nodeDependencies: {},
-        };
-        this._storage.sharedSource = this._storage.sharedSource || {};
-        this._storage.sharedData = this._storage.sharedData || initialControl;
+        defaults(this._storage, {
+            sharedDeployment: {},
+            sharedWorkspaces: {},
+            sharedEntities: {},
+            sharedApplication: {},
+            sharedSource: {},
+            control: initialControl,
+            props: {},
+        });
+        this._storage.sharedApplication.nodeDependencies = this._storage.sharedApplication.nodeDependencies ?? {};
     }
     getSource() {
         return this._storage.sharedSource;
     }
     getControl() {
-        return this._storage.sharedData;
+        return this._storage.control;
     }
     getApplication() {
         if (!this._storage.sharedApplication)

package/dist/generators/base/support/basename.mjs

@@ -0,0 +1,12 @@
+import * as _ from 'lodash-es';
+const { camelCase } = _;
+/**
+ * get the frontend application name.
+ */
+export const getFrontendAppName = ({ baseName }) => {
+    const name = camelCase(baseName) + (baseName.endsWith('App') ? '' : 'App');
+    return name.match(/^\d/) ? 'App' : name;
+};
+export const getMicroserviceAppName = ({ microserviceName }) => {
+    return camelCase(microserviceName) + (microserviceName.endsWith('App') ? '' : 'App');
+};

package/dist/generators/base/support/config.mjs

@@ -51,3 +51,35 @@ function filterValue(object, filterValue = filterNullishValues) {
     }
     return clone;
 }
+/**
+ * Picks every field from source.
+ * A field with undefined value is returned for missing fields.
+ */
+export const pickFields = (source, fields) => Object.fromEntries(fields.map(field => [field, source[field]]));
+/**
+ * Mutation properties accepts:
+ * - functions: receives the application and the return value is set at the application property.
+ * - non functions: application property will receive the property in case current value is undefined.
+ *
+ * Applies each mutation object in order.
+ *
+ * @example
+ * // application = { prop: 'foo-bar', prop2: 'foo2' }
+ * mutateApplication(
+ *   application,
+ *   { prop: 'foo', prop2: ({ prop }) => prop + 2 },
+ *   { prop: ({ prop }) => prop + '-bar', prop2: 'won\'t override' },
+ * );
+ */
+export const mutateApplication = (application, ...mutations) => {
+    for (const mutation of mutations) {
+        for (const [key, value] of Object.entries(mutation)) {
+            if (typeof value === 'function') {
+                application[key] = value(application);
+            }
+            else if (application[key] === undefined) {
+                application[key] = value;
+            }
+        }
+    }
+};

package/dist/generators/base/support/constants.mjs

@@ -0,0 +1 @@
+export const LOCAL_BLUEPRINT_PACKAGE_NAMESPACE = '@jhipster/generator-jhipster-local';

package/dist/generators/base/support/faker.mjs

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Faker } from '@faker-js/faker';
+import { Faker, base, en } from '@faker-js/faker';
 import Randexp from 'randexp';
 import { languageToJavaLanguage } from '../../languages/support/index.mjs';
 class RandexpWithFaker extends Randexp {
@@ -62,7 +62,7 @@ export async function createFaker(nativeLanguage = 'en') {
         locale = (await import('@faker-js/faker')).en;
     }
     const faker = new FakerWithRandexp({
-        locale: [locale],
+        locale: [locale, base, en],
     });
     faker.createRandexp = (pattern, m) => new RandexpWithFaker(pattern, m, faker);
     return faker;

package/dist/generators/base/support/index.mjs

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export * from './basename.mjs';
 export * from './configuration-helpers/options.mjs';
 export * from './config.mjs';
 export * from './contents.mjs';

package/dist/generators/base/support/jhipster7-context.mjs

@@ -13,6 +13,10 @@ const deprecatedProperties = {
         replacement: 'nodeDependencies.npm',
         get: ({ data }) => data.nodeDependencies.npm,
     },
+    JHIPSTER_DEPENDENCIES_VERSION: {
+        replacement: 'jhipsterDependenciesVersion',
+        get: ({ data }) => data.jhipsterDependenciesVersion,
+    },
     DOCKER_DIR: {
         replacement: 'dockerServicesDir',
         get: ({ data }) => data.dockerServicesDir,
@@ -66,8 +70,8 @@ const deprecatedProperties = {
         get: ({ data }) => data.anyFieldHasDocumentation,
     },
     fieldsContainBigDecimal: {
-        replacement: 'anyFieldIsDuration',
-        get: ({ data }) => data.anyFieldIsDuration,
+        replacement: 'anyFieldIsBigDecimal',
+        get: ({ data }) => data.anyFieldIsBigDecimal,
     },
     fieldsContainBlob: {
         replacement: 'anyFieldIsBlobDerived',
@@ -78,8 +82,8 @@ const deprecatedProperties = {
         get: ({ data }) => data.anyFieldIsDateDerived,
     },
     fieldsContainDuration: {
-        replacement: 'anyFieldIsBigDecimal',
-        get: ({ data }) => data.anyFieldIsBigDecimal,
+        replacement: 'anyFieldIsDuration',
+        get: ({ data }) => data.anyFieldIsDuration,
     },
     fieldsContainInstant: {
         replacement: 'anyFieldIsInstant',
@@ -129,6 +133,30 @@ const deprecatedProperties = {
         replacement: 'databaseMigrationLiquibase',
         get: ({ data }) => data.databaseMigrationLiquibase,
     },
+    databaseTypePostgres: {
+        replacement: 'prodDatabaseTypePostgresql',
+        get: ({ data }) => data.prodDatabaseTypePostgresql,
+    },
+    prodDatabaseTypePostgres: {
+        replacement: 'prodDatabaseTypePostgresql',
+        get: ({ data }) => data.prodDatabaseTypePostgresql,
+    },
+    databaseTypeMariadb: {
+        replacement: 'prodDatabaseTypeMariadb',
+        get: ({ data }) => data.prodDatabaseTypeMariadb,
+    },
+    databaseTypeMysql: {
+        replacement: 'prodDatabaseTypeMysql',
+        get: ({ data }) => data.prodDatabaseTypeMysql,
+    },
+    databaseTypeOracle: {
+        replacement: 'prodDatabaseTypeOracle',
+        get: ({ data }) => data.prodDatabaseTypeOracle,
+    },
+    databaseTypeMssql: {
+        replacement: 'prodDatabaseTypeMssql',
+        get: ({ data }) => data.prodDatabaseTypeMssql,
+    },
 };
 const ejsBuiltInProperties = ['__append', '__line', 'escapeFn', 'include', 'undefined'];
 const javascriptBuiltInProperties = ['parseInt', 'Boolean', 'JSON', 'Object'];

package/dist/generators/base/support/needles.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import escapeStringRegexp from 'escape-string-regexp';
 import { joinCallbacks } from './write-files.mjs';
 const { kebabCase } = _;
@@ -53,7 +53,7 @@ export const checkContentIn = (contentToCheck, content, ignoreWhitespaces = true
     return re.test(content);
 };
 /**
- * Write content before needle applying identation
+ * Write content before needle applying indentation
  *
  * @param args
  * @returns null if needle was not found, new content otherwise

package/dist/generators/base/support/string.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';
 /**
  * Calculate a hash code for a given string.
  * @param str - any string