Revert "refactor: resolve project dep func"

This reverts commit 4f6933e.

packages/plugins/src/antd.ts

@@ -3,13 +3,9 @@ import AntdMomentWebpackPlugin from '@ant-design/moment-webpack-plugin';
 import assert from 'assert';
 import { dirname, join } from 'path';
 import { IApi, RUNTIME_TYPE_FILE_NAME } from 'umi';
-import {
-  deepmerge,
-  resolveProjectDep,
-  semver,
-  winPath,
-} from 'umi/plugin-utils';
+import { deepmerge, semver, winPath } from 'umi/plugin-utils';
 import { TEMPLATES_DIR } from './constants';
+import { resolveProjectDep } from './utils/resolveProjectDep';
 import { withTmpPath } from './utils/withTmpPath';
 
 const ANTD_TEMPLATES_DIR = join(TEMPLATES_DIR, 'antd');

packages/plugins/src/layout.ts

@@ -1,13 +1,8 @@
 import { existsSync, readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { IApi, RUNTIME_TYPE_FILE_NAME } from 'umi';
-import {
-  lodash,
-  Mustache,
-  NpmClientEnum,
-  resolveProjectDep,
-  winPath,
-} from 'umi/plugin-utils';
+import { lodash, Mustache, NpmClientEnum, winPath } from 'umi/plugin-utils';
+import { resolveProjectDep } from './utils/resolveProjectDep';
 import { withTmpPath } from './utils/withTmpPath';
 
 // 获取所有 icons

packages/plugins/src/react-query.ts

@@ -1,6 +1,7 @@
+import { winPath } from '@umijs/utils';
 import { dirname } from 'path';
 import { IApi } from 'umi';
-import { resolveProjectDep, winPath } from 'umi/plugin-utils';
+import { resolveProjectDep } from './utils/resolveProjectDep';
 import { withTmpPath } from './utils/withTmpPath';
 
 export default (api: IApi) => {

packages/utils/src/resolveProjectDep.ts → packages/plugins/src/utils/resolveProjectDep.ts

@@ -1,5 +1,5 @@
 import { dirname } from 'path';
-import resolve from '../compiled/resolve';
+import { resolve } from 'umi/plugin-utils';
 
 export function resolveProjectDep(opts: {
   pkg: any;

packages/preset-umi/src/features/configPlugins/configPlugins.ts

@@ -1,10 +1,23 @@
 import { getSchemas as getViteSchemas } from '@umijs/bundler-vite/dist/schema';
 import { getSchemas as getWebpackSchemas } from '@umijs/bundler-webpack/dist/schema';
-import { resolveProjectDep } from '@umijs/utils';
+import { resolve } from '@umijs/utils';
 import { dirname, join } from 'path';
 import type { IApi } from '../../types';
 import { getSchemas as getExtraSchemas } from './schema';
 
+function resolveProjectDep(opts: { pkg: any; cwd: string; dep: string }) {
+  if (
+    opts.pkg.dependencies?.[opts.dep] ||
+    opts.pkg.devDependencies?.[opts.dep]
+  ) {
+    return dirname(
+      resolve.sync(`${opts.dep}/package.json`, {
+        basedir: opts.cwd,
+      }),
+    );
+  }
+}
+
 export default (api: IApi) => {
   const { userConfig } = api;
   const reactDOMPath =

packages/preset-vue/src/features/default.ts

@@ -1,7 +1,6 @@
-import { resolveProjectDep } from '@umijs/utils';
 import { dirname } from 'path';
 import type { IApi } from 'umi';
-import { resolveVuePath } from '../utils/resolveVuePath';
+import { resolveProjectDep, resolveVuePath } from '../utils/resolveProjectDep';
 
 export default (api: IApi) => {
   api.describe({

packages/preset-vue/src/utils/resolveProjectDep.ts

@@ -0,0 +1,30 @@
+import { dirname, join } from 'path';
+import { resolve } from 'umi/plugin-utils';
+
+export function resolveProjectDep(opts: {
+  pkg: any;
+  cwd: string;
+  dep: string;
+}) {
+  if (
+    opts.pkg.dependencies?.[opts.dep] ||
+    opts.pkg.devDependencies?.[opts.dep]
+  ) {
+    return dirname(
+      resolve.sync(`${opts.dep}/package.json`, {
+        basedir: opts.cwd,
+      }),
+    );
+  }
+}
+
+export function resolveVuePath(opts: { pkg: any; cwd: string; path: string }) {
+  const vuePkgPath =
+    resolveProjectDep({
+      pkg: opts.pkg,
+      cwd: opts.cwd,
+      dep: 'vue',
+    }) || dirname(require.resolve('vue/package.json'));
+
+  return join(vuePkgPath, opts.path);
+}

packages/utils/src/index.ts

@@ -50,7 +50,6 @@ export * from './npmClient';
 export * from './randomColor/randomColor';
 export * from './readDirFiles';
 export * as register from './register';
-export * from './resolveProjectDep';
 export * from './setNoDeprecation';
 export * from './tryPaths';
 export * from './winPath';