fix: plugin loader support pnpm (#239)

Author: hyj1991

lib/loader/mixin/plugin.js

@@ -343,18 +343,21 @@ module.exports = {
     for (let i = this.eggPaths.length - 1; i >= 0; i--) {
       const eggPath = this.eggPaths[i];
       lookupDirs.add(path.join(eggPath, 'node_modules'));
+    }
 
-      // should find the siblings directory of framework when using pnpm
+    // should find the $cwd/node_modules when test the plugins under npm3
+    lookupDirs.add(path.join(process.cwd(), 'node_modules'));
+
+    // should find the siblings directory of framework when using pnpm
+    for (let i = this.eggPaths.length - 1; i >= 0; i--) {
+      const eggPath = this.eggPaths[i];
       // 'node_modules/.pnpm/yadan@2.0.0/node_modules/yadan/node_modules',
       // 'node_modules/.pnpm/yadan@2.0.0/node_modules',  <- this is the sibling directory
       // 'node_modules/.pnpm/egg@2.33.1/node_modules/egg/node_modules',
       // 'node_modules/.pnpm/egg@2.33.1/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.add(path.join(process.cwd(), 'node_modules'));
-
     for (let dir of lookupDirs) {
       dir = path.join(dir, name);
       if (fs.existsSync(dir)) {

test/fixtures/plugin-duplicate/node_modules/@scope/a/config/config.default.js

@@ -0,0 +1,16 @@
+'use strict';
+
+module.exports = {
+  b: {
+    enable: true,
+    package: '@scope/b',
+  },
+  "a-duplicate": {
+    enable: true,
+    package: '@scope/a',
+  },
+  a: {
+    enable: true,
+    package: 'a',
+  },
+};

test/fixtures/plugin-duplicate/node_modules/@scope/a/package.json

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

test/fixtures/plugin-duplicate/node_modules/@scope/b/config/config.default.js

@@ -605,4 +605,43 @@ describe('test/load_plugin.test.js', function() {
     assert(loader.allPlugins.gw.enable === false);
     assert(loader.allPlugins.rpcServer.enable === false);
   });
+
+  it('should load plugin with duplicate plugin dir from eggPaths', () => {
+    class BaseApplication extends EggCore {
+      get [Symbol.for('egg#loader')]() {
+        return EggLoader;
+      }
+      get [Symbol.for('egg#eggPath')]() {
+        return utils.getFilepath(path.join('plugin-duplicate'));
+      }
+    }
+
+    class Application extends BaseApplication {
+      get [Symbol.for('egg#loader')]() {
+        return EggLoader;
+      }
+      get [Symbol.for('egg#eggPath')]() {
+        return utils.getFilepath(path.join('plugin-duplicate', 'node_modules', '@scope', 'b'));
+      }
+    }
+
+    const baseDir = utils.getFilepath('plugin-duplicate');
+    app = utils.createApp(path.join('plugin-duplicate', 'release'), {
+      Application,
+    });
+    const loader = app.loader;
+    loader.loadPlugin();
+    loader.loadConfig();
+
+    assert.deepEqual(loader.plugins['a-duplicate'], {
+      enable: true,
+      name: 'a-duplicate',
+      dependencies: [],
+      optionalDependencies: [ 'a' ],
+      env: [],
+      package: '@scope/a',
+      path: path.join(baseDir, 'node_modules', '@scope', 'a'),
+      from: path.join(baseDir, 'release', 'config', 'plugin.js'),
+    });
+  });
 });