The open source coding agent.
TypeScript
fix(build): replace require() with dynamic import() in cross-spawn-spawner (#20580)
Kit Langtone148b318b73b
diff --git a/packages/opencode/src/effect/cross-spawn-spawner.ts b/packages/opencode/src/effect/cross-spawn-spawner.tsindex 39e50d13dab..6e7f09b1d35 100644--- a/packages/opencode/src/effect/cross-spawn-spawner.ts+++ b/packages/opencode/src/effect/cross-spawn-spawner.ts@@ -491,12 +491,13 @@ export const defaultLayer = layer.pipe(Layer.provide(NodeFileSystem.layer), Layeimport { lazy } from "@/util/lazy"-const rt = lazy(() => {+const rt = lazy(async () => {// Dynamic import to avoid circular dep: cross-spawn-spawner → run-service → Instance → project → cross-spawn-spawner- const { makeRuntime } = require("@/effect/run-service") as typeof import("@/effect/run-service")+ const { makeRuntime } = await import("@/effect/run-service")return makeRuntime(ChildProcessSpawner, defaultLayer)})-export const runPromiseExit: ReturnType<typeof rt>["runPromiseExit"] = (...args) =>- rt().runPromiseExit(...(args as [any]))-export const runPromise: ReturnType<typeof rt>["runPromise"] = (...args) => rt().runPromise(...(args as [any]))+type RT = Awaited<ReturnType<typeof rt>>+export const runPromiseExit: RT["runPromiseExit"] = async (...args) =>+ (await rt()).runPromiseExit(...(args as [any]))+export const runPromise: RT["runPromise"] = async (...args) => (await rt()).runPromise(...(args as [any]))