fix(plugin): add artus dir to package path resolver for pnpm (#258)

noahziheng · web-flow · commit f5ab0e28e698 · 2023-07-25T12:48:33.000+08:00
diff --git a/src/plugin/common.ts b/src/plugin/common.ts
@@ -35,9 +35,11 @@ export function topologicalSort(pluginInstanceMap: Map<string, PluginType>, plug
 }
 
 // A util function of get package path for plugin
-export function getPackagePath(packageName: string, paths?: string[]): string {
-  const opts = paths ? { paths } : undefined;
-  return path.resolve(require.resolve(packageName, opts), '..');
+export function getPackagePath(packageName: string, paths: string[] = []): string {
+  const opts = {
+    paths: paths.concat(__dirname),
+  };
+  return path.dirname(require.resolve(packageName, opts));
 }
 
 export async function getInlinePackageEntryPath(packagePath: string): Promise<string> {

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,11 @@ export function topologicalSort(pluginInstanceMap: Map<string, PluginType>, plug`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// A util function of get package path for plugin`
`38`		`-export function getPackagePath(packageName: string, paths?: string[]): string {`
`39`		`- const opts = paths ? { paths } : undefined;`
`40`		`- return path.resolve(require.resolve(packageName, opts), '..');`
	`38`	`+export function getPackagePath(packageName: string, paths: string[] = []): string {`
	`39`	`+ const opts = {`
	`40`	`+ paths: paths.concat(__dirname),`
	`41`	`+ };`
	`42`	`+ return path.dirname(require.resolve(packageName, opts));`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`export async function getInlinePackageEntryPath(packagePath: string): Promise<string> {`