fix: case

midwayjs · Mar 1, 2021 · df2efb6 · df2efb6
1 parent 4df51ed
commit df2efb6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/core/src/context/applicationContext.ts b/packages/core/src/context/applicationContext.ts
@@ -245,10 +245,12 @@ export class BaseApplicationContext
   ) {
     if (!this.disableConflictCheck && this.registry.hasDefinition(identifier)) {
       const def = this.registry.getDefinition(identifier);
-      if (!PathFileUtil.isPathEqual(definition.srcPath, def.srcPath)) {
-        throw new Error(
-          `${identifier} path = ${definition.srcPath} already exist (${def.srcPath})!`
-        );
+      if (definition.srcPath && def.srcPath) {
+        if (!PathFileUtil.isPathEqual(definition.srcPath, def.srcPath)) {
+          throw new Error(
+            `${identifier} path = ${definition.srcPath} already exist (${def.srcPath})!`
+          );
+        }
       }
     }
     this.registry.registerDefinition(identifier, definition);

diff --git a/packages/core/src/context/configuration.ts b/packages/core/src/context/configuration.ts
@@ -289,6 +289,9 @@ export class ContainerConfiguration implements IContainerConfiguration {
         }
       }
     } else {
+      if (this.namespace === MAIN_MODULE_KEY) {
+        this.container.disableConflictCheck = true;
+      }
       if (
         this.container.containsConfiguration(this.packageName) &&
         this.namespace !== ''