fix: ignore duplicated module

Author: killagu

plugin/config/lib/ModuleScanner.ts

@@ -28,14 +28,17 @@ export class ModuleScanner {
     });
     const frameworkDir = path.dirname(frameworkPkg);
     const optionalModuleReferences = ModuleConfigUtil.readModuleReference(frameworkDir, this.readModuleOptions || {});
-    return [
+    const result = [
       ...moduleReferences,
-      ...optionalModuleReferences.map(t => {
-        return {
-          ...t,
-          optional: true,
-        };
-      }),
     ];
+    for (const optionalModuleReference of optionalModuleReferences) {
+      if (!result.some(t => t.path === optionalModuleReference.path)) {
+        result.push({
+          ...optionalModuleReference,
+          optional: true,
+        });
+      }
+    }
+    return result;
   }
 }

plugin/config/test/DuplicateOptionalModule.test.ts

@@ -0,0 +1,33 @@
+import mm from 'egg-mock';
+import assert from 'assert';
+import path from 'path';
+
+describe('test/DuplicateOptionalModule.test.ts', () => {
+  let app;
+  const fixturesPath = path.join(__dirname, './fixtures/apps/duplicate-optional-module');
+
+  after(async () => {
+    await app.close();
+  });
+
+  afterEach(() => {
+    mm.restore();
+  });
+
+  before(async () => {
+    mm(process.env, 'EGG_TYPESCRIPT', true);
+    mm(process, 'cwd', () => {
+      return path.join(__dirname, '..');
+    });
+    app = mm.app({
+      baseDir: fixturesPath,
+      framework: require.resolve('egg'),
+    });
+    await app.ready();
+  });
+
+  it('should work', async () => {
+    console.log('app.moduleReferences: ', app.moduleReferences);
+    assert.equal(app.moduleReferences.length, 3);
+  });
+});

plugin/config/test/fixtures/apps/duplicate-optional-module/app/modules/root/Root.ts

@@ -0,0 +1,7 @@
+import { SingletonProto, Inject } from 'core/core-decorator';
+import { UsedProto } from 'used/Used';
+
+@SingletonProto()
+export class RootProto {
+  @Inject() usedProto: UsedProto;
+}

plugin/config/test/fixtures/apps/duplicate-optional-module/app/modules/root/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "root",
+  "eggModule": {
+    "name": "root"
+  }
+}

plugin/config/test/fixtures/apps/duplicate-optional-module/config/config.default.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const path = require('path');
+
+module.exports = function(appInfo) {
+  const config = {
+    keys: 'test key',
+    customLogger: {
+      xxLogger: {
+        file: path.join(appInfo.root, 'logs/xx.log'),
+      },
+    },
+    security: {
+      csrf: {
+        ignoreJSON: false,
+      }
+    },
+  };
+  return config;
+};

plugin/config/test/fixtures/apps/duplicate-optional-module/config/plugin.js

@@ -0,0 +1,8 @@
+'use strict';
+
+exports.tracer = {
+  package: 'egg-tracer',
+  enable: true,
+};
+
+exports.watcher = false;

plugin/config/test/fixtures/apps/duplicate-optional-module/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "egg-app",
+  "egg": {
+    "framework": "foo"
+  },
+  "dependencies": {
+    "used": "*"
+  }
+}