Merge pull request #19941 from mshima/skip_ci-working_tree

Switch to type modules.

.eslintrc.json

@@ -77,7 +77,7 @@
     "prefer-destructuring": "off",
     "no-multi-assign": "off",
     "no-param-reassign": "off",
-    "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
+    "import/no-extraneous-dependencies": "off",
     "no-await-in-loop": "off",
     "no-restricted-syntax": [
       "error",

.github/workflows/generator.yml

@@ -57,7 +57,7 @@ jobs:
             ${{ runner.os }}-node-${{ steps.get-date.outputs.date }}-
             ${{ runner.os }}-node-${{ steps.get-date.outputs.date }}
       - name: 'install required npm version'
-        run: npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);")
+        run: npm install -g npm@$(node -e "console.log(require('./generators/generator-constants.cjs').NPM_VERSION);")
       - run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
         shell: bash
       - name: Config git variables

.mocharc.js → .mocharc.cjs

@@ -5,7 +5,7 @@ module.exports = {
   timeout: 30000,
   ui: 'bdd',
   extension: ['js', 'spec.cjs', 'spec.mjs', 'spec.ts', 'spec.mts'],
-  require: ['mocha-expect-snapshot/old-format', 'test/mocha.config.js'],
+  require: ['mocha-expect-snapshot/old-format', 'test/mocha.config.cjs'],
   // Resolve absolute path for test with fork and different cwd.
   loader: require.resolve('@esbuild-kit/esm-loader'),
   parallel: true,

cli/cli.js → cli/cli.cjs

@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-const { runJHipster } = require('./program');
-const { done, logger } = require('./utils');
+const { runJHipster } = require('./program.cjs');
+const { done, logger } = require('./utils.cjs');
 
 module.exports = runJHipster().catch(done);
 

cli/download.js → cli/download.cjs

@@ -19,8 +19,8 @@
 const fs = require('fs');
 const https = require('https');
 const path = require('path');
-const cliUtils = require('./utils');
-const { packageJson } = require('../lib/index.js');
+const cliUtils = require('./utils.cjs');
+const { packageJson } = require('../lib/index.cjs');
 
 const { logger, toString } = cliUtils;
 

cli/environment-builder.js → cli/environment-builder.cjs

@@ -22,9 +22,9 @@ const _ = require('lodash');
 const path = require('path');
 const { existsSync } = require('fs');
 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 { CLI_NAME, logger } = require('./utils.cjs');
+const { loadYoRc, packageNameToNamespace } = require('../generators/utils.cjs');
+const { parseBlueprintInfo, loadBlueprintsFromConfiguration, mergeBlueprints } = require('../utils/blueprint.cjs');
 
 const createEnvironment = (args, options = {}, adapter) => {
   // Remove after migration to environment 3.

cli/import-jdl.js → cli/import-jdl.cjs

@@ -23,15 +23,15 @@ const path = require('path');
 const pluralize = require('pluralize');
 const { fork: forkProcess } = require('child_process');
 
-const EnvironmentBuilder = require('./environment-builder');
-const { CLI_NAME, GENERATOR_NAME, logger, toString, printSuccess, getOptionAsArgs } = require('./utils');
+const EnvironmentBuilder = require('./environment-builder.cjs');
+const { CLI_NAME, GENERATOR_NAME, logger, toString, printSuccess, getOptionAsArgs } = require('./utils.cjs');
 const { createImporterFromContent, createImporterFromFiles } = require('../jdl/jdl-importer');
 
-const { packageJson: packagejs } = require('../lib/index.js');
-const statistics = require('../generators/statistics');
-const { JHIPSTER_CONFIG_DIR } = require('../generators/generator-constants');
+const { packageJson: packagejs } = require('../lib/index.cjs');
+const statistics = require('../generators/statistics.cjs');
+const { JHIPSTER_CONFIG_DIR } = require('../generators/generator-constants.cjs');
 
-const jhipsterCli = require.resolve('./cli.js');
+const jhipsterCli = require.resolve('./cli.cjs');
 const { writeConfigFile } = require('../jdl/exporters/export-utils');
 const { createFolderIfItDoesNotExist } = require('../jdl/utils/file-utils');
 

cli/index.mjs

@@ -16,5 +16,5 @@
  * 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';
+export { createProgram, buildCommands, buildJHipster, runJHipster, printJHipsterLogo, done, logger } from './program.cjs';
+export { default as EnvironmentBuilder } from './environment-builder.cjs';

cli/jdl.js → cli/jdl.cjs

@@ -19,9 +19,9 @@
 const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
-const cliUtils = require('./utils');
-const importJdl = require('./import-jdl');
-const download = require('./download');
+const cliUtils = require('./utils.cjs');
+const importJdl = require('./import-jdl.cjs');
+const download = require('./download.cjs');
 
 const { logger } = cliUtils;
 

cli/jhipster.js → cli/jhipster.mjs

@@ -17,10 +17,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const semver = require('semver');
-const path = require('path');
-const { logger } = require('./utils');
-const { packageJson } = require('../lib/index.js');
+import semver from 'semver';
+import path from 'path';
+import cliUtils from './utils.cjs';
+import { packageJson } from '../lib/index.mjs';
+
+const { logger } = cliUtils;
 
 const currentNodeVersion = process.versions.node;
 const minimumNodeVersion = packageJson.engines.node;
@@ -45,24 +47,24 @@ if (preferLocalArg && preferGlobalArg) {
 // --prefer-local: Always resolve node modules locally (useful when using linked module)
 const preferLocal = preferLocalArg || (!preferGlobalArg && !process.argv.includes('upgrade'));
 
-requireCLI(preferLocal);
+await requireCLI(preferLocal);
 
 /*
  * Require cli.js giving priority to local version over bundled one if it exists.
  */
-function requireCLI(preferLocal) {
+async 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'));
+      const localCLI = require.resolve(path.join(process.cwd(), 'node_modules', 'generator-jhipster', 'cli', 'cli.mjs'));
       if (__dirname === path.dirname(localCLI)) {
         message = LOCAL_VERSION_MESSAGE;
       } else {
         // load local version
         /* eslint-disable import/no-dynamic-require */
         logger.info(LOCAL_VERSION_MESSAGE);
-        require(localCLI);
+        await import(localCLI);
         return;
       }
     } catch (e) {
@@ -71,6 +73,6 @@ function requireCLI(preferLocal) {
   }
   // load current jhipster
   logger.info(message);
-  require('./cli');
+  await import('./cli.cjs');
   /* eslint-enable  */
 }

cli/logo.cjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 const chalk = require('chalk');
-const { packageJson: packagejs } = require('../lib/index.js');
+const { packageJson: packagejs } = require('../lib/index.cjs');
 
 module.exports.logo = `${chalk.green('        ██╗')}${chalk.red(' ██╗   ██╗ ████████╗ ███████╗   ██████╗ ████████╗ ████████╗ ███████╗')}
 ${chalk.green('        ██║')}${chalk.red(' ██║   ██║ ╚══██╔══╝ ██╔═══██╗ ██╔════╝ ╚══██╔══╝ ██╔═════╝ ██╔═══██╗')}

cli/program.js → cli/program.cjs

@@ -1,3 +1,5 @@
+/* eslint-disable global-require */
+/* eslint-disable import/no-dynamic-require */
 /**
  * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
@@ -23,12 +25,12 @@ const didYouMean = require('didyoumean');
 const fs = require('fs');
 const path = require('path');
 
-const EnvironmentBuilder = require('./environment-builder');
-const SUB_GENERATORS = require('./commands');
-const JHipsterCommand = require('./jhipster-command');
-const { CLI_NAME, logger, getCommand, done } = require('./utils');
-const { packageJson } = require('../lib/index.js');
-const { packageNameToNamespace } = require('../generators/utils');
+const EnvironmentBuilder = require('./environment-builder.cjs');
+const SUB_GENERATORS = require('./commands.cjs');
+const JHipsterCommand = require('./jhipster-command.cjs');
+const { CLI_NAME, logger, getCommand, done } = require('./utils.cjs');
+const { packageJson } = require('../lib/index.cjs');
+const { packageNameToNamespace } = require('../generators/utils.cjs');
 const { logo } = require('./logo.cjs');
 
 const { version: JHIPSTER_VERSION } = packageJson;
@@ -256,7 +258,9 @@ const buildJHipster = ({
   printBlueprintLogo,
   env = envBuilder.getEnvironment(),
   /* eslint-disable-next-line global-require, import/no-dynamic-require */
-  loadCommand = key => require(`./${key}`),
+  loadCommand = key => {
+    return require(`./${key}.cjs`);
+  },
   defaultCommand,
 } = {}) => {
   /* setup debugging */

generators/add/index.cjs

@@ -16,11 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const {
-  Priorities: { INITIALIZING_PRIORITY, COMPOSING_PRIORITY },
-} = require('generator-jhipster/support');
-const BaseBlueprintGenerator = require('../generator-base-blueprint');
-const { GENERATOR_ADD } = require('../generator-list');
+const BaseBlueprintGenerator = require('../base/generator-base-blueprint.cjs');
+const { GENERATOR_ADD } = require('../generator-list.cjs');
 
 /**
  * @experimental
@@ -56,7 +53,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get [INITIALIZING_PRIORITY]() {
+  get [BaseBlueprintGenerator.INITIALIZING]() {
     if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
@@ -71,7 +68,7 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get [COMPOSING_PRIORITY]() {
+  get [BaseBlueprintGenerator.COMPOSING]() {
     if (this.fromBlueprint) return {};
     return this._composing();
   }

generators/app/index.js → generators/app/generator.cjs

@@ -19,38 +19,21 @@
 /* eslint-disable consistent-return */
 const chalk = require('chalk');
 const _ = require('lodash');
-const BaseBlueprintGenerator = require('../generator-base-blueprint');
-const {
-  INITIALIZING_PRIORITY,
-  PROMPTING_PRIORITY,
-  CONFIGURING_PRIORITY,
-  COMPOSING_PRIORITY,
-  DEFAULT_PRIORITY,
-  WRITING_PRIORITY,
-  INSTALL_PRIORITY,
-  END_PRIORITY,
-} = require('../../lib/constants/priorities.cjs').compat;
-
-const cleanup = require('../cleanup');
-const prompts = require('./prompts');
-const { packageJson: packagejs } = require('../../lib/index.js');
-const statistics = require('../statistics');
-const { appDefaultConfig } = require('../generator-defaults');
-const { GENERATOR_APP } = require('../generator-list');
-const { GENERATOR_JHIPSTER } = require('../generator-constants');
+const BaseBlueprintGenerator = require('../base/generator-base-blueprint.cjs');
+
+const cleanup = require('../cleanup.cjs');
+const prompts = require('./prompts.cjs');
+const { packageJson: packagejs } = require('../../lib/index.cjs');
+const statistics = require('../statistics.cjs');
+const { appDefaultConfig } = require('../generator-defaults.cjs');
+const { GENERATOR_APP } = require('../generator-list.cjs');
+const { GENERATOR_JHIPSTER } = require('../generator-constants.cjs');
 const { MICROSERVICE } = require('../../jdl/jhipster/application-types');
 const { OptionNames } = require('../../jdl/jhipster/application-options');
 const { NO: CLIENT_FRAMEWORK_NO } = require('../../jdl/jhipster/client-framework-types');
 
 const { JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY } = OptionNames;
-const {
-  GENERATOR_COMMON,
-  GENERATOR_ENTITIES,
-  GENERATOR_LANGUAGES,
-  GENERATOR_CLIENT,
-  GENERATOR_PAGE,
-  GENERATOR_SERVER,
-} = require('../generator-list');
+const { GENERATOR_COMMON, GENERATOR_LANGUAGES, GENERATOR_CLIENT, GENERATOR_PAGE, GENERATOR_SERVER } = require('../generator-list.cjs');
 
 module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -378,7 +361,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get [INITIALIZING_PRIORITY]() {
+  get [BaseBlueprintGenerator.INITIALIZING]() {
     if (this.delegateToBlueprint) {
       return;
     }
@@ -393,7 +376,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get [PROMPTING_PRIORITY]() {
+  get [BaseBlueprintGenerator.PROMPTING]() {
     if (this.delegateToBlueprint) return;
     return this._prompting();
   }
@@ -429,7 +412,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get [CONFIGURING_PRIORITY]() {
+  get [BaseBlueprintGenerator.CONFIGURING]() {
     if (this.delegateToBlueprint) return;
     return this._configuring();
   }
@@ -486,11 +469,6 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
         this.config.set(config);
       },
 
-      async composeEntities() {
-        if (!this.options.withEntities) return;
-        await this.composeWithJHipster(GENERATOR_ENTITIES, { skipInstall: true }, true);
-      },
-
       async composePages() {
         if (!this.jhipsterConfig.pages || this.jhipsterConfig.pages.length === 0 || this.configOptions.skipComposePage) return;
         this.configOptions.skipComposePage = true;
@@ -506,7 +484,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get [COMPOSING_PRIORITY]() {
+  get [BaseBlueprintGenerator.COMPOSING]() {
     if (this.delegateToBlueprint) return;
     return this._composing();
   }
@@ -523,7 +501,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get [DEFAULT_PRIORITY]() {
+  get [BaseBlueprintGenerator.DEFAULT]() {
     if (this.delegateToBlueprint) return;
     return this._default();
   }
@@ -537,7 +515,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get [WRITING_PRIORITY]() {
+  get [BaseBlueprintGenerator.WRITING]() {
     if (this.delegateToBlueprint) return;
     return this._writing();
   }
@@ -554,7 +532,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get [INSTALL_PRIORITY]() {
+  get [BaseBlueprintGenerator.INSTALL]() {
     if (this.delegateToBlueprint) return;
     return this._install();
   }
@@ -598,7 +576,7 @@ module.exports = class JHipsterAppGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get [END_PRIORITY]() {
+  get [BaseBlueprintGenerator.END]() {
     if (this.delegateToBlueprint) return;
     return this._end();
   }

generators/app/generator.spec.mts

@@ -23,7 +23,7 @@ import { fileURLToPath } from 'url';
 
 import testSupport from '../../test/support/index.cjs';
 import { defaultHelpers as helpers } from '../../test/utils/utils.mjs';
-import Generator from './index.js';
+import Generator from './index.mjs';
 
 const { snakeCase } = lodash;
 const { testBlueprintSupport } = testSupport;
@@ -36,7 +36,7 @@ const generatorPath = join(__dirname, 'index.mjs');
 
 describe(`JHipster ${generator} generator`, () => {
   it('generator-list constant matches folder name', async () => {
-    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+    await expect((await import('../generator-list.cjs')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
   });
   it('should support features parameter', () => {
     const instance = new Generator([], { help: true }, { bar: true });