migrate remaining cjs files to mjs

jhipster · Dec 26, 2022 · 677d2fd · 677d2fd
1 parent b386957
commit 677d2fd
Show file tree

Hide file tree

Showing 123 changed files with 865 additions and 926 deletions.
diff --git a/cli/environment-builder.mjs b/cli/environment-builder.mjs
@@ -26,7 +26,7 @@ import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 import { CLI_NAME, logger } from './utils.mjs';
-import generatorUtils from '../generators/utils.cjs';
+import generatorUtils from '../generators/utils.mjs';
 import { parseBlueprintInfo, loadBlueprintsFromConfiguration, mergeBlueprints } from '../utils/blueprint.mjs';
 
 const { packageNameToNamespace } = generatorUtils;

diff --git a/cli/import-jdl.mjs b/cli/import-jdl.mjs
@@ -28,10 +28,11 @@ import { fork as forkProcess } from 'child_process';
 import EnvironmentBuilder from './environment-builder.mjs';
 import { CLI_NAME, GENERATOR_NAME, logger, printSuccess, getOptionAsArgs } from './utils.mjs';
 import { packageJson as packagejs } from '../lib/index.mjs';
-import statistics from '../generators/statistics.cjs';
-import { JHIPSTER_CONFIG_DIR } from '../generators/generator-constants.mjs';
+import statistics from '../generators/statistics.mjs';
+import constants from '../generators/generator-constants.mjs';
 import { writeConfigFile } from './export-utils.mjs';
 
+const { JHIPSTER_CONFIG_DIR } = constants;
 const jhipsterCli = join(dirname(fileURLToPath(import.meta.url)), 'cli.mjs');
 
 const getDeploymentType = deployment => deployment && deployment[GENERATOR_NAME] && deployment[GENERATOR_NAME].deploymentType;

diff --git a/cli/program.mjs b/cli/program.mjs
@@ -32,7 +32,7 @@ import SUB_GENERATORS from './commands.mjs';
 import JHipsterCommand from './jhipster-command.mjs';
 import { CLI_NAME, logger, getCommand, done } from './utils.mjs';
 import { packageJson } from '../lib/index.mjs';
-import generatorUtils from '../generators/utils.cjs';
+import generatorUtils from '../generators/utils.mjs';
 
 const { packageNameToNamespace } = generatorUtils;
 const __filename = fileURLToPath(import.meta.url);

diff --git a/generators/angular/generator.spec.mts b/generators/angular/generator.spec.mts
@@ -9,7 +9,7 @@ import Generator from './index.mjs';
 import { defaultHelpers as helpers } from '../../test/support/helpers.mjs';
 
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
-import constants from '../generator-constants.cjs';
+import constants from '../generator-constants.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 
 const { snakeCase } = lodash;

diff --git a/generators/app/generator.mjs b/generators/app/generator.mjs
@@ -26,7 +26,7 @@ import serverOptions from '../server/options.mjs';
 import { cleanupOldFiles, upgradeFiles } from '../cleanup.mjs';
 import prompts from './prompts.mjs';
 import { packageJson as packagejs } from '../../lib/index.mjs';
-import statistics from '../statistics.cjs';
+import statistics from '../statistics.mjs';
 import generatorDefaults from '../generator-defaults.mjs';
 import {
   GENERATOR_APP,

diff --git a/generators/app/prompts.mjs b/generators/app/prompts.mjs
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import statistics from '../statistics.cjs';
+import statistics from '../statistics.mjs';
 import { packageJson as packagejs } from '../../lib/index.mjs';
 import generatorsDefaults from '../generator-defaults.mjs';
 import { applicationTypes, testFrameworkTypes } from '../../jdl/jhipster/index.mjs';

diff --git a/generators/aws/generator.mjs b/generators/aws/generator.mjs
@@ -20,8 +20,8 @@ import chalk from 'chalk';
 import BaseGenerator from '../base/index.mjs';
 
 import prompts from './prompts.mjs';
-import AwsFactory from './lib/aws.cjs';
-import statistics from '../statistics.cjs';
+import AwsFactory from './lib/aws.mjs';
+import statistics from '../statistics.mjs';
 import { GENERATOR_AWS } from '../generator-list.mjs';
 import { applicationOptions, databaseTypes } from '../../jdl/jhipster/index.mjs';
 

diff --git a/generators/aws/lib/aws.cjs → generators/aws/lib/aws.mjs b/generators/aws/lib/aws.cjs → generators/aws/lib/aws.mjs
@@ -16,23 +16,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const S3 = require('./s3.cjs');
-const Rds = require('./rds.cjs');
-const Eb = require('./eb.cjs');
-const Iam = require('./iam.cjs');
+import S3 from './s3.mjs';
+import Rds from './rds.mjs';
+import Eb from './eb.mjs';
+import Iam from './iam.mjs';
 
 let Aws;
 let generator;
 
-const AwsFactory = (module.exports = function AwsFactory(generatorRef, cb) {
+const AwsFactory = function AwsFactory(generatorRef, cb) {
   generator = generatorRef;
   try {
     Aws = require('aws-sdk'); // eslint-disable-line
     cb();
   } catch (e) {
     generator.error(`Something went wrong while running jhipster:aws:\n${e}`);
   }
-});
+};
 
 AwsFactory.prototype.init = function initAws(options) {
   Aws.config.region = options.region;
@@ -53,3 +53,5 @@ AwsFactory.prototype.getEb = function getEb() {
 AwsFactory.prototype.getIam = function getIa() {
   return new Iam(Aws, generator);
 };
+
+export default AwsFactory;
diff --git a/generators/aws/lib/eb.cjs → generators/aws/lib/eb.mjs b/generators/aws/lib/eb.cjs → generators/aws/lib/eb.mjs
@@ -19,15 +19,15 @@
 let aws;
 let uuidV4;
 
-const Eb = (module.exports = function Eb(Aws, generator) {
+const Eb = function Eb(Aws, generator) {
   aws = Aws;
   try {
     const { v4 } = require('uuid'); // eslint-disable-line
     uuidV4 = v4;
   } catch (e) {
     generator.error(`Something went wrong while running jhipster:aws:\n${e}`);
   }
-});
+};
 
 Eb.prototype.createApplication = function createApplication(params, callback) {
   const applicationName = params.applicationName;
@@ -245,3 +245,4 @@ function updateEnvironment(params, callback) {
     }
   });
 }
+export default Eb;
diff --git a/generators/aws/lib/iam.cjs → generators/aws/lib/iam.mjs b/generators/aws/lib/iam.cjs → generators/aws/lib/iam.mjs
@@ -25,10 +25,10 @@ const AWS_SERVICE_ARN = suffix => `arn:aws:iam::aws:policy/service-role/${suffix
 let aws;
 let log;
 
-const Iam = (module.exports = function Iam(Aws, generator) {
+const Iam = function Iam(Aws, generator) {
   aws = Aws;
   log = generator.log;
-});
+};
 
 const createRole = (RoleName, Description, AssumeRolePolicyDocument) => {
   const iam = new aws.IAM();
@@ -219,3 +219,4 @@ Iam.prototype.verifyRoles = function verifyRoles(params, callback) {
       );
     });
 };
+export default Iam;
diff --git a/generators/aws/lib/rds.cjs → generators/aws/lib/rds.mjs b/generators/aws/lib/rds.cjs → generators/aws/lib/rds.mjs
@@ -18,9 +18,9 @@
  */
 let aws;
 
-const Rds = (module.exports = function Rds(Aws) {
+const Rds = function Rds(Aws) {
   aws = Aws;
-});
+};
 
 Rds.prototype.createDatabase = function createDatabase(params, callback) {
   const dbInstanceClass = params.dbInstanceClass;
@@ -148,3 +148,4 @@ function createDbInstance(params, callback) {
     }
   });
 }
+export default Rds;
diff --git a/generators/aws/lib/s3.cjs → generators/aws/lib/s3.mjs b/generators/aws/lib/s3.cjs → generators/aws/lib/s3.mjs
@@ -16,23 +16,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const fs = require('fs');
-
-const { GRADLE } = require('../../../jdl/jhipster/build-tool-types');
+import fs from 'fs';
+import { buildToolTypes } from '../../../jdl/jhipster/index.mjs';
 
+const { GRADLE } = buildToolTypes;
 const FILE_EXTENSION = '.war';
 const S3_STANDARD_REGION = 'us-east-1';
 
 let Progressbar;
 
-const S3 = (module.exports = function S3(Aws, generator) {
+const S3 = function S3(Aws, generator) {
   this.Aws = Aws;
   try {
     Progressbar = require('progress'); // eslint-disable-line
   } catch (e) {
     generator.error(`Something went wrong while running jhipster:aws:\n${e}`);
   }
-});
+};
 
 S3.prototype.createBucket = function createBucket(params, callback) {
   const bucket = params.bucket;
@@ -161,3 +161,5 @@ function success(message, callback) {
 function error(message, callback) {
   callback({ message }, null);
 }
+
+export default S3;
diff --git a/generators/azure-app-service/generator.mjs b/generators/azure-app-service/generator.mjs
@@ -23,11 +23,11 @@ import { exec } from 'child_process';
 import chalk from 'chalk';
 import BaseGenerator from '../base/index.mjs';
 
-import statistics from '../statistics.cjs';
+import statistics from '../statistics.mjs';
 import generatorDefaults from '../generator-defaults.mjs';
 
 // Global constants
-import constants from '../generator-constants.cjs';
+import constants from '../generator-constants.mjs';
 
 import { GENERATOR_AZURE_APP_SERVICE } from '../generator-list.mjs';
 import { buildToolTypes } from '../../jdl/jhipster/index.mjs';

diff --git a/generators/azure-spring-cloud/generator.mjs b/generators/azure-spring-cloud/generator.mjs
@@ -21,9 +21,9 @@ import { exec } from 'child_process';
 import chalk from 'chalk';
 import BaseGenerator from '../base/index.mjs';
 
-import statistics from '../statistics.cjs';
+import statistics from '../statistics.mjs';
 
-import constants from '../generator-constants.cjs';
+import constants from '../generator-constants.mjs';
 
 import { cacheTypes, buildToolTypes } from '../../jdl/jhipster/index.mjs';
 import { GENERATOR_AZURE_SPRING_CLOUD } from '../generator-list.mjs';

diff --git a/generators/base-application/generator.mjs b/generators/base-application/generator.mjs
@@ -20,8 +20,9 @@ import _ from 'lodash';
 
 import BaseGenerator from '../base/index.mjs';
 import { CUSTOM_PRIORITIES, PRIORITY_NAMES, QUEUES } from './priorities.mjs';
-import { JHIPSTER_CONFIG_DIR } from '../generator-constants.mjs';
+import constants from '../generator-constants.mjs';
 
+const { JHIPSTER_CONFIG_DIR } = constants;
 const {
   LOADING,
   PREPARING,

diff --git a/generators/base-application/priorities.cjs b/generators/base-application/priorities.cjs