summaryrefslogtreecommitdiff
path: root/ext/node_resolver/resolution.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-07-30 13:14:07 -0400
committerGitHub <noreply@github.com>2024-07-30 17:14:07 +0000
commit7a3810195de532bf360afcbf85a0d9cf6ef662be (patch)
treeb679dfbf99fe6028b5f0f119284591ac46d06fce /ext/node_resolver/resolution.rs
parent1ba88a7892fa1b0d7cf229b0cd5709575901ebd0 (diff)
fix(node): support wildcards in package.json imports (#24794)
Diffstat (limited to 'ext/node_resolver/resolution.rs')
-rw-r--r--ext/node_resolver/resolution.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/node_resolver/resolution.rs b/ext/node_resolver/resolution.rs
index f4b2e8056..772bc5d34 100644
--- a/ext/node_resolver/resolution.rs
+++ b/ext/node_resolver/resolution.rs
@@ -597,7 +597,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
for key in imports.keys() {
let pattern_index = key.find('*');
if let Some(pattern_index) = pattern_index {
- let key_sub = &key[0..=pattern_index];
+ let key_sub = &key[0..pattern_index];
if name.starts_with(key_sub) {
let pattern_trailer = &key[pattern_index + 1..];
if name.len() > key.len()
@@ -607,8 +607,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
{
best_match = key;
best_match_subpath = Some(
- name[pattern_index..=(name.len() - pattern_trailer.len())]
- .to_string(),
+ &name[pattern_index..(name.len() - pattern_trailer.len())],
);
}
}
@@ -620,7 +619,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
let maybe_resolved = self.resolve_package_target(
package_json_path.as_ref().unwrap(),
target,
- &best_match_subpath.unwrap(),
+ best_match_subpath.unwrap(),
best_match,
maybe_referrer,
referrer_kind,