fixed docker build

Author: DavertMik

docker/run.sh

@@ -24,56 +24,38 @@ EOF
 		fi
 	}
 
-	# Setup node_modules with ESM-compatible codeceptjs
-	setup_node_modules() {
-		local dir="$1"
-		local node_modules="$dir/node_modules"
-		local codecept_module="$node_modules/codeceptjs"
-
-		mkdir -p "$codecept_module"
-
-		cat > "$codecept_module/package.json" << 'EOF'
-{
-  "name": "codeceptjs",
-  "type": "module",
-  "exports": {
-    ".": "./index.js",
-    "./effects": "./effects.js"
-  },
-  "main": "./index.js"
-}
-EOF
-
-		ln -sf /codecept/lib/index.js "$codecept_module/index.js"
-		ln -sf /codecept/lib/effects.js "$codecept_module/effects.js"
+	# Ensure /tests/node_modules links to /codecept/node_modules
+	if [ -L "/tests/node_modules" ]; then
+		# Already a symlink, good
+		:
+	elif [ -d "/tests/node_modules" ]; then
+		# Directory exists, remove it and create symlink
+		rm -rf /tests/node_modules
+		ln -sf /codecept/node_modules /tests/node_modules
+	else
+		# Doesn't exist, create symlink
+		ln -sf /codecept/node_modules /tests/node_modules
+	fi
 
-		for dep_dir in /codecept/node_modules/*; do
-			dep_name=$(basename "$dep_dir")
-			if [ "$dep_name" != "codeceptjs" ] && [ ! -e "$node_modules/$dep_name" ]; then
-				ln -sf "$dep_dir" "$node_modules/$dep_name" 2>/dev/null || true
-			fi
-		done
-	}
+	# Ensure /codecept/node_modules/codeceptjs is a symlink to /codecept
+	# This allows require('codeceptjs') from CJS modules to work
+	if [ -d "/codecept/node_modules/codeceptjs" ] && [ ! -L "/codecept/node_modules/codeceptjs" ]; then
+		rm -rf /codecept/node_modules/codeceptjs
+		ln -sf /codecept /codecept/node_modules/codeceptjs
+	elif [ ! -e "/codecept/node_modules/codeceptjs" ]; then
+		ln -sf /codecept /codecept/node_modules/codeceptjs
+	fi
 
 	# Find codecept config in current directory
 	config_file=$(find . -maxdepth 2 -name "codecept.conf.*" -type f | head -1)
 
 	if [ -n "$config_file" ]; then
 		config_dir=$(dirname "$config_file")
 		ensure_esm_package "$config_dir"
-		setup_node_modules "$config_dir"
 	else
 		ensure_esm_package "$(pwd)"
-		setup_node_modules "$(pwd)"
 	fi
 
-	# Also setup node_modules in any subdirectories that might contain test files
-	for test_dir in acceptance test tests; do
-		if [ -d "$test_dir" ]; then
-			setup_node_modules "$test_dir"
-		fi
-	done
-
 	# Run the tests
 	cd /tests/ || exit
 	if [ "$RUN_MULTIPLE" = true ]; then

lib/container.js

@@ -377,23 +377,12 @@ async function requireHelperFromModule(helperName, config, HelperClass) {
     try {
       // Try dynamic import for both CommonJS and ESM modules
       const mod = await import(moduleName)
-      if (!mod && !mod.default) {
-        throw new Error(`Helper module '${moduleName}' was not found. Make sure you have installed the package correctly.`)
+      if (!mod || (!mod.default && !Object.keys(mod).length)) {
+        throw new Error(`Helper module '${moduleName}' was imported but has no exports.`)
       }
       HelperClass = mod.default || mod
     } catch (err) {
-      if (err.code === 'ERR_REQUIRE_ESM' || (err.message && err.message.includes('ES module'))) {
-        // This is an ESM module, use dynamic import
-        try {
-          const pathModule = await import('path')
-          const absolutePath = pathModule.default.resolve(moduleName)
-          const mod = await import(absolutePath)
-          HelperClass = mod.default || mod
-          debug(`helper ${helperName} loaded via ESM import`)
-        } catch (importErr) {
-          throw new Error(`Helper module '${moduleName}' could not be imported as ESM: ${importErr.message}`)
-        }
-      } else if (err.code === 'MODULE_NOT_FOUND') {
+      if (err.code === 'ERR_MODULE_NOT_FOUND') {
         throw new Error(`Helper module '${moduleName}' was not found. Make sure you have installed the package correctly.`)
       } else {
         throw err

package.json

@@ -34,7 +34,8 @@
     "./lib/*": "./lib/*.js",
     "./els": "./lib/els.js",
     "./effects": "./lib/effects.js",
-    "./steps": "./lib/steps.js"
+    "./steps": "./lib/steps.js",
+    "./store": "./lib/store.js"
   },
   "types": "typings/index.d.ts",
   "bin": {

test/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}