fix: resolveLocal unexpectedly import cjs

shuvijs · Jul 8, 2020 · 02bd497 · 02bd497
1 parent 9acaaf0
commit 02bd497
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/runtime-react/src/bundler/config.ts b/packages/runtime-react/src/bundler/config.ts
@@ -5,7 +5,8 @@ import AliasPlugin from 'enhanced-resolve/lib/AliasPlugin';
 import { PACKAGE_DIR } from '../paths';
 
 export function config(api: IApi) {
-  const resolveLocal = (m: string) => require.resolve(m);
+  const resolveLocal = (m: string) =>
+    path.dirname(require.resolve(`${m}/package.json`));
   const resolveUser = (m: string) =>
     path.join(api.paths.rootDir, 'node_modules', m);
   api.tap<APIHooks.IHookBundlerConfig>('bundler:configTarget', {

diff --git a/packages/runtime-react/src/index.ts b/packages/runtime-react/src/index.ts
@@ -22,7 +22,7 @@ class ReactRuntime implements Runtime.IRuntime<React.ComponentType<any>> {
       local: 'dynamic'
     });
     api.addAppExport(
-      resolveDep('react-router-dom'),
+      'react-router-dom',
       '{ Link, useLocation, useParams, useHistory, useRouteMatch, withRouter }'
     );