Merge pull request #24 from mariczne/main

Fix CJS compatibility (use .cjs file extensions)

Author: meech-ward

build.ts

@@ -16,6 +16,40 @@ import { build } from "esbuild"
 import type { Plugin, PluginBuild, BuildOptions } from "esbuild"
 import glob from "glob"
 
+// Plugin to fix CommonJS imports by appending .cjs to require statements
+const fixCjsImportsPlugin = (): Plugin => ({
+  name: "fix-cjs-imports",
+  setup(build: PluginBuild) {
+    // Run in the onEnd hook after all files have been written
+    build.onEnd((result) => {
+      // Only proceed if the build is successful
+      if (result.errors.length === 0) {
+        // Get the output directory from the build options
+        const outdir = build.initialOptions.outdir
+        if (!outdir) return
+
+        // Find all .cjs files in the output directory
+        const files = glob.sync(`${outdir}/**/*.cjs`)
+
+        files.forEach((file) => {
+          let content = fs.readFileSync(file, "utf8")
+
+          // Replace all require('./something') with require('./something.cjs')
+          content = content.replace(/require\(["'](\.[^"']+)["']\)/g, (match, importPath) => {
+            // Don't add .cjs if it already has an extension
+            if (path.extname(importPath) !== "") {
+              return match
+            }
+            return `require('${importPath}.cjs')`
+          })
+
+          fs.writeFileSync(file, content)
+        })
+      }
+    })
+  }
+})
+
 const entryPoints = glob.sync("./src/**/*.ts", {
   ignore: ["./src/**/*.test.ts", "./src/mod.ts", "./src/middleware.ts", "./src/deno/**/*.ts"]
 })
@@ -65,6 +99,8 @@ const cjsBuild = () =>
     outbase: "./src",
     outdir: "./dist/cjs",
     format: "cjs",
+    outExtension: { ".js": ".cjs" },
+    plugins: [fixCjsImportsPlugin()],
     tsconfig: "tsconfig.cjs.json"
   })
 

package.json

@@ -2,19 +2,19 @@
   "name": "might-fail",
   "version": "0.7.3",
   "description": "A better way to handle errors in JavaScript and TypeScript. Handle async and sync errors without `try` and `catch` blocks.",
-  "main": "dist/cjs/index.js",
+  "main": "dist/cjs/index.cjs",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/cjs/index.js",
+      "require": "./dist/cjs/index.cjs",
       "types": "./dist/index.d.ts"
     },
     "./go": {
       "import": "./dist/go/index.js",
-      "require": "./dist/cjs/go/index.js",
+      "require": "./dist/cjs/go/index.cjs",
       "types": "./dist/go/index.d.ts"
     }
   },
@@ -26,6 +26,7 @@
   },
   "files": [
     "dist/**/*.js",
+    "dist/**/*.cjs",
     "dist/**/*.d.ts",
     "dist/**/*.ts"
   ],
@@ -61,4 +62,3 @@
     "vitest": "^2.1.1"
   }
 }
-