final node_modules checks and clean ups

ProjectEvergreen · Dec 9, 2024 · aa9009a · aa9009a
1 parent fb9d498
commit aa9009a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/packages/cli/src/plugins/resource/plugin-node-modules.js b/packages/cli/src/plugins/resource/plugin-node-modules.js
@@ -29,12 +29,9 @@ class NodeModulesResource extends ResourceInterface {
     const { projectDirectory } = this.compilation.context;
     const { pathname, searchParams } = url;
     const fromImportMap = pathname.startsWith(IMPORT_MAP_RESOLVED_PREFIX);
-    const isNodeModulesPathnameShortcut = pathname.startsWith('/node_modules/');
     const resolvedHref = fromImportMap
       ? pathname.replace(IMPORT_MAP_RESOLVED_PREFIX, 'file://')
-      : isNodeModulesPathnameShortcut
-        ? getResolvedHrefFromPathnameShortcut(pathname, projectDirectory)
-        : new URL(`.${pathname}`, projectDirectory).href; // worst case fall back, assume project root
+      : getResolvedHrefFromPathnameShortcut(pathname, projectDirectory);
     const params = searchParams.size > 0
       ? `?${searchParams.toString()}`
       : '';

diff --git a/packages/plugin-import-raw/src/index.js b/packages/plugin-import-raw/src/index.js
@@ -14,26 +14,24 @@ class ImportRawResource extends ResourceInterface {
   }
 
   async shouldResolve(url) {
-    const { href, pathname, searchParams } = url;
+    const { href, searchParams } = url;
     const matches = (this.options.matches || []).filter(matcher => href.indexOf(matcher) >= 0);
 
-    if (matches.length > 0 && !searchParams.has('type') && !pathname.startsWith(IMPORT_MAP_RESOLVED_PREFIX)) {
+    if (matches.length > 0 && !searchParams.has('type')) {
       return true;
     }
   }
 
   async resolve(url) {
-    const { projectDirectory } = this.compilation.context;
-    const { pathname, searchParams } = url;
+    const { searchParams, href, pathname } = url;
     const params = url.searchParams.size > 0
       ? `${searchParams.toString()}&type=raw`
       : 'type=raw';
-    const root = pathname.startsWith('file://')
-      ? new URL(`file://${pathname}`).href
-      : pathname.startsWith('/node_modules')
-        ? new URL(`.${pathname}`, projectDirectory).href
-        : new URL(`file://${pathname}`);
-    const matchedUrl = new URL(`${root}?${params}`);
+    const fromImportMap = pathname.startsWith(IMPORT_MAP_RESOLVED_PREFIX);
+    const resolvedHref = fromImportMap
+      ? pathname.replace(IMPORT_MAP_RESOLVED_PREFIX, 'file://')
+      : href;
+    const matchedUrl = new URL(`${resolvedHref}?${params}`);
 
     return new Request(matchedUrl);
   }