From 73c7f5fcf0e49201f0d1e57d9d594ecbbed23b6d Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Fri, 25 Apr 2025 10:51:18 -0500 Subject: [PATCH 1/2] Some Node libraries which have already been bundled conflict with our bundle require shim --- internal/bundler/shim.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/bundler/shim.go b/internal/bundler/shim.go index 4d373445..e35bb8cb 100644 --- a/internal/bundler/shim.go +++ b/internal/bundler/shim.go @@ -3,8 +3,8 @@ package bundler var jsheader = "/* DO NOT EDIT - GENERATED CODE */\n" var jsshim = `// Shim for dynamic requires of Node.js built-in modules -import { createRequire } from 'module'; -const require = createRequire(import.meta.url); +import { createRequire as __agentuity_createRequire } from 'module'; +const require = __agentuity_createRequire(import.meta.url); // List of Node.js built-in modules that might be dynamically required const nodeBuiltins = [ From b06bf059263228199122a6aa4cb4d8a9ac8ed596 Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Fri, 25 Apr 2025 11:01:47 -0500 Subject: [PATCH 2/2] shim older cjs __filename and __dirname variables --- internal/bundler/shim.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/bundler/shim.go b/internal/bundler/shim.go index e35bb8cb..e34ac1b4 100644 --- a/internal/bundler/shim.go +++ b/internal/bundler/shim.go @@ -5,6 +5,11 @@ var jsheader = "/* DO NOT EDIT - GENERATED CODE */\n" var jsshim = `// Shim for dynamic requires of Node.js built-in modules import { createRequire as __agentuity_createRequire } from 'module'; const require = __agentuity_createRequire(import.meta.url); +import { fileURLToPath as __agentuity_fileURLToPath } from 'url'; +import { dirname as __agentuity_dirname } from 'path'; + +const __filename = __agentuity_fileURLToPath(import.meta.url); +const __dirname = __agentuity_dirname(__filename); // List of Node.js built-in modules that might be dynamically required const nodeBuiltins = [