From 7a3810195de532bf360afcbf85a0d9cf6ef662be Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:14:07 -0400
Subject: fix(node): support wildcards in package.json imports (#24794)

---
 ext/node_resolver/resolution.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'ext/node_resolver')

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,
-- 
cgit v1.2.3