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

package/dist/generators/{base-docker → base-workspaces/internal}/docker-prompts.mjs

@@ -17,16 +17,15 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import shelljs from 'shelljs';
-import { loadConfigs, setClusteredApps } from './docker-base.mjs';
-import { applicationTypes, monitoringTypes, serviceDiscoveryTypes } from '../../jdl/jhipster/index.mjs';
-import { convertSecretToBase64 } from '../base/support/index.mjs';
+import { readdirSync, statSync } from 'node:fs';
+import { loadConfigs } from './docker-base.mjs';
+import { applicationTypes, monitoringTypes, serviceDiscoveryTypes } from '../../../jdl/jhipster/index.mjs';
+import { convertSecretToBase64 } from '../../base/support/index.mjs';
 const { MICROSERVICE, MONOLITH, GATEWAY } = applicationTypes;
 const { PROMETHEUS } = monitoringTypes;
 const monitoring = monitoringTypes;
 const NO_MONITORING = monitoring.NO;
-const { CONSUL, EUREKA } = serviceDiscoveryTypes;
-const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
+const { CONSUL, EUREKA, NO: NO_SERVICE_DISCOVERY } = serviceDiscoveryTypes;
 export default {
     askForApplicationType,
     askForGatewayType,
@@ -44,7 +43,7 @@ export default {
  * Ask For Application Type
  */
 async function askForApplicationType() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -64,14 +63,14 @@ async function askForApplicationType() {
             default: MONOLITH,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.deploymentApplicationType = props.deploymentApplicationType;
 }
 /**
  * Ask For Gateway Type
  */
 async function askForGatewayType() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     if (this.deploymentApplicationType !== MICROSERVICE)
         return;
@@ -89,14 +88,14 @@ async function askForGatewayType() {
             default: 'SpringCloudGateway',
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.gatewayType = props.gatewayType;
 }
 /**
  * Ask For Path
  */
 async function askForPath() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const deploymentApplicationType = this.deploymentApplicationType;
     let messageAskForPath;
@@ -112,20 +111,27 @@ async function askForPath() {
             name: 'directoryPath',
             message: messageAskForPath,
             default: this.directoryPath || '../',
-            validate: input => {
+            validate: async (input) => {
                 const path = this.destinationPath(input);
-                if (shelljs.test('-d', path)) {
-                    const appsFolders = getAppFolders.call(this, input, deploymentApplicationType);
-                    if (appsFolders.length === 0) {
-                        return deploymentApplicationType === MONOLITH ? `No monolith found in ${path}` : `No microservice or gateway found in ${path}`;
+                try {
+                    if (statSync(path).isDirectory) {
+                        const appsFolders = getAppFolders.call(this, input, deploymentApplicationType);
+                        if (appsFolders.length === 0) {
+                            return deploymentApplicationType === MONOLITH
+                                ? `No monolith found in ${path}`
+                                : `No microservice or gateway found in ${path}`;
+                        }
+                        return true;
                     }
-                    return true;
+                }
+                catch {
+                    // Ignore error
                 }
                 return `${path} is not a directory or doesn't exist`;
             },
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.directoryPath = props.directoryPath;
     // Patch the path if there is no trailing "/"
     if (!this.directoryPath.endsWith('/')) {
@@ -145,7 +151,7 @@ async function askForPath() {
  * Ask For Apps
  */
 async function askForApps() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const messageAskForApps = 'Which applications do you want to include in your configuration?';
     const prompts = [
@@ -153,20 +159,20 @@ async function askForApps() {
             type: 'checkbox',
             name: 'chosenApps',
             message: messageAskForApps,
-            choices: this.appsFolders,
-            default: this.defaultAppsFolders,
+            choices: this.appsFolders ?? [],
+            default: this.jhipsterConfig.appsFolders,
             validate: input => (input.length === 0 ? 'Please choose at least one application' : true),
         },
     ];
     const props = await this.prompt(prompts);
-    this.appsFolders = props.chosenApps;
+    this.appsFolders = this.jhipsterConfig.appsFolders = props.chosenApps;
     loadConfigs.call(this);
 }
 /**
  * Ask For Clusters Mode
  */
 async function askForClustersMode() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const clusteredDbApps = [];
     this.appConfigs.forEach((appConfig, index) => {
@@ -185,15 +191,14 @@ async function askForClustersMode() {
             default: this.clusteredDbApps,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.clusteredDbApps = props.clusteredDbApps;
-    setClusteredApps.call(this);
 }
 /**
  * Ask For Monitoring
  */
 async function askForMonitoring() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -213,17 +218,17 @@ async function askForMonitoring() {
             default: this.monitoring ? this.monitoring : NO_MONITORING,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.monitoring = props.monitoring;
 }
 /**
  * Ask For Service Discovery
  */
 async function askForServiceDiscovery() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const serviceDiscoveryEnabledApps = [];
-    this.appConfigs.forEach((appConfig, index) => {
+    this.appConfigs.forEach(appConfig => {
         if (appConfig.serviceDiscoveryAny) {
             serviceDiscoveryEnabledApps.push({
                 baseName: appConfig.baseName,
@@ -232,15 +237,15 @@ async function askForServiceDiscovery() {
         }
     });
     if (serviceDiscoveryEnabledApps.length === 0) {
-        this.serviceDiscoveryType = false;
+        this.serviceDiscoveryType = this.jhipsterConfig.serviceDiscoveryType = NO_SERVICE_DISCOVERY;
         return;
     }
     if (serviceDiscoveryEnabledApps.every(app => app.serviceDiscoveryType === CONSUL)) {
-        this.serviceDiscoveryType = CONSUL;
+        this.serviceDiscoveryType = this.jhipsterConfig.serviceDiscoveryType = CONSUL;
         this.log.log(chalk.green('Consul detected as the service discovery and configuration provider used by your apps'));
     }
     else if (serviceDiscoveryEnabledApps.every(app => app.serviceDiscoveryType === EUREKA)) {
-        this.serviceDiscoveryType = EUREKA;
+        this.serviceDiscoveryType = this.jhipsterConfig.serviceDiscoveryType = EUREKA;
         this.log.log(chalk.green('JHipster registry detected as the service discovery and configuration provider used by your apps'));
     }
     else {
@@ -271,7 +276,7 @@ async function askForServiceDiscovery() {
                 default: CONSUL,
             },
         ];
-        const props = this.prompt(prompts);
+        const props = await this.prompt(prompts, this.config);
         this.serviceDiscoveryType = props.serviceDiscoveryType;
     }
 }
@@ -279,7 +284,9 @@ async function askForServiceDiscovery() {
  * Ask For Admin Password
  */
 async function askForAdminPassword() {
-    if (this.regenerate || this.serviceDiscoveryType !== EUREKA)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
+        return;
+    if (this.serviceDiscoveryType !== EUREKA)
         return;
     const prompts = [
         {
@@ -290,7 +297,7 @@ async function askForAdminPassword() {
             validate: input => (input.length < 5 ? 'The password must have at least 5 characters' : true),
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.adminPassword = props.adminPassword;
     this.adminPasswordBase64 = convertSecretToBase64(this.adminPassword);
 }
@@ -298,7 +305,7 @@ async function askForAdminPassword() {
  * Ask For Docker Repository Name
  */
 async function askForDockerRepositoryName() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -308,14 +315,14 @@ async function askForDockerRepositoryName() {
             default: this.dockerRepositoryName,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.dockerRepositoryName = props.dockerRepositoryName;
 }
 /**
  * Ask For Docker Push Command
  */
 async function askForDockerPushCommand() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -325,7 +332,7 @@ async function askForDockerPushCommand() {
             default: this.dockerPushCommand ? this.dockerPushCommand : 'docker push',
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.dockerPushCommand = props.dockerPushCommand;
 }
 /**
@@ -336,26 +343,31 @@ async function askForDockerPushCommand() {
  */
 export function getAppFolders(input, deploymentApplicationType) {
     const destinationPath = this.destinationPath(input);
-    const files = shelljs.ls('-l', destinationPath);
+    const files = readdirSync(destinationPath);
     const appsFolders = [];
     files.forEach(file => {
-        if (file.isDirectory()) {
-            if (shelljs.test('-f', `${destinationPath}/${file.name}/.yo-rc.json`)) {
-                try {
-                    const fileData = this.fs.readJSON(`${destinationPath}/${file.name}/.yo-rc.json`);
-                    if (fileData['generator-jhipster'].baseName !== undefined &&
-                        (deploymentApplicationType === undefined ||
-                            deploymentApplicationType === fileData['generator-jhipster'].applicationType ||
-                            (deploymentApplicationType === MICROSERVICE && fileData['generator-jhipster'].applicationType === GATEWAY))) {
-                        appsFolders.push(file.name.match(/([^/]*)\/*$/)[1]);
+        try {
+            if (statSync(this.destinationPath(file)).isDirectory()) {
+                if (statSync(this.destinationPath(file, '.yo-rc.json')).isFile()) {
+                    try {
+                        const fileData = this.readDestinationJSON(`${file.name}/.yo-rc.json`);
+                        if (fileData['generator-jhipster'].baseName !== undefined &&
+                            (deploymentApplicationType === undefined ||
+                                deploymentApplicationType === fileData['generator-jhipster'].applicationType ||
+                                (deploymentApplicationType === MICROSERVICE && fileData['generator-jhipster'].applicationType === GATEWAY))) {
+                            appsFolders.push(file.name.match(/([^/]*)\/*$/)[1]);
+                        }
+                    }
+                    catch (err) {
+                        this.log.error(chalk.red(`${file}: this .yo-rc.json can't be read`));
+                        this.log.debug('Error:', err);
                     }
-                }
-                catch (err) {
-                    this.log.error(chalk.red(`${file}: this .yo-rc.json can't be read`));
-                    this.log.debug('Error:', err);
                 }
             }
         }
+        catch {
+            // Not a file or directory
+        }
     });
     return appsFolders;
 }

package/dist/generators/base-workspaces/internal/index.mjs

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2021 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.
+ */
+export * from './deployments.mjs';
+export * from './docker-dependencies.mjs';

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,18 +16,17 @@
  * 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, isPrettierConfigFilePath, createSortConfigFilesTransform, createESLintTransform, createRemoveUnusedImportsTransform, } from './support/index.mjs';
 import { PRETTIER_EXTENSIONS } from '../generator-constants.mjs';
-import { GENERATOR_UPGRADE } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP, 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 { loadStoredAppOptions } from '../app/support/index.mjs';
 const { MULTISTEP_TRANSFORM, PRE_CONFLICTS } = PRIORITY_NAMES;
-const { MULTISTEP_TRANSFORM_QUEUE } = QUEUES;
+const { MULTISTEP_TRANSFORM_QUEUE, PRE_CONFLICTS_QUEUE } = QUEUES;
 const MULTISTEP_TRANSFORM_PRIORITY = BaseGenerator.asPriority(MULTISTEP_TRANSFORM);
 const PRE_CONFLICTS_PRIORITY = BaseGenerator.asPriority(PRE_CONFLICTS);
 export default class BootstrapGenerator extends BaseGenerator {
@@ -36,15 +35,19 @@ 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();
+    async beforeQueue() {
+        loadStoredAppOptions.call(this);
         // Force npm override later if needed
         this.env.options.nodePackageManager = 'npm';
         this.upgradeCommand = this.options.commandName === GENERATOR_UPGRADE;
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP);
+        }
+        if (this.delegateToBlueprint) {
+            throw new Error('Only sbs blueprint is supported');
+        }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
@@ -68,6 +71,11 @@ export default class BootstrapGenerator extends BaseGenerator {
         return {
             queueTransform() {
                 this.queueMultistepTransform();
+                this.env.sharedFs.on('change', filePath => {
+                    if (createMultiStepTransform().templateFileFs.isTemplate(filePath)) {
+                        this.queueMultistepTransform();
+                    }
+                });
             },
         };
     }
@@ -76,9 +84,13 @@ export default class BootstrapGenerator extends BaseGenerator {
     }
     get preConflicts() {
         return {
-            async commitPrettierConfig() {
-                const filter = file => isFilePending(file) && isPrettierConfigFile(file);
-                await this.commitSharedFs(this.env.sharedFs.stream({ filter }));
+            async queueCommitPrettierConfig() {
+                await this.queueCommitPrettierConfig();
+                this.env.sharedFs.on('change', filePath => {
+                    if (isPrettierConfigFilePath(filePath)) {
+                        this.queueCommitPrettierConfig();
+                    }
+                });
             },
         };
     }
@@ -102,15 +114,21 @@ export default class BootstrapGenerator extends BaseGenerator {
             queueName: MULTISTEP_TRANSFORM_QUEUE,
             once: true,
         });
-        const onChangeListener = file => {
-            if (createMultiStepTransform().templateFileFs.isTemplate(file)) {
-                this.queueMultistepTransform();
-            }
-            else {
-                this.env.sharedFs.once('change', onChangeListener);
-            }
-        };
-        this.env.sharedFs.once('change', onChangeListener);
+    }
+    queueCommitPrettierConfig() {
+        this.queueTask({
+            method: async () => {
+                await this.commitPrettierConfig();
+            },
+            taskName: 'commitPrettierConfig',
+            queueName: PRE_CONFLICTS_QUEUE,
+            once: true,
+        });
+    }
+    async commitPrettierConfig() {
+        const filter = file => isFilePending(file) && isPrettierConfigFilePath(file.path);
+        await this.commitSharedFs(this.env.sharedFs.stream({ filter }));
+        this.log.ok('committed prettier configuration files');
     }
     /**
      * Commits the MemFs to the disc.
@@ -118,15 +136,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,8 @@
  */
 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 './java-unused-imports-transform.mjs';
 export * from './multi-step-transform/index.mjs';
 export * from './prettier-support.mjs';
 export { default as createSortConfigFilesTransform } from './sort-config-files-transform.mjs';