Changes before error encountered

Co-authored-by: kobenguyent <[email protected]>

Author: Copilot

lib/codecept.js

@@ -1,15 +1,20 @@
-const { existsSync, readFileSync } = require('fs')
-const { globSync } = require('glob')
-const shuffle = require('lodash.shuffle')
-const fsPath = require('path')
-const { resolve } = require('path')
-
-const container = require('./container')
-const Config = require('./config')
-const event = require('./event')
-const runHook = require('./hooks')
-const output = require('./output')
-const { emptyFolder } = require('./utils')
+import { existsSync, readFileSync } from 'fs';
+import { globSync } from 'glob';
+import shuffle from 'lodash.shuffle';
+import fsPath from 'path';
+import { resolve } from 'path';
+import { fileURLToPath } from 'url';
+import path from 'path';
+
+import container from './container.js';
+import Config from './config.js';
+import event from './event.js';
+import runHook from './hooks.js';
+import output from './output.js';
+import { emptyFolder } from './utils.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 /**
  * CodeceptJS runner
@@ -26,23 +31,24 @@ class Codecept {
     this.config = Config.create(config)
     this.opts = opts
     this.testFiles = new Array(0)
-    this.requireModules(config.require)
+    // Note: requireModules is now async and should be called after construction
   }
 
   /**
    * Require modules before codeceptjs running
    *
    * @param {string[]} requiringModules
    */
-  requireModules(requiringModules) {
+  async requireModules(requiringModules) {
     if (requiringModules) {
-      requiringModules.forEach(requiredModule => {
+      for (const requiredModule of requiringModules) {
+        let modulePath = requiredModule;
         const isLocalFile = existsSync(requiredModule) || existsSync(`${requiredModule}.js`)
         if (isLocalFile) {
-          requiredModule = resolve(requiredModule)
+          modulePath = resolve(requiredModule)
         }
-        require(requiredModule)
-      })
+        await import(modulePath);
+      }
     }
   }
 
@@ -52,8 +58,9 @@ class Codecept {
    *
    * @param {string} dir
    */
-  init(dir) {
-    this.initGlobals(dir)
+  async init(dir) {
+    await this.requireModules(this.config.require);
+    await this.initGlobals(dir)
     // initializing listeners
     container.create(this.config, this.opts)
     this.runHooks()
@@ -64,28 +71,47 @@ class Codecept {
    *
    * @param {string} dir
    */
-  initGlobals(dir) {
+  async initGlobals(dir) {
     global.codecept_dir = dir
     global.output_dir = fsPath.resolve(dir, this.config.output)
 
     if (this.config.emptyOutputFolder) emptyFolder(global.output_dir)
 
     if (!this.config.noGlobals) {
-      global.Helper = global.codecept_helper = require('@codeceptjs/helper')
-      global.actor = global.codecept_actor = require('./actor')
-      global.pause = require('./pause')
-      global.within = require('./within')
-      global.session = require('./session')
-      global.DataTable = require('./data/table')
-      global.locate = locator => require('./locator').build(locator)
+      const helper = await import('@codeceptjs/helper');
+      global.Helper = global.codecept_helper = helper.default || helper;
+      
+      const actor = await import('./actor.js');
+      global.actor = global.codecept_actor = actor.default || actor;
+      
+      const pause = await import('./pause.js');
+      global.pause = pause.default || pause;
+      
+      const within = await import('./within.js');
+      global.within = within.default || within;
+      
+      const session = await import('./session.js');
+      global.session = session.default || session;
+      
+      const DataTable = await import('./data/table.js');
+      global.DataTable = DataTable.default || DataTable;
+      
+      const locator = await import('./locator.js');
+      global.locate = loc => (locator.default || locator).build(loc);
+      
       global.inject = container.support
       global.share = container.share
-      global.secret = require('./secret').secret
+      
+      const secret = await import('./secret.js');
+      global.secret = secret.secret;
+      
       global.codecept_debug = output.debug
-      global.codeceptjs = require('./index') // load all objects
+      
+      const codeceptjs = await import('./index.js');
+      global.codeceptjs = codeceptjs.default || codeceptjs; // load all objects
 
       // BDD
-      const stepDefinitions = require('./mocha/bdd')
+      const stepDefinitions = await import('./mocha/bdd.js');
       global.Given = stepDefinitions.Given
       global.When = stepDefinitions.When
       global.Then = stepDefinitions.Then
@@ -226,4 +252,4 @@ class Codecept {
   }
 }
 
-module.exports = Codecept
+export default Codecept;

lib/colorUtils.js

@@ -248,7 +248,7 @@ function isColorProperty(prop) {
   ].indexOf(prop) > -1;
 }
 
-module.exports = {
+export {
   isColorProperty,
   convertColorToRGBA,
   convertColorNameToHex,

lib/config.js

@@ -1,6 +1,6 @@
-const fs = require('fs')
-const path = require('path')
-const { fileExists, isFile, deepMerge, deepClone } = require('./utils')
+import fs from 'fs';
+import path from 'path';
+import { fileExists, isFile, deepMerge, deepClone } from './utils.js';
 
 const defaultConfig = {
   output: './_output',
@@ -167,7 +167,9 @@ class Config {
   }
 }
 
-module.exports = Config
+export default Config;
+
+export { loadConfigFile, loadConfigFileSync };
 
 /**
  * Check if a file should be treated as ESM
@@ -221,7 +223,7 @@ async function loadConfigFile(configFile) {
 
   if (extensionName === '.ts') {
     try {
-      require('ts-node/register')
+      await import('ts-node/register');
     } catch (err) {
       console.log('ts-node package is required to parse codecept.conf.ts config correctly')
     }
@@ -244,8 +246,10 @@ async function loadConfigFile(configFile) {
         throw err
       }
     } else {
-      // Use require for CommonJS modules
-      return Config.create(require(configFile).config)
+      // Use dynamic import for CommonJS modules too in ESM context
+      const module = await import(path.resolve(configFile))
+      const configObject = module.config || module.default || module
+      return Config.create(configObject)
     }
   }
 
@@ -257,12 +261,12 @@ async function loadConfigFile(configFile) {
   throw new Error(`Config file ${configFile} can't be loaded`)
 }
 
-function loadConfigFileSync(configFile) {
+async function loadConfigFileSync(configFile) {
   const extensionName = path.extname(configFile)
 
   if (extensionName === '.ts') {
     try {
-      require('ts-node/register')
+      await import('ts-node/register');
     } catch (err) {
       console.log('ts-node package is required to parse codecept.conf.ts config correctly')
     }
@@ -276,8 +280,10 @@ function loadConfigFileSync(configFile) {
         `Config file ${configFile} is an ES module and cannot be loaded synchronously. The file contains 'type: module' in package.json or uses .mjs extension. Please use async configuration loading or switch your config to CommonJS format.`,
       )
     } else {
-      // Use require for CommonJS modules
-      return Config.create(require(configFile).config)
+      // Use dynamic import for CommonJS modules too in ESM context
+      const module = await import(path.resolve(configFile))
+      const configObject = module.config || module.default || module
+      return Config.create(configObject)
     }
   }