try using esm for config (#10)

Author: tim-smart

.changeset/twelve-peas-boil.md

@@ -0,0 +1,5 @@
+---
+"@effect/contentlayer": patch
+---
+
+switch to esm builds for config

packages/core/package.json

@@ -39,7 +39,11 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.5.1",
-    "esbuild": "^0.25.2"
+    "esbuild": "^0.25.2",
+    "typescript": "^5.8.3"
+  },
+  "peerDependencies": {
+    "effect": "^3.14"
   },
   "devDependencies": {
     "@effect/cli": "^0.59.10",
@@ -51,7 +55,6 @@
     "glob": "^11.0.1",
     "minimatch": "^10.0.1",
     "tsup": "^8.4.0",
-    "typescript": "^5.8.3",
     "unist-util-remove": "^4.0.0",
     "vfile": "^6.0.3"
   }

packages/core/scripts/copy-package-json.ts

@@ -10,16 +10,16 @@ const read = Effect.gen(function*() {
   const exports: Record<string, any> = {
     ".": {
       types: "./index.d.ts",
-      import: "./index.mjs",
-      default: "./index.js"
+      import: "./index.js",
+      require: "./index.cjs"
     }
   }
   for (const entrypoint of entrypoints) {
     const name = entrypoint.replace(/\.ts$/, "")
     exports[`./${name}`] = {
       types: `./${name}.d.ts`,
-      import: `./${name}.mjs`,
-      default: `./${name}.js`
+      import: `./${name}.js`,
+      require: `./${name}.cjs`
     }
   }
 
@@ -29,12 +29,13 @@ const read = Effect.gen(function*() {
     name: json.name,
     version: json.version,
     description: json.description,
+    type: "module",
     bin: {
       contentlayer: "./bin.js"
     },
-    main: "./index.js",
+    main: "./index.cjs",
     types: "./index.d.ts",
-    module: "./index.mjs",
+    module: "./index.js",
     exports,
     engines: json.engines,
     repository: json.repository,
@@ -43,7 +44,9 @@ const read = Effect.gen(function*() {
     bugs: json.bugs,
     homepage: json.homepage,
     tags: json.tags,
-    keywords: json.keywords
+    keywords: json.keywords,
+    dependencies: json.dependencies,
+    peerDependencies: json.peerDependencies
   }
 })
 

packages/core/src/Cli.ts

@@ -44,11 +44,10 @@ const command = Command.make("contentlayer", { configPath, watchMode }).pipe(
       ),
       Layer.mergeAll(
         BuildOptions.Live({
-          bundle: true,
-          external: ["@effect/contentlayer", "effect"],
+          bundle: false,
           entryNames: "[name]-[hash]",
           entryPoints: [configPath],
-          format: "cjs",
+          format: "esm",
           logLevel: "silent",
           metafile: true,
           outfile: ".contentlayer/compiled-contentlayer-config",

packages/core/src/ConfigBuilder.ts

@@ -1,9 +1,7 @@
 /**
  * @since 1.0.0
  */
-import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem"
 import * as NodePath from "@effect/platform-node/NodePath"
-import * as FileSystem from "@effect/platform/FileSystem"
 import * as Path from "@effect/platform/Path"
 import * as Arr from "effect/Array"
 import * as Effect from "effect/Effect"
@@ -12,10 +10,8 @@ import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Stream from "effect/Stream"
 import * as SubscriptionRef from "effect/SubscriptionRef"
-import * as Module from "node:module"
-import * as VM from "node:vm"
 import * as Config from "./Config.ts"
-import { ContentlayerError } from "./ContentlayerError.ts"
+import { ContentlayerError } from "./ContentlayerError.js"
 import type { EsbuildSuccess } from "./Esbuild.ts"
 import { Esbuild } from "./Esbuild.ts"
 
@@ -61,7 +57,6 @@ export class ConfigBuilder extends Effect.Tag("@effect/contentlayer/ConfigBuilde
 >() {
   static Live = Layer.scoped(this, make).pipe(
     Layer.provide(Esbuild.Live),
-    Layer.provide(NodeFileSystem.layer),
     Layer.provide(NodePath.layer)
   )
 }
@@ -74,7 +69,7 @@ const build = (
 ): Effect.Effect<
   Option.Option<BuiltConfig>,
   ContentlayerError,
-  FileSystem.FileSystem | Path.Path
+  Path.Path
 > =>
   Effect.gen(function*() {
     const path = yield* Path.Path
@@ -100,24 +95,11 @@ export const fromPath = Effect.fnUntraced(function*(
   entrypoint: string,
   hash: string
 ) {
-  const fs = yield* FileSystem.FileSystem
   const path = yield* Path.Path
-
-  const content = yield* Effect.orDie(fs.readFileString(outPath))
   const resolvedPath = path.resolve(outPath)
 
-  const context = VM.createContext({
-    ...globalThis,
-    process,
-    __filename: resolvedPath,
-    __dirname: path.dirname(resolvedPath)
-  })
-  context.require = Module.createRequire(entrypoint)
-  context.module = { exports: {} }
-  context.exports = context.module.exports
-
-  yield* Effect.try({
-    try: () => VM.runInContext(content, context),
+  const content = yield* Effect.tryPromise({
+    try: () => import(new URL(`file://${resolvedPath}`) as any),
     catch: (cause) =>
       new ContentlayerError({
         module: "ConfigBuilder",
@@ -127,7 +109,7 @@ export const fromPath = Effect.fnUntraced(function*(
       })
   })
 
-  return configAsOption(context.module.exports.default).pipe(
+  return configAsOption(content.default).pipe(
     Option.map((config): BuiltConfig => ({
       hash,
       config,

packages/core/tsup.config.ts

@@ -4,11 +4,7 @@ export default defineConfig({
   entry: ["src/*.ts"],
   format: ["esm", "cjs"],
   tsconfig: "tsconfig.build.json",
-  outExtension({ format }) {
-    return {
-      js: format === "cjs" ? ".js" : ".mjs"
-    }
-  },
+  external: ["effect"],
   shims: true,
   splitting: true,
   sourcemap: true,