codeceptjs 4.0.2-beta.17 → 4.0.2-beta.18

package/lib/utils/typescript.js

@@ -118,20 +118,25 @@ const __dirname = __dirname_fn(__filename);
     // Transpile this file
     let jsContent = transpileTS(filePath)
 
-    // Find all relative TypeScript imports in this file
+    // Find all relative TypeScript imports in this file (both ESM imports and require() calls)
     const importRegex = /from\s+['"](\.[^'"]+?)(?:\.ts)?['"]/g
+    const requireRegex = /require\s*\(\s*['"](\.[^'"]+?)(?:\.ts)?['"]\s*\)/g
     let match
     const imports = []
 
     while ((match = importRegex.exec(jsContent)) !== null) {
-      imports.push(match[1])
+      imports.push({ path: match[1], type: 'import' })
+    }
+
+    while ((match = requireRegex.exec(jsContent)) !== null) {
+      imports.push({ path: match[1], type: 'require' })
     }
 
     // Get the base directory for this file
     const fileBaseDir = path.dirname(filePath)
 
     // Recursively transpile each imported TypeScript file
-    for (const relativeImport of imports) {
+    for (const { path: relativeImport } of imports) {
       let importedPath = path.resolve(fileBaseDir, relativeImport)
 
       // Handle .js extensions that might actually be .ts files
@@ -222,6 +227,41 @@ const __dirname = __dirname_fn(__filename);
       }
     )
 
+    // Also rewrite require() calls to point to transpiled TypeScript files
+    jsContent = jsContent.replace(
+      /require\s*\(\s*['"](\.[^'"]+?)(?:\.ts)?['"]\s*\)/g,
+      (match, requirePath) => {
+        let resolvedPath = path.resolve(fileBaseDir, requirePath)
+        const originalExt = path.extname(requirePath)
+
+        // Handle .js extension that might be .ts
+        if (resolvedPath.endsWith('.js')) {
+          const tsVersion = resolvedPath.replace(/\.js$/, '.ts')
+          if (transpiledFiles.has(tsVersion)) {
+            const tempFile = transpiledFiles.get(tsVersion)
+            const relPath = path.relative(fileBaseDir, tempFile).replace(/\\/g, '/')
+            const finalPath = relPath.startsWith('.') ? relPath : './' + relPath
+            return `require('${finalPath}')`
+          }
+          return match
+        }
+
+        // Try with .ts extension
+        const tsPath = resolvedPath.endsWith('.ts') ? resolvedPath : resolvedPath + '.ts'
+
+        // If we transpiled this file, use the temp file
+        if (transpiledFiles.has(tsPath)) {
+          const tempFile = transpiledFiles.get(tsPath)
+          const relPath = path.relative(fileBaseDir, tempFile).replace(/\\/g, '/')
+          const finalPath = relPath.startsWith('.') ? relPath : './' + relPath
+          return `require('${finalPath}')`
+        }
+
+        // Otherwise, keep the require as-is
+        return match
+      }
+    )
+
     // Write the transpiled file with updated imports
     const tempFile = filePath.replace(/\.ts$/, '.temp.mjs')
     fs.writeFileSync(tempFile, jsContent)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeceptjs",
-  "version": "4.0.2-beta.17",
+  "version": "4.0.2-beta.18",
   "type": "module",
   "description": "Supercharged End 2 End Testing Framework for NodeJS",
   "keywords": [