fix: fix host package dependencies problem

packages/preset-dumi/src/transformer/demo/dependencies.ts

@@ -8,6 +8,9 @@ import {
   getModuleResolvePkg,
   getModuleResolvePath,
   getModuleResolveContent,
+  getPackageInfo,
+  getHostPkgPath,
+  getHostModuleResolvePkg,
 } from '../../utils/moduleResolver';
 import FileCache from '../../utils/cache';
 import type { IDemoOpts } from './options';
@@ -53,6 +56,8 @@ export const LOCAL_MODULE_EXT = [...LOCAL_DEP_EXT, '.json'];
 // local dependency extensions which will be collected
 export const PLAIN_TEXT_EXT = [...LOCAL_MODULE_EXT, '.less', '.css', '.scss', '.sass', '.styl'];
 
+export const isHostPackage = (packageName: string) => getHostPkgPath(packageName);
+
 function analyzeDeps(
   raw: string,
   {
@@ -99,9 +104,10 @@ function analyzeDeps(
           });
           const resolvePathParsed = path.parse(resolvePath);
 
-          if (resolvePath.includes('node_modules')) {
+          const isHostPkg = isHostPackage(requireStr);
+          if (resolvePath.includes('node_modules') || isHostPkg) {
             // save external deps
-            const pkg = getModuleResolvePkg({
+            const pkg = isHostPkg ? getHostModuleResolvePkg(requireStr) : getModuleResolvePkg({
               basePath: fileAbsPath,
               sourcePath: resolvePath,
               extensions: LOCAL_MODULE_EXT,

packages/preset-dumi/src/utils/moduleResolver.test.ts

@@ -5,6 +5,7 @@ import {
   getModuleResolvePath,
   getModuleResolvePkg,
   getModuleResolveContent,
+  getHostModuleResolvePkg,
 } from './moduleResolver';
 import ctx from '../context';
 
@@ -54,4 +55,11 @@ describe('moduleResolver', () => {
 
     expect(content).toEqual(expectedContent);
   });
+
+  it('get expected host module version', () => {
+    const { version } = getHostModuleResolvePkg('@umijs/preset-dumi');
+    const { version: expectedVersion } = require(path.join(__dirname, '../../package.json'));
+
+    expect(version).toEqual(expectedVersion);
+  });
 });

packages/preset-dumi/src/utils/moduleResolver.ts

@@ -33,7 +33,7 @@ const getPkgPathsFromPath = (identifier: string) => {
  * get package root path if it is a local package
  * @param pkg   package name
  */
-const getHostPkgPath = (() => {
+export const getHostPkgPath = (() => {
   let cache: ReturnType<typeof getHostPkgAlias>;
 
   return (pkg: string) => {
@@ -78,20 +78,12 @@ export const getModuleResolvePath = ({
 };
 
 /**
- * resolve module version
+ * get package info by modulePath
  */
-export const getModuleResolvePkg = ({
-  basePath,
-  sourcePath,
-  extensions = DEFAULT_EXT,
-}: IModuleResolverOpts) => {
+export const getPackageInfo = (modulePath: string) => {
   let version: string | null;
   let name: string | null;
   let peerDependencies: any | null;
-  const resolvePath = getModuleResolvePath({ basePath, sourcePath, extensions });
-  const { pkgName, absPkgModulePath } = getPkgPathsFromPath(resolvePath);
-  // use project path as module path for local packages
-  const modulePath = getHostPkgPath(pkgName) || absPkgModulePath;
   const pkgPath = path.join(modulePath, 'package.json');
 
   if (modulePath && fs.existsSync(pkgPath)) {
@@ -107,6 +99,22 @@ export const getModuleResolvePkg = ({
   return { name, version, peerDependencies };
 };
 
+/**
+ * resolve module version
+ */
+export const getModuleResolvePkg = ({
+  basePath,
+  sourcePath,
+  extensions = DEFAULT_EXT,
+}: IModuleResolverOpts) => {
+  const resolvePath = getModuleResolvePath({ basePath, sourcePath, extensions });
+  const { pkgName, absPkgModulePath } = getPkgPathsFromPath(resolvePath);
+  // use project path as module path for local packages
+  const  modulePath = getHostPkgPath(pkgName) || absPkgModulePath;
+
+  return getPackageInfo(modulePath);
+};
+
 /**
  * resolve module content
  */
@@ -119,3 +127,10 @@ export const getModuleResolveContent = ({
 
   return resolvePath ? fs.readFileSync(resolvePath, 'utf8').toString() : '';
 };
+
+/**
+ * resolve host module version
+ */
+ export const getHostModuleResolvePkg = (requireStr: string) => {
+  return getPackageInfo(getHostPkgPath(requireStr));
+};