fix: fix incorrect handling of multiple file extensions

softwareventures · Apr 23, 2021 · 75b8149 · 75b8149
1 parent 69f7163
commit 75b8149
Showing 1 changed file with 27 additions and 25 deletions.
diff --git a/index.ts b/index.ts
@@ -7,31 +7,33 @@ const pluginName = "ResolveTypescriptPlugin";
 export default class ResolveTypescriptPlugin {
     public apply(resolver: Resolver): void {
         const target = resolver.ensureHook("file");
-        resolver.getHook("raw-file").tapAsync(pluginName, (request, resolveContext, callback) => {
-            if (!request.path || request.path.match(/(^|[\\/])node_modules($|[\\/])/)) {
-                return callback();
-            }
+        for (const extension of [".ts", ".tsx"]) {
+            resolver
+                .getHook("raw-file")
+                .tapAsync(pluginName, (request, resolveContext, callback) => {
+                    if (!request.path || request.path.match(/(^|[\\/])node_modules($|[\\/])/)) {
+                        return callback();
+                    }
 
-            const path = request.path.replace(/\.js$/, "");
-            if (path === request.path) {
-                callback();
-            } else {
-                for (const extension of [".ts", ".tsx"]) {
-                    resolver.doResolve(
-                        target,
-                        {
-                            ...request,
-                            path: `${path}${extension}`,
-                            relativePath:
-                                request.relativePath &&
-                                request.relativePath.replace(/\.js$/, extension)
-                        },
-                        `using path: ${path}`,
-                        resolveContext,
-                        callback
-                    );
-                }
-            }
-        });
+                    const path = request.path.replace(/\.js$/, extension);
+                    if (path === request.path) {
+                        callback();
+                    } else {
+                        resolver.doResolve(
+                            target,
+                            {
+                                ...request,
+                                path,
+                                relativePath:
+                                    request.relativePath &&
+                                    request.relativePath.replace(/\.js$/, extension)
+                            },
+                            `using path: ${path}`,
+                            resolveContext,
+                            callback
+                        );
+                    }
+                });
+        }
     }
 }