generator-jhipster 8.0.0-beta.2 → 8.0.0-beta.3

package/dist/generators/base-workspaces/priorities.mjs

@@ -0,0 +1,96 @@
+/**
+ * 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 { QUEUE_PREFIX, PRIORITY_NAMES as PRIORITY_NAMES_BASE, QUEUES as QUEUES_BASE } from '../base/priorities.mjs';
+const { DEFAULT } = PRIORITY_NAMES_BASE;
+/** Custom priorities */
+const PROMPTING_WORKSPACES = 'promptingWorkspaces';
+const PROMPTING_WORKSPACES_QUEUE = `${QUEUE_PREFIX}${PROMPTING_WORKSPACES}`;
+const CONFIGURING_WORKSPACES = 'configuringWorkspaces';
+const CONFIGURING_WORKSPACES_QUEUE = `${QUEUE_PREFIX}${CONFIGURING_WORKSPACES}`;
+const LOADING_WORKSPACES = 'loadingWorkspaces';
+const LOADING_WORKSPACES_QUEUE = `${QUEUE_PREFIX}${LOADING_WORKSPACES}`;
+const PREPARING_WORKSPACES = 'preparingWorkspaces';
+const PREPARING_WORKSPACES_QUEUE = `${QUEUE_PREFIX}${PREPARING_WORKSPACES}`;
+/**
+ * Custom priorities to improve jhipster workflow.
+ */
+export const CUSTOM_PRIORITIES = [
+    {
+        priorityName: PROMPTING_WORKSPACES,
+        queueName: PROMPTING_WORKSPACES_QUEUE,
+        before: CONFIGURING_WORKSPACES,
+        args: generator => generator.getArgsForPriority(PROMPTING_WORKSPACES),
+    },
+    {
+        priorityName: CONFIGURING_WORKSPACES,
+        queueName: CONFIGURING_WORKSPACES_QUEUE,
+        before: LOADING_WORKSPACES,
+        args: generator => generator.getArgsForPriority(CONFIGURING_WORKSPACES),
+    },
+    {
+        priorityName: LOADING_WORKSPACES,
+        queueName: LOADING_WORKSPACES_QUEUE,
+        before: PREPARING_WORKSPACES,
+        args: generator => generator.getArgsForPriority(LOADING_WORKSPACES),
+    },
+    {
+        priorityName: PREPARING_WORKSPACES,
+        queueName: PREPARING_WORKSPACES_QUEUE,
+        before: DEFAULT,
+        args: generator => generator.getArgsForPriority(PREPARING_WORKSPACES),
+    },
+].reverse();
+const WORKSPACES_QUEUES = {
+    PROMPTING_WORKSPACES_QUEUE,
+    CONFIGURING_WORKSPACES_QUEUE,
+    LOADING_WORKSPACES_QUEUE,
+    PREPARING_WORKSPACES_QUEUE,
+};
+export const WORKSPACES_PRIORITY_NAMES = {
+    PROMPTING_WORKSPACES,
+    CONFIGURING_WORKSPACES,
+    LOADING_WORKSPACES,
+    PREPARING_WORKSPACES,
+};
+export const PRIORITY_NAMES = {
+    ...PRIORITY_NAMES_BASE,
+    ...WORKSPACES_PRIORITY_NAMES,
+};
+export const QUEUES = {
+    ...QUEUES_BASE,
+    ...WORKSPACES_QUEUES,
+};
+export const PRIORITY_NAMES_LIST = [
+    PRIORITY_NAMES.INITIALIZING,
+    PRIORITY_NAMES.PROMPTING,
+    PRIORITY_NAMES.CONFIGURING,
+    PRIORITY_NAMES.COMPOSING,
+    PRIORITY_NAMES.LOADING,
+    PRIORITY_NAMES.PREPARING,
+    PROMPTING_WORKSPACES,
+    CONFIGURING_WORKSPACES,
+    LOADING_WORKSPACES,
+    PREPARING_WORKSPACES,
+    PRIORITY_NAMES.DEFAULT,
+    PRIORITY_NAMES.WRITING,
+    PRIORITY_NAMES.POST_WRITING,
+    PRIORITY_NAMES_BASE.INSTALL,
+    PRIORITY_NAMES_BASE.POST_INSTALL,
+    PRIORITY_NAMES_BASE.END,
+];

package/dist/generators/bootstrap/generator.mjs

@@ -16,16 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { forceYoFiles } from '@yeoman/conflicter';
+import { forceYoFiles, createConflicterTransform, createYoResolveTransform } from '@yeoman/conflicter';
 import { isFilePending } from 'mem-fs-editor/state';
-import { createConflicterTransform, createYoResolveTransform } from '@yeoman/conflicter';
 import BaseGenerator from '../base/index.mjs';
-import { createMultiStepTransform, createPrettierTransform, createForceWriteConfigFilesTransform, autoCrlfTransform, isPrettierConfigFile, } from './support/index.mjs';
+import { createMultiStepTransform, createPrettierTransform, createForceWriteConfigFilesTransform, autoCrlfTransform, isPrettierConfigFile, createSortConfigFilesTransform, createESLintTransform, } from './support/index.mjs';
 import { PRETTIER_EXTENSIONS } from '../generator-constants.mjs';
 import { GENERATOR_UPGRADE } from '../generator-list.mjs';
 import { PRIORITY_NAMES, QUEUES } from '../base-application/priorities.mjs';
 import command from './command.mjs';
-import { createSortConfigFilesTransform } from './support/index.mjs';
+import { createRemoveUnusedImportsTransform } from './support/java-unused-imports-transform.mjs';
+import { loadStoredAppOptions } from '../app/support/index.mjs';
 const { MULTISTEP_TRANSFORM, PRE_CONFLICTS } = PRIORITY_NAMES;
 const { MULTISTEP_TRANSFORM_QUEUE } = QUEUES;
 const MULTISTEP_TRANSFORM_PRIORITY = BaseGenerator.asPriority(MULTISTEP_TRANSFORM);
@@ -36,12 +36,10 @@ export default class BootstrapGenerator extends BaseGenerator {
     upgradeCommand;
     skipPrettier;
     constructor(args, options, features) {
-        super(args, options, { uniqueGlobally: true, customCommitTask: () => this.commitSharedFs(), ...features });
+        super(args, options, { jhipsterBootstrap: false, uniqueGlobally: true, customCommitTask: () => this.commitSharedFs(), ...features });
     }
     beforeQueue() {
-        this.loadStoredAppOptions();
-        // Load common runtime options.
-        this.parseCommonRuntimeOptions();
+        loadStoredAppOptions.call(this);
         // Force npm override later if needed
         this.env.options.nodePackageManager = 'npm';
         this.upgradeCommand = this.options.commandName === GENERATOR_UPGRADE;
@@ -118,15 +116,24 @@ export default class BootstrapGenerator extends BaseGenerator {
      */
     async commitSharedFs(stream = this.env.sharedFs.stream({ filter: isFilePending })) {
         const { skipYoResolve } = this.options;
-        const { ignoreErrors } = this.options;
-        const prettierOptions = { packageJson: true, java: !this.jhipsterConfig.skipServer };
-        const prettierTransformOptions = { ignoreErrors: ignoreErrors || this.upgradeCommand, extensions: PRETTIER_EXTENSIONS };
+        const ignoreErrors = this.options.ignoreErrors || this.upgradeCommand;
         const transformStreams = [
             ...(skipYoResolve ? [] : [createYoResolveTransform()]),
             forceYoFiles(),
             createSortConfigFilesTransform(),
             createForceWriteConfigFilesTransform(),
-            ...(this.skipPrettier ? [] : [createPrettierTransform(prettierOptions, this, prettierTransformOptions)]),
+            ...(this.skipPrettier
+                ? []
+                : [
+                    createESLintTransform.call(this, { ignoreErrors, extensions: 'ts,js' }),
+                    createRemoveUnusedImportsTransform.call(this, { ignoreErrors }),
+                    await createPrettierTransform.call(this, {
+                        ignoreErrors,
+                        prettierPackageJson: true,
+                        prettierJava: !this.jhipsterConfig.skipServer,
+                        extensions: PRETTIER_EXTENSIONS,
+                    }),
+                ]),
             ...(this.jhipsterConfig.autoCrlf ? [autoCrlfTransform(this.createGit())] : []),
             createConflicterTransform(this.env.adapter, { ...this.env.conflicterOptions, memFs: this.env.sharedFs }),
         ];

package/dist/generators/bootstrap/support/auto-crlf-transform.mjs

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { transform } from 'p-transform';
 import { stat } from 'fs/promises';
 import { createReadStream } from 'fs';
+import { transform } from 'p-transform';
 import { isBinaryFile } from 'isbinaryfile';
 import { normalizeLineEndings } from '../../base/support/index.mjs';
 /**

package/dist/generators/bootstrap/support/eslint-transform.mjs

@@ -0,0 +1,72 @@
+/**
+ * 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 { passthrough } from 'p-transform';
+import { isFileStateDeleted } from 'mem-fs-editor/state';
+import ESLint from 'eslint';
+import { Minimatch } from 'minimatch';
+import { getPackageRoot } from '../../../lib/index.mjs';
+// eslint-disable-next-line import/prefer-default-export
+export const createESLintTransform = function (transformOptions = {}) {
+    const { extensions = 'js,ts', ignoreErrors } = transformOptions;
+    const minimatch = new Minimatch(`**/*.{${extensions}}`, { dot: true });
+    const eslint = new ESLint.ESLint({
+        fix: true,
+        // Disable destination configs. We should apply plugins and rules which jhipster depends on.
+        useEslintrc: false,
+        resolvePluginsRelativeTo: getPackageRoot(),
+        overrideConfig: {
+            plugins: ['unused-imports', 'import'],
+            extends: ['plugin:@typescript-eslint/base'],
+            parserOptions: {
+                sourceType: 'module',
+                ecmaVersion: 'latest',
+            },
+            rules: {
+                'import/order': 'error',
+                'import/no-duplicates': 'error',
+                'unused-imports/no-unused-imports': 'error',
+                'unused-imports/no-unused-vars': ['warn', { vars: 'all', varsIgnorePattern: '^_', args: 'after-used', argsIgnorePattern: '^_' }],
+            },
+        },
+    });
+    return passthrough(async (file) => {
+        if (!minimatch.match(file.path) || isFileStateDeleted(file)) {
+            return;
+        }
+        if (!file.contents) {
+            throw new Error(`File content doesn't exist for ${file.relative}`);
+        }
+        try {
+            if (await eslint.isPathIgnored(file.path)) {
+                return;
+            }
+            const [result] = await eslint.lintText(file.contents.toString(), { filePath: file.path });
+            if (result.output) {
+                file.contents = Buffer.from(result.output);
+            }
+        }
+        catch (error) {
+            if (ignoreErrors) {
+                this?.log?.warn?.(error);
+                return;
+            }
+            throw error;
+        }
+    });
+};

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

@@ -18,6 +18,7 @@
  */
 export { default as autoCrlfTransform } from './auto-crlf-transform.mjs';
 export { default as createForceWriteConfigFilesTransform } from './force-write-config-files-transform.mjs';
+export * from './eslint-transform.mjs';
 export * from './multi-step-transform/index.mjs';
 export * from './prettier-support.mjs';
 export { default as createSortConfigFilesTransform } from './sort-config-files-transform.mjs';

package/dist/generators/bootstrap/support/java-unused-imports-transform.mjs

@@ -0,0 +1,25 @@
+import { extname } from 'path';
+import { passthrough } from '@yeoman/transform';
+import { isFileStateDeleted } from 'mem-fs-editor/state';
+import { removeUnusedImports } from 'java-lint';
+// eslint-disable-next-line import/prefer-default-export
+export const createRemoveUnusedImportsTransform = function (options = {}) {
+    const { ignoreErrors } = options;
+    return passthrough((file) => {
+        if (extname(file.path) === '.java' && !isFileStateDeleted(file)) {
+            if (file.contents) {
+                try {
+                    file.contents = Buffer.from(removeUnusedImports(file.contents.toString('utf8')));
+                }
+                catch (error) {
+                    const errorMessage = `Error parsing file ${file.relative}: ${error} at ${file.contents?.toString()}`;
+                    if (ignoreErrors) {
+                        this?.log?.warn?.(errorMessage);
+                        return;
+                    }
+                    throw new Error(errorMessage);
+                }
+            }
+        }
+    });
+};

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

@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import { minimatch } from 'minimatch';
 import path from 'path';
+import { minimatch } from 'minimatch';
 import TemplateFile from './template-file.mjs';
 export default class TemplateFileFs {
     constructor(options = {}) {

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

@@ -1,7 +1,7 @@
 import assert from 'assert';
+import path from 'path';
 import debugBuilder from 'debug';
 import ejs from 'ejs';
-import path from 'path';
 import TemplateData from './template-data.mjs';
 export default class TemplateFile {
     constructor(filename, extension) {

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

@@ -20,16 +20,18 @@ import { passthrough } from 'p-transform';
 import { isFileStateDeleted } from 'mem-fs-editor/state';
 import prettier from 'prettier';
 import prettierPluginJava from 'prettier-plugin-java';
+import prettierPluginProperties from 'prettier-plugin-properties';
 import prettierPluginPackagejson from 'prettier-plugin-packagejson';
 import { Minimatch } from 'minimatch';
 const minimatch = new Minimatch('**/{.prettierrc**,.prettierignore}');
-export const isPrettierConfigFile = file => minimatch.match(file.path);
-export const createPrettierTransform = function (options, generator, transformOptions = {}) {
-    if (typeof transformOptions === 'boolean') {
-        transformOptions = { ignoreErrors: transformOptions };
-    }
-    const { ignoreErrors = false, extensions } = transformOptions;
-    const minimatch = new Minimatch(`**/*.{${extensions}}`, { dot: true });
+export const isPrettierConfigFile = (file) => minimatch.match(file.path);
+export const createPrettierTransform = async function (options = {}) {
+    // prettier cache is global, generators may execute more than one commit.
+    // In case prettier config is committed to disk at later commits, the cache may be outdated.
+    await prettier.clearConfigCache();
+    const { ignoreErrors = false, extensions = '*', prettierPackageJson, prettierJava, prettierProperties, prettierOptions } = 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)) {
             return;
@@ -41,21 +43,25 @@ export const createPrettierTransform = function (options, generator, transformOp
         let fileContent;
         try {
             const resolvedDestinationFileOptions = await prettier.resolveConfig(file.relative);
-            const prettierOptions = {
-                plugins: [],
+            const fileOptions = {
                 // Config from disk
                 ...resolvedDestinationFileOptions,
+                plugins: [],
                 // for better errors
                 filepath: file.relative,
+                ...prettierOptions,
             };
-            if (options.packageJson) {
-                prettierOptions.plugins.push(prettierPluginPackagejson);
+            if (prettierPackageJson && file.path.endsWith('package.json')) {
+                fileOptions.plugins.push(prettierPluginPackagejson);
+            }
+            if (prettierJava && file.path.endsWith('.java')) {
+                fileOptions.plugins.push(prettierPluginJava);
             }
-            if (options.java) {
-                prettierOptions.plugins.push(prettierPluginJava);
+            if (prettierProperties) {
+                fileOptions.plugins.push(prettierPluginProperties);
             }
             fileContent = file.contents.toString('utf8');
-            const data = prettier.format(fileContent, prettierOptions);
+            const data = await prettier.format(fileContent, fileOptions);
             file.contents = Buffer.from(data);
         }
         catch (error) {
@@ -72,7 +78,7 @@ At: ${fileContent
                 errorMessage = `Unknown prettier error: ${error}`;
             }
             if (ignoreErrors) {
-                generator.log.warn(errorMessage);
+                this?.log?.warn?.(errorMessage);
                 return;
             }
             throw new Error(errorMessage);

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

@@ -22,19 +22,37 @@ import { validations } from '../../jdl/jhipster/index.mjs';
 import { stringifyApplicationData, derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, preparePostEntityCommonDerivedProperties, } from '../base-application/support/index.mjs';
 import { 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';
 const { Validations: { MAX, MIN, MAXLENGTH, MINLENGTH, MAXBYTES, MINBYTES, PATTERN }, SUPPORTED_VALIDATION_RULES, } = validations;
 export default class BootstrapApplicationGenerator extends BaseApplicationGenerator {
     constructor(args, options, features) {
-        super(args, options, features);
+        super(args, options, { jhipsterBootstrap: false, ...features });
         if (this.options.help)
             return;
-        this.loadStoredAppOptions();
-        this.loadRuntimeOptions();
+        loadStoredAppOptions.call(this);
     }
     async beforeQueue() {
         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 }) {

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

@@ -21,21 +21,21 @@ import os from 'os';
 import _ from 'lodash';
 import chalk from 'chalk';
 import BaseApplicationGenerator from '../base-application/index.mjs';
-import { addFakerToEntity, loadEntitiesAnnotations, loadEntitiesOtherSide, stringifyApplicationData, } from '../base-application/support/index.mjs';
-import { prepareEntity as prepareEntityForTemplates, prepareField as prepareFieldForTemplates, prepareRelationship, } from '../base-application/support/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';
 import { DOCKER_DIR } from '../generator-constants.mjs';
 import { GENERATOR_BOOTSTRAP, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { loadLanguagesConfig } from '../languages/support/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../app/support/index.mjs';
 const isWin32 = os.platform() === 'win32';
 const { lowerFirst } = _;
 export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     constructor(args, options, features) {
-        super(args, options, features);
+        super(args, options, { jhipsterBootstrap: false, ...features });
         if (this.options.help)
             return;
-        this.loadStoredAppOptions();
+        loadStoredAppOptions.call(this);
     }
     async beforeQueue() {
         await this.dependsOnJHipster(GENERATOR_PROJECT_NAME);
@@ -66,8 +66,12 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     get loading() {
         return this.asLoadingTaskGroup({
             loadApplication({ application, control }) {
-                this.loadAppConfig(undefined, application);
-                loadLanguagesConfig(application, this.jhipsterConfigWithDefaults, control);
+                loadAppConfig({
+                    config: this.jhipsterConfigWithDefaults,
+                    application,
+                    useVersionPlaceholders: this.useVersionPlaceholders,
+                });
+                loadLanguagesConfig({ application, config: this.jhipsterConfigWithDefaults, control });
             },
             loadNodeDependencies({ application }) {
                 this.loadNodeDependencies(application.nodeDependencies, {
@@ -85,7 +89,7 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     get preparing() {
         return this.asPreparingTaskGroup({
             prepareApplication({ application }) {
-                this.loadDerivedAppConfig(application);
+                loadDerivedAppConfig({ application });
                 application.nodePackageManager = 'npm';
                 application.dockerServicesDir = DOCKER_DIR;
                 // TODO v8 drop the following variables

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

@@ -16,16 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { preparePostEntityClientDerivedProperties } from '../client/support/index.mjs';
+import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties } from '../client/support/index.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.mjs';
+import { loadStoredAppOptions } from '../app/support/index.mjs';
 export default class BootStrapApplicationClient extends BaseApplicationGenerator {
     constructor(args, options, features) {
-        super(args, options, features);
+        super(args, options, { jhipsterBootstrap: false, ...features });
         if (this.options.help)
             return;
-        this.loadStoredAppOptions();
-        this.loadRuntimeOptions();
+        loadStoredAppOptions.call(this);
     }
     async beforeQueue() {
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
@@ -33,7 +33,7 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
     get loading() {
         return this.asLoadingTaskGroup({
             loadApplication({ application }) {
-                this.loadClientConfig(undefined, application);
+                loadClientConfig({ config: this.jhipsterConfigWithDefaults, application });
             },
         });
     }
@@ -43,7 +43,7 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
     get preparing() {
         return this.asPreparingTaskGroup({
             prepareApplication({ application }) {
-                this.loadDerivedClientConfig(application);
+                loadDerivedClientConfig({ application });
             },
         });
     }

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

@@ -19,21 +19,26 @@
 import _ from 'lodash';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.mjs';
-import { dockerContainers, javaDependencies } from '../generator-constants.mjs';
+import { MAIN_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, TEST_DIR, dockerContainers, javaDependencies, } from '../generator-constants.mjs';
 import { loadRequiredConfigIntoEntity, prepareEntityPrimaryKeyForTemplates } from '../base-application/support/index.mjs';
-import { loadRequiredConfigDerivedProperties, prepareEntity as prepareEntityServerForTemplates, getPomVersionProperties, getGradleLibsVersionsProperties, } from '../server/support/index.mjs';
+import { loadRequiredConfigDerivedProperties, prepareEntity as prepareEntityServerForTemplates, getPomVersionProperties, getGradleLibsVersionsProperties, addEntitiesOtherRelationships, hibernateSnakeCase, loadServerConfig, loadDerivedServerConfig, } from '../server/support/index.mjs';
 import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.mjs';
 import { dockerPlaceholderGenerator, getDockerfileContainers } from '../docker/utils.mjs';
 import { GRADLE_VERSION } from '../gradle/constants.mjs';
-import { addEntitiesOtherRelationships } from '../server/support/index.mjs';
+import { normalizePathEnd } from '../base/support/path.mjs';
+import { getFrontendAppName } from '../base/support/index.mjs';
+import { getMainClassName } from '../java/support/index.mjs';
 export default class BoostrapApplicationServer extends BaseApplicationGenerator {
+    constructor(args, options, features) {
+        super(args, options, { jhipsterBootstrap: false, ...features });
+    }
     async beforeQueue() {
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
     }
     get loading() {
         return this.asLoadingTaskGroup({
-            async loadApplication({ application, control }) {
-                this.loadServerConfig(undefined, application);
+            async loadApplication({ application }) {
+                loadServerConfig({ config: this.jhipsterConfigWithDefaults, application });
                 application.gradleVersion = this.useVersionPlaceholders ? 'GRADLE_VERSION' : GRADLE_VERSION;
                 application.backendType = 'Java';
                 const pomFile = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/pom.xml'))?.toString();
@@ -60,7 +65,22 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
     get preparing() {
         return this.asPreparingTaskGroup({
             prepareApplication({ application }) {
-                this.loadDerivedServerConfig(application);
+                loadDerivedServerConfig({ application });
+            },
+            prepareForTemplates({ application: app }) {
+                const application = app;
+                // Application name modified, using each technology's conventions
+                application.frontendAppName = getFrontendAppName({ baseName: application.baseName });
+                application.mainClass = getMainClassName({ baseName: application.baseName });
+                application.jhiTablePrefix = hibernateSnakeCase(application.jhiPrefix);
+                application.mainJavaDir = SERVER_MAIN_SRC_DIR;
+                application.mainJavaPackageDir = normalizePathEnd(`${SERVER_MAIN_SRC_DIR}${application.packageFolder}`);
+                application.mainJavaResourceDir = SERVER_MAIN_RES_DIR;
+                application.testJavaDir = SERVER_TEST_SRC_DIR;
+                application.testJavaPackageDir = normalizePathEnd(`${SERVER_TEST_SRC_DIR}${application.packageFolder}`);
+                application.testResourceDir = SERVER_TEST_RES_DIR;
+                application.srcMainDir = MAIN_DIR;
+                application.srcTestDir = TEST_DIR;
             },
         });
     }
@@ -72,7 +92,7 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
             loadingEntities({ application, entitiesToLoad }) {
                 for (const { entityName } of entitiesToLoad) {
                     const entity = this.sharedData.getEntity(entityName);
-                    loadRequiredConfigIntoEntity(entity, application);
+                    loadRequiredConfigIntoEntity.call(this, entity, application);
                     loadRequiredConfigDerivedProperties(entity);
                 }
             },

package/dist/generators/bootstrap-workspaces/command.mjs

@@ -0,0 +1,11 @@
+const command = {
+    options: {
+        customWorkspacesConfig: {
+            type: Boolean,
+            description: 'Use custom configuration',
+            scope: 'generator',
+            hide: true,
+        },
+    },
+};
+export default command;