generator-jhipster 7.4.1 → 7.7.0

package/LICENSE.txt

@@ -1,5 +1,5 @@
 
-    Copyright 2013-2021 the original author or authors from the JHipster project
+    Copyright 2013-2022 the original author or authors from the JHipster project
 
                                  Apache License
                            Version 2.0, January 2004

package/README.md

@@ -2,7 +2,7 @@
 
 [![NPM version][npm-image]][npm-url] [![Downloads][npmcharts-image]][npmcharts-url] [![Gitter][gitter-badge-image]][gitter-badge-url] [![Known Vulnerabilities][snyk-image]][snyk-url]
 
-[![Generator Build Status][github-actions-generator-image]][github-actions-url] [![Angular Build Status][github-actions-angular-image]][github-actions-url] [![React Build Status][github-actions-react-image]][github-actions-url] [![Vue Build Status][github-actions-vue-image]][github-actions-url] [![Webflux Build Status][github-actions-webflux-image]][github-actions-url] [![Azure DevOps Build Status][azure-devops-image]][azure-devops-url-main] [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.jhipster.tech/scans)
+[![Generator Build Status][github-actions-generator-image]][github-actions-url] [![Angular Build Status][github-actions-angular-image]][github-actions-url] [![React Build Status][github-actions-react-image]][github-actions-url] [![Vue Build Status][github-actions-vue-image]][github-actions-url] [![Webflux Build Status][github-actions-webflux-image]][github-actions-url] [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.jhipster.tech/scans)
 
 Greetings, Java Hipster!
 
@@ -125,12 +125,10 @@ Additional builds at [hipster-labs/jhipster-daily-builds](https://github.com/hip
 [sonar-coverage]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=coverage
 [sonar-bugs]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=bugs
 [sonar-vulnerabilities]: https://sonarcloud.io/api/project_badges/measure?project=jhipster-sample-application&metric=vulnerabilities
-[jhipster-image]: https://raw.githubusercontent.com/jhipster/jhipster-artwork/main/logos/JHipster%20RGB-small100x25px.png
+[jhipster-image]: https://raw.githubusercontent.com/jhipster/jhipster-artwork/main/logos/v2/normal/V2%20JHipster%20RGB.png
 [jhipster-url]: https://www.jhipster.tech/
 [npm-image]: https://badge.fury.io/js/generator-jhipster.svg
 [npm-url]: https://npmjs.org/package/generator-jhipster
-[azure-devops-image]: https://dev.azure.com/jhipster/generator-jhipster/_apis/build/status/jhipster.generator-jhipster?branchName=main
-[azure-devops-url-main]: https://dev.azure.com/jhipster/generator-jhipster/_build
 [github-actions-generator-image]: https://github.com/jhipster/generator-jhipster/workflows/Generator/badge.svg
 [github-actions-angular-image]: https://github.com/jhipster/generator-jhipster/workflows/Angular/badge.svg
 [github-actions-react-image]: https://github.com/jhipster/generator-jhipster/workflows/React/badge.svg

package/cli/cli.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.
@@ -59,6 +59,9 @@ const defaultCommands = {
   gae: {
     desc: 'Deploy the current application to Google App Engine',
   },
+  'generate-blueprint': {
+    desc: 'Generate a blueprint',
+  },
   gradle: {
     desc: 'Create Gradle project (alpha)',
   },

package/cli/download.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/cli/environment-builder.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.
@@ -24,7 +24,18 @@ const Environment = require('yeoman-environment');
 const { CLI_NAME, logger } = require('./utils');
 const { loadYoRc, packageNameToNamespace } = require('../generators/utils');
 const { parseBlueprintInfo, loadBlueprintsFromConfiguration, mergeBlueprints } = require('../utils/blueprint');
-const SharedData = require('../lib/support/shared-data.cjs');
+
+const createEnvironment = (args, options = {}, adapter) => {
+  // Remove after migration to environment 3.
+  const configOptions = { sharedEntities: {} };
+  const sharedOptions = {
+    fromCli: true,
+    localConfigOnly: true,
+    ...options.sharedOptions,
+    configOptions,
+  };
+  return Environment.createEnv(args, { newErrorHandler: true, ...options, sharedOptions }, adapter);
+};
 
 module.exports = class EnvironmentBuilder {
   /**
@@ -34,15 +45,7 @@ module.exports = class EnvironmentBuilder {
    * @return {EnvironmentBuilder} envBuilder
    */
   static create(args, options = {}, adapter) {
-    // Remove after migration to environment 3.
-    const sharedOptions = {
-      fromCli: true,
-      localConfigOnly: true,
-      ...options.sharedOptions,
-      configOptions: { sharedEntities: {} },
-      jhipsterSharedData: new SharedData(),
-    };
-    const env = Environment.createEnv(args, { newErrorHandler: true, ...options, sharedOptions }, adapter);
+    const env = createEnvironment(args, options, adapter);
     env.setMaxListeners(0);
     return new EnvironmentBuilder(env);
   }
@@ -68,11 +71,7 @@ module.exports = class EnvironmentBuilder {
    * @return {EnvironmentBuilder} envBuilder
    */
   static createDefaultBuilder(...args) {
-    return EnvironmentBuilder.create(...args)
-      ._lookupJHipster()
-      ._loadBlueprints()
-      ._lookupBlueprints()
-      ._loadSharedOptions();
+    return EnvironmentBuilder.create(...args).prepare();
   }
 
   /**
@@ -86,10 +85,26 @@ module.exports = class EnvironmentBuilder {
     this.env = env;
   }
 
+  prepare({ blueprints, lookups } = {}) {
+    this._lookupJHipster()._loadBlueprints(blueprints)._lookups(lookups)._lookupBlueprints()._loadSharedOptions();
+    return this;
+  }
+
   getBlueprintsNamespaces() {
     return Object.keys(this._blueprintsWithVersion).map(packageName => packageNameToNamespace(packageName));
   }
 
+  /**
+   * Construct blueprint option value.
+   *
+   * @return {String}
+   */
+  getBlueprintsOption() {
+    return Object.entries(this._blueprintsWithVersion)
+      .map(([packageName, packageVersion]) => (packageVersion ? `${packageName}@${packageVersion}` : packageName))
+      .join(',');
+  }
+
   /**
    * @private
    * Lookup current jhipster generators.
@@ -108,14 +123,25 @@ module.exports = class EnvironmentBuilder {
     return this;
   }
 
+  _lookups(lookups = []) {
+    lookups = [].concat(lookups);
+    lookups.forEach(lookup => {
+      this.env.lookup(lookup);
+    });
+    return this;
+  }
+
   /**
    * @private
    * Load blueprints from argv, .yo-rc.json.
    *
    * @return {EnvironmentBuilder} this for chaining.
    */
-  _loadBlueprints() {
-    this._blueprintsWithVersion = this._getAllBlueprintsWithVersion();
+  _loadBlueprints(blueprints) {
+    this._blueprintsWithVersion = {
+      ...this._getAllBlueprintsWithVersion(),
+      ...blueprints,
+    };
     return this;
   }
 
@@ -284,7 +310,16 @@ module.exports = class EnvironmentBuilder {
       /* eslint-disable import/no-dynamic-require */
       /* eslint-disable global-require */
       try {
-        const blueprintCommands = require(`${packagePath}/cli/commands`);
+        let blueprintCommand;
+        try {
+          blueprintCommand = require(`${packagePath}/cli/commands`);
+        } catch (e) {
+          blueprintCommand = require(`${packagePath}/cli/commands.cjs`);
+        }
+        const blueprintCommands = _.cloneDeep(blueprintCommand);
+        Object.entries(blueprintCommands).forEach(([_command, commandSpec]) => {
+          commandSpec.blueprint = commandSpec.blueprint || blueprint;
+        });
         result = { ...result, ...blueprintCommands };
       } catch (e) {
         const msg = `No custom commands found within blueprint: ${blueprint} at ${packagePath}`;

package/cli/import-jdl.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.
@@ -161,6 +161,9 @@ function runGenerator(command, { cwd, fork, env }, generatorOptions = {}) {
     commandName: undefined,
     fromJdl: true,
   };
+  if (!generatorOptions.blueprints) {
+    delete generatorOptions.blueprints;
+  }
 
   if (!fork) {
     const oldCwd = process.cwd();

package/cli/index.mjs

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2022 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 { createProgram, buildCommands, buildJHipster, runJHipster, printJHipsterLogo, done, logger } from './program.js';
+export { default as EnvironmentBuilder } from './environment-builder.js';

package/cli/jdl.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/cli/jhipster-command.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/cli/jhipster.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.
@@ -25,44 +25,52 @@ const { logger } = require('./utils');
 const currentNodeVersion = process.versions.node;
 const minimumNodeVersion = packageJson.engines.node;
 
+const BUNDLED_VERSION_MESSAGE = 'Using bundled JHipster';
+const LOCAL_VERSION_MESSAGE = "Switching to JHipster installed locally in current project's node repository (node_modules)";
+
 if (!semver.satisfies(currentNodeVersion, minimumNodeVersion)) {
   logger.fatal(
     `You are running Node version ${currentNodeVersion}\nJHipster requires Node version ${minimumNodeVersion}\nPlease update your version of Node.`
   );
 }
 
-let preferLocal = true;
+const preferLocalArg = process.argv.includes('--prefer-local');
+const preferGlobalArg = process.argv.includes('--prefer-global') || process.argv.includes('--bundled');
+
+if (preferLocalArg && preferGlobalArg) {
+  throw new Error('--prefer-local and --prefer-bundled cannot be used together');
+}
 
 // Don't use commander for parsing command line to avoid polluting it in cli.js
 // --prefer-local: Always resolve node modules locally (useful when using linked module)
-if ((process.argv.includes('upgrade') && !process.argv.includes('--prefer-local')) || process.argv.includes('--prefer-global')) {
-  // Prefer global version for `jhipster upgrade` to get most recent code
-  preferLocal = false;
-}
+const preferLocal = preferLocalArg || (!preferGlobalArg && !process.argv.includes('upgrade'));
 
 requireCLI(preferLocal);
 
 /*
- * Require cli.js giving priority to local version over global one if it exists.
+ * Require cli.js giving priority to local version over bundled one if it exists.
  */
 function requireCLI(preferLocal) {
+  let message = BUNDLED_VERSION_MESSAGE;
   /* eslint-disable global-require */
   if (preferLocal) {
     try {
       const localCLI = require.resolve(path.join(process.cwd(), 'node_modules', 'generator-jhipster', 'cli', 'cli.js'));
-      if (__dirname !== path.dirname(localCLI)) {
+      if (__dirname === path.dirname(localCLI)) {
+        message = LOCAL_VERSION_MESSAGE;
+      } else {
         // load local version
         /* eslint-disable import/no-dynamic-require */
-        logger.info("Using JHipster version installed locally in current project's node_modules");
+        logger.info(LOCAL_VERSION_MESSAGE);
         require(localCLI);
         return;
       }
     } catch (e) {
-      // Unable to find local version, so global one will be loaded anyway
+      // Unable to find local version, so bundled one will be loaded anyway
     }
   }
-  // load global version
-  logger.info('Using JHipster version installed globally');
+  // load current jhipster
+  logger.info(message);
   require('./cli');
   /* eslint-enable  */
 }

package/cli/program.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.
@@ -27,18 +27,27 @@ const EnvironmentBuilder = require('./environment-builder');
 const SUB_GENERATORS = require('./commands');
 const JHipsterCommand = require('./jhipster-command');
 const { CLI_NAME, logger, getCommand, done } = require('./utils');
-const { version } = require('../package.json');
+const { version: JHIPSTER_VERSION } = require('../package.json');
 const { packageNameToNamespace } = require('../generators/utils');
+const { logo } = require('../lib/constants/logo.cjs');
 
 const JHIPSTER_NS = CLI_NAME;
 
 const moreInfo = `\n  For more info visit ${chalk.blue('https://www.jhipster.tech')}\n`;
 
-const createProgram = () => {
+const printJHipsterLogo = () => {
+  // eslint-disable-next-line no-console
+  console.log();
+  // eslint-disable-next-line no-console
+  console.log(logo);
+};
+
+const createProgram = ({ executableName = CLI_NAME, executableVersion } = {}) => {
   return (
     new JHipsterCommand()
+      .name(executableName)
       .storeOptionsAsProperties(false)
-      .version(version)
+      .version(executableVersion ? `${executableVersion} (generator-jhipster ${JHIPSTER_VERSION})` : JHIPSTER_VERSION)
       .addHelpText('after', moreInfo)
       // JHipster common options
       .option(
@@ -56,17 +65,20 @@ const createProgram = () => {
       .option('--skip-regenerate', "Don't regenerate identical files", false)
       .option('--skip-yo-resolve', 'Ignore .yo-resolve files', false)
       .addOption(new Option('--from-jdl', 'Allow every option jdl forwards').default(false).hideHelp())
-      .addOption(new Option('--prefer-global', 'Run jhipster installed globally').hideHelp())
-      .addOption(new Option('--prefer-local', 'Run jhipster installed locally').hideHelp())
+      .addOption(new Option('--bundled', 'Use JHipster generators bundled with current cli'))
+      .addOption(new Option('--prefer-global', 'Alias for --blundled').hideHelp())
+      .addOption(new Option('--prefer-local', 'Prefer JHipster generators installed in current folder node repository.').hideHelp())
   );
 };
 
-const rejectExtraArgs = (program, cmd, extraArgs) => {
+const rejectExtraArgs = ({ program, command, extraArgs }) => {
   // if extraArgs exists: Unknown commands or unknown argument.
   const first = extraArgs[0];
-  if (cmd !== 'app') {
+  if (command.name() !== 'app') {
     logger.fatal(
-      `${chalk.yellow(cmd)} command doesn't take ${chalk.yellow(first)} argument. See '${chalk.white(`${CLI_NAME} ${cmd} --help`)}'.`
+      `${chalk.yellow(command.name())} command doesn't take ${chalk.yellow(first)} argument. See '${chalk.white(
+        `${program.name()} ${command.name()} --help`
+      )}'.`
     );
   }
   const availableCommands = program.commands.map(c => c._name);
@@ -80,18 +92,28 @@ const rejectExtraArgs = (program, cmd, extraArgs) => {
   logger.fatal(message);
 };
 
-const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand }) => {
+const buildCommands = ({
+  program,
+  commands = {},
+  envBuilder,
+  env,
+  loadCommand,
+  defaultCommand = 'app',
+  printLogo = printJHipsterLogo,
+  printBlueprintLogo = () => {},
+}) => {
   /* create commands */
   Object.entries(commands).forEach(([cmdName, opts]) => {
+    const { desc, blueprint, argument, options: commandOptions, alias, help: commandHelp, cliOnly, useOptions = {} } = opts;
     program
-      .command(cmdName, '', { isDefault: cmdName === 'app' })
-      .description(opts.desc + (opts.blueprint ? chalk.yellow(` (blueprint: ${opts.blueprint})`) : ''))
-      .addCommandArguments(opts.argument)
-      .addCommandOptions(opts.options)
-      .addHelpText('after', opts.help)
-      .addAlias(opts.alias)
+      .command(cmdName, '', { isDefault: cmdName === defaultCommand })
+      .description(desc + (blueprint ? chalk.yellow(` (blueprint: ${blueprint})`) : ''))
+      .addCommandArguments(argument)
+      .addCommandOptions(commandOptions)
+      .addHelpText('after', commandHelp)
+      .addAlias(alias)
       .excessArgumentsCallback(function (receivedArgs) {
-        rejectExtraArgs(program, this.name(), receivedArgs);
+        rejectExtraArgs({ program, command: this, extraArgs: receivedArgs });
       })
       .lazyBuildCommand(async function (operands) {
         logger.debug(`cmd: lazyBuildCommand ${cmdName} ${operands}`);
@@ -114,18 +136,32 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
           );
           return;
         }
-        if (!opts.cliOnly || cmdName === 'jdl') {
-          if (opts.blueprint) {
+        if (!cliOnly || cmdName === 'jdl') {
+          if (blueprint) {
             // Blueprint only command.
-            const generator = await env.create(`${packageNameToNamespace(opts.blueprint)}:${cmdName}`, { options: { help: true } });
+            const generator = await env.create(`${packageNameToNamespace(blueprint)}:${cmdName}`, { options: { help: true } });
             command.addGeneratorArguments(generator._arguments).addGeneratorOptions(generator._options);
           } else {
             const generatorName = cmdName === 'jdl' ? 'app' : cmdName;
+            const dependencies = [];
             // Register jhipster upstream options.
             if (cmdName !== 'jdl') {
-              const generator = await env.create(`${JHIPSTER_NS}:${cmdName}`, { options: { help: true } });
+              const helpOptions = { options: { help: true } };
+              const generator = await env.create(`${JHIPSTER_NS}:${cmdName}`, helpOptions);
               command.addGeneratorArguments(generator._arguments).addGeneratorOptions(generator._options);
 
+              const addDependenciesOptions = newDependencies =>
+                Promise.all(
+                  newDependencies.map(async dependency => {
+                    if (dependencies.includes(dependency)) return undefined;
+                    dependencies.push(dependency);
+                    const dependecyGenerator = await env.create(`${JHIPSTER_NS}:${dependency}`, helpOptions);
+                    command.addGeneratorOptions(dependecyGenerator._options);
+                    return addDependenciesOptions(await dependecyGenerator.getPossibleDependencies());
+                  })
+                );
+              await addDependenciesOptions(await generator.getPossibleDependencies());
+
               const usagePath = path.resolve(generator.sourceRoot(), '../USAGE');
               if (fs.existsSync(usagePath)) {
                 command.addHelpText('after', `\n${fs.readFileSync(usagePath, 'utf8')}`);
@@ -141,19 +177,24 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
 
             // Register blueprint specific options.
             await Promise.all(
-              envBuilder.getBlueprintsNamespaces().map(async blueprintNamespace => {
-                const generatorNamespace = `${blueprintNamespace}:${generatorName}`;
-                if (!(await env.get(generatorNamespace))) {
-                  return;
-                }
-                const blueprintName = blueprintNamespace.replace(/^jhipster-/, '');
-                const blueprintGenerator = await env.create(generatorNamespace, { options: { help: true } });
-                try {
-                  command.addGeneratorOptions(blueprintGenerator._options, chalk.yellow(` (blueprint option: ${blueprintName})`));
-                } catch (error) {
-                  logger.info(`Error parsing options for generator ${generatorNamespace}, error: ${error}`);
-                }
-              })
+              envBuilder
+                .getBlueprintsNamespaces()
+                .map(blueprintNamespace =>
+                  [generatorName, ...dependencies].map(async dependency => {
+                    const generatorNamespace = `${blueprintNamespace}:${generatorName}`;
+                    if (!(await env.get(generatorNamespace))) {
+                      return;
+                    }
+                    const blueprintName = blueprintNamespace.replace(/^jhipster-/, '');
+                    const blueprintGenerator = await env.create(generatorNamespace, { options: { help: true } });
+                    try {
+                      command.addGeneratorOptions(blueprintGenerator._options, chalk.yellow(` (blueprint option: ${blueprintName})`));
+                    } catch (error) {
+                      logger.info(`Error parsing options for generator ${generatorNamespace}, error: ${error}`);
+                    }
+                  })
+                )
+                .flat()
             );
           }
         }
@@ -168,7 +209,9 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
         const options = {
           ...program.opts(),
           ...cmdOptions,
+          ...useOptions,
           commandName: cmdName,
+          blueprints: envBuilder.getBlueprintsOption(),
         };
         if (options.installPath) {
           // eslint-disable-next-line no-console
@@ -176,7 +219,10 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
           return undefined;
         }
 
-        if (opts.cliOnly) {
+        printLogo();
+        printBlueprintLogo();
+
+        if (cliOnly) {
           logger.debug('Executing CLI only script');
           return loadCommand(cmdName)(args, options, env, envBuilder);
         }
@@ -188,7 +234,7 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
             errors => done(errors.find(error => error))
           );
         }
-        const namespace = opts.blueprint ? `${packageNameToNamespace(opts.blueprint)}:${cmdName}` : `${JHIPSTER_NS}:${cmdName}`;
+        const namespace = blueprint ? `${packageNameToNamespace(blueprint)}:${cmdName}` : `${JHIPSTER_NS}:${cmdName}`;
         const generatorCommand = getCommand(namespace, args, opts);
         return env.run(generatorCommand, options).then(done, done);
       });
@@ -196,17 +242,24 @@ const buildCommands = ({ program, commands = {}, envBuilder, env, loadCommand })
 };
 
 const buildJHipster = ({
-  program = createProgram(),
-  envBuilder = EnvironmentBuilder.createDefaultBuilder(),
+  executableName,
+  executableVersion,
+  program = createProgram({ executableName, executableVersion }),
+  blueprints,
+  lookups,
+  envBuilder = EnvironmentBuilder.create().prepare({ blueprints, lookups }),
   commands = { ...SUB_GENERATORS, ...envBuilder.getBlueprintCommands() },
+  printLogo,
+  printBlueprintLogo,
   env = envBuilder.getEnvironment(),
   /* eslint-disable-next-line global-require, import/no-dynamic-require */
   loadCommand = key => require(`./${key}`),
+  defaultCommand,
 } = {}) => {
   /* setup debugging */
   logger.init(program);
 
-  buildCommands({ program, commands, envBuilder, env, loadCommand });
+  buildCommands({ program, commands, envBuilder, env, loadCommand, defaultCommand, printLogo, printBlueprintLogo });
 
   return program;
 };
@@ -221,4 +274,7 @@ module.exports = {
   buildCommands,
   buildJHipster,
   runJHipster,
+  printJHipsterLogo,
+  done,
+  logger,
 };

package/cli/utils.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/generators/add/index.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/generators/app/esm.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.
@@ -16,6 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import generator from './index.js';
-
-export default generator;
+export { default } from './index.js';