feat: support pnpm node_modules style

lib/loader/mixin/plugin.js

@@ -331,22 +331,29 @@ module.exports = {
     }
 
     const name = plugin.package || plugin.name;
-    const lookupDirs = [];
+    const lookupDirs = new Set();
 
-    // 尝试在以下目录找到匹配的插件
+    // try to locate the plugin in the following directories
     //  -> {APP_PATH}/node_modules
     //    -> {EGG_PATH}/node_modules
     //      -> $CWD/node_modules
-    lookupDirs.push(path.join(this.options.baseDir, 'node_modules'));
+    lookupDirs.add(path.join(this.options.baseDir, 'node_modules'));
 
-    // 到 egg 中查找，优先从外往里查找
+    // try to locate the plugin at framework from upper to lower
     for (let i = this.eggPaths.length - 1; i >= 0; i--) {
       const eggPath = this.eggPaths[i];
-      lookupDirs.push(path.join(eggPath, 'node_modules'));
+      lookupDirs.add(path.join(eggPath, 'node_modules'));
+
+      // should find the siblings directory of framework when using pnpm
+      // 'node_modules/.pnpm/[email protected]/node_modules/yadan/node_modules',
+      // 'node_modules/.pnpm/[email protected]/node_modules',  <- this is the sibling directory
+      // 'node_modules/.pnpm/[email protected]/node_modules/egg/node_modules',
+      // 'node_modules/.pnpm/[email protected]/node_modules', <- this is the sibling directory
+      lookupDirs.add(path.dirname(eggPath));
     }
 
     // should find the $cwd/node_modules when test the plugins under npm3
-    lookupDirs.push(path.join(process.cwd(), 'node_modules'));
+    lookupDirs.add(path.join(process.cwd(), 'node_modules'));
 
     for (let dir of lookupDirs) {
       dir = path.join(dir, name);
@@ -355,7 +362,7 @@ module.exports = {
       }
     }
 
-    throw new Error(`Can not find plugin ${name} in "${lookupDirs.join(', ')}"`);
+    throw new Error(`Can not find plugin ${name} in "${[ ...lookupDirs ].join(', ')}"`);
   },
 
   _extendPlugins(target, plugins) {

test/fixtures/plugin-pnpm/config/plugin.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = {
+  a: {
+    enable: true,
+  },
+  b: {
+    enable: true,
+  },
+};

test/fixtures/plugin-pnpm/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "egg-plugin-pnpm"
+}

test/loader/mixin/load_plugin.test.js

@@ -86,6 +86,28 @@ describe('test/load_plugin.test.js', function() {
     });
   });
 
+  it('should support pnpm node_modules style', () => {
+    class Application extends EggCore {
+      get [ Symbol.for('egg#loader') ]() {
+        return EggLoader;
+      }
+      get [ Symbol.for('egg#eggPath') ]() {
+        return utils.getFilepath('plugin-pnpm/node_modules/.pnpm/[email protected]/node_modules/framework');
+      }
+    }
+    app = utils.createApp('plugin-pnpm', {
+      Application,
+    });
+    const loader = app.loader;
+    loader.loadPlugin();
+    loader.loadConfig();
+    console.log(loader.plugins, loader.config);
+    assert(loader.plugins.a);
+    assert(loader.plugins.b);
+    assert(loader.config.a === 'a');
+    assert(loader.config.b === 'b');
+  });
+
   it('should support alias', function() {
     const baseDir = utils.getFilepath('plugin');
     app = utils.createApp('plugin');
@@ -406,16 +428,15 @@ describe('test/load_plugin.test.js', function() {
     assert(plugin.path === utils.getFilepath('realpath/a'));
   });
 
-  class Application extends EggCore {
-    get [Symbol.for('egg#loader')]() {
-      return EggLoader;
-    }
-    get [Symbol.for('egg#eggPath')]() {
-      return utils.getFilepath('plugin-from/framework');
-    }
-  }
-
   it('should get the defining plugin path in every plugin', () => {
+    class Application extends EggCore {
+      get [ Symbol.for('egg#loader') ]() {
+        return EggLoader;
+      }
+      get [ Symbol.for('egg#eggPath') ]() {
+        return utils.getFilepath('plugin-from/framework');
+      }
+    }
     app = utils.createApp('plugin-from', {
       Application,
     });