Skip to content

fix: prefer search paths over parent-relative node_modules walk #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benpalevsky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prefer search paths over parent-relative node_modules walk #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/resolver-search-path-first.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@godot-js/editor": patch
---

**Fix:** Bare module specifiers now resolve against configured search paths before the parent-relative `node_modules` walk, so curated pre-bundled deps in `.godot/GodotJS/<dep>.js` win over raw CJS reached via the symlink chain.
18 changes: 8 additions & 10 deletions bridge/jsb_environment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,11 +1176,15 @@ namespace jsb

// init source module
ModuleSourceInfo source_info;
IModuleResolver* resolver = nullptr;
IModuleResolver* resolver = this->find_module_resolver(normalized_id, source_info);

// Resolve bare specifiers against parent-relative node_modules chains first.
// This mirrors Node-like lookup and supports non-hoisted pnpm/yarn layouts.
if (!is_relative_module_id && !is_absolute_module_id && p_parent_id.begins_with("res://"))
// Fall back to parent-relative node_modules chains for bare specifiers
// when search paths missed. Mirrors Node-like lookup and supports
// non-hoisted pnpm/yarn layouts. Search paths win first so curated
// pre-bundled deps in `.godot/GodotJS/<dep>.js` (which Bun processed
// to drop `process.env.NODE_ENV` etc.) take precedence over the raw
// CJS in `node_modules/<dep>/dist/...` reached via Bun's symlink chain.
if (!resolver && !is_relative_module_id && !is_absolute_module_id && p_parent_id.begins_with("res://"))
{
auto get_parent_lookup_dir = [](const String& p_dir) -> String
{
Expand Down Expand Up @@ -1215,12 +1219,6 @@ namespace jsb
break;
}
}

}

if (!resolver)
{
resolver = this->find_module_resolver(normalized_id, source_info);
}

if (resolver)
Expand Down