fix: resolvePath nesting issue

ricokahler · Aug 30, 2021 · 1de7cef · 1de7cef
1 parent b85da27
commit 1de7cef
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/external.d.ts b/external.d.ts
@@ -205,10 +205,6 @@ declare module 'babel-plugin-module-resolver' {
      * [0]: https://docs.npmjs.com/misc/config#loglevel
      */
     logLevel?: string;
-    /**
-     * @internal
-     */
-    _originalResolvePath?: ResolvePath;
   }
 
   export const resolvePath: ResolvePath;

diff --git a/src/babel-plugin-tsconfig-paths-module-resolver.test.ts b/src/babel-plugin-tsconfig-paths-module-resolver.test.ts
@@ -1,4 +1,4 @@
-import { babelPluginTsconfigPathsModuleResolver } from "./babel-plugin-tsconfig-paths-module-resolver";
+import { babelPluginTsconfigPathsModuleResolver } from './babel-plugin-tsconfig-paths-module-resolver';
 
 const mockManipulateOptions = jest.fn(function (this: any, ...args) {
   return {
@@ -16,17 +16,17 @@ const mockPre = jest.fn(function (this: any, ...args) {
   };
 });
 
-jest.mock("babel-plugin-module-resolver", () =>
+jest.mock('babel-plugin-module-resolver', () =>
   jest.fn((...args) => ({
     args,
     extraOption: true,
     manipulateOptions: mockManipulateOptions,
     pre: mockPre,
-  }))
+  })),
 );
 
-describe("babelPluginTsconfigPathsModuleResolver", () => {
-  it("returns a pre-configured version of babel-plugin-module-resolve", () => {
+describe('babelPluginTsconfigPathsModuleResolver', () => {
+  it('returns a pre-configured version of babel-plugin-module-resolve', () => {
     const mockArgs = { mockArgs: true };
     const result = babelPluginTsconfigPathsModuleResolver(mockArgs);
 
@@ -76,7 +76,6 @@ describe("babelPluginTsconfigPathsModuleResolver", () => {
 Object {
   "mockThis": true,
   "opts": Object {
-    "_originalResolvePath": [Function],
     "extensions": Array [
       ".ts",
       ".tsx",

diff --git a/src/babel-plugin-tsconfig-paths-module-resolver.ts b/src/babel-plugin-tsconfig-paths-module-resolver.ts
@@ -19,9 +19,6 @@ function babelPluginTsconfigPathsModuleResolver(
 
     opts.extensions = opts.extensions || defaultExtensions;
     opts.resolvePath = opts.resolvePath || createResolvePath();
-    if (!opts._originalResolvePath && opts.resolvePath) {
-      opts._originalResolvePath = opts.resolvePath;
-    }
   }
 
   return {

diff --git a/src/create-resolve-path.test.ts b/src/create-resolve-path.test.ts
@@ -47,7 +47,7 @@ describe('createResolvePath', () => {
 
     const resolvePath = createResolvePath();
     const result = resolvePath('./source-path', './current-file', {
-      _originalResolvePath: () => 'example result',
+      resolvePath: () => 'example result',
     });
 
     expect(result).toBe('example result');
@@ -148,7 +148,9 @@ describe('createResolvePath', () => {
         Array [
           "./source-path",
           "./current-file",
-          Object {},
+          Object {
+            "_fromNested": true,
+          },
         ],
       ]
     `);

diff --git a/src/create-resolve-path.ts b/src/create-resolve-path.ts
@@ -3,6 +3,7 @@ import { createMatchPath, loadConfig } from 'tsconfig-paths';
 import {
   resolvePath as defaultResolvePath,
   ResolvePath,
+  BabelPluginModuleResolveOptions,
 } from 'babel-plugin-module-resolver';
 import { defaultExtensions } from './default-extensions';
 
@@ -16,10 +17,13 @@ export function createResolvePath(): ResolvePath {
       configLoaderResult.paths,
     );
 
-  return function resolvePath(...args) {
-    const [sourcePath, currentFile, opts] = args;
-    const fallbackResolvePath = opts._originalResolvePath || defaultResolvePath;
+  return function resolvePath(sourcePath, currentFile, opts) {
+    const fallbackResolvePath = (opts as any)._fromNested
+      ? defaultResolvePath
+      : opts.resolvePath || defaultResolvePath;
+
     const extensions = opts.extensions || defaultExtensions;
+    const nextOpts = { ...opts, _fromNested: true };
 
     if (!matchPath) {
       if (opts.logLevel !== 'silent') {
@@ -32,7 +36,7 @@ export function createResolvePath(): ResolvePath {
         );
       }
 
-      return fallbackResolvePath(...args);
+      return fallbackResolvePath(sourcePath, currentFile, nextOpts);
     }
 
     const matchPathResult = matchPath(
@@ -50,6 +54,6 @@ export function createResolvePath(): ResolvePath {
       return relativePath.startsWith('./') ? relativePath : `./${relativePath}`;
     }
 
-    return fallbackResolvePath(...args);
+    return fallbackResolvePath(sourcePath, currentFile, nextOpts);
   };
 }