fix: fix loadDir default path

Author: czy88840616

packages/midway-core/src/loader.ts

@@ -2,6 +2,13 @@ import * as path from 'path';
 import { MidwayContainer } from './container';
 import { MidwayRequestContainer } from './requestContainer';
 
+function buildLoadDir(baseDir, dir) {
+  if (!path.isAbsolute(dir)) {
+    return path.join(baseDir, dir);
+  }
+  return dir;
+}
+
 export class ContainerLoader {
 
   baseDir;
@@ -51,6 +58,7 @@ export class ContainerLoader {
   }
 
   loadDirectory(loadOpts: {
+    baseDir?: string;
     loadDir?: string[];
     disableAutoLoad?: boolean;
     pattern?: string;
@@ -62,12 +70,14 @@ export class ContainerLoader {
       loadOpts.disableAutoLoad = true;
     }
 
-    // 如果没有关闭autoLoad 则进行load
+    // if not disable auto load
     if (!loadOpts.disableAutoLoad) {
-      const defaultLoadDir = this.isTsMode ? [this.baseDir] : ['app', 'lib'];
+      // use baseDir in parameter first
+      const baseDir = loadOpts.baseDir || this.baseDir;
+      const defaultLoadDir = this.isTsMode ? [baseDir] : ['app', 'lib'];
       this.applicationContext.load({
         loadDir: (loadOpts.loadDir || defaultLoadDir).map(dir => {
-          return this.buildLoadDir(dir);
+          return buildLoadDir(baseDir, dir);
         }),
         pattern: loadOpts.pattern,
         ignore: loadOpts.ignore
@@ -81,11 +91,4 @@ export class ContainerLoader {
     await this.requestContext.ready();
   }
 
-  private buildLoadDir(dir) {
-    if (!path.isAbsolute(dir)) {
-      return path.join(this.baseDir, dir);
-    }
-    return dir;
-  }
-
 }

packages/midway-web/src/loader/webLoader.ts

@@ -2,10 +2,10 @@ import { EggRouter as Router } from '@eggjs/router';
 import {
   CONTROLLER_KEY,
   ControllerOption,
+  KoaMiddleware,
   PRIORITY_KEY,
   RouterOption,
-  WEB_ROUTER_KEY,
-  KoaMiddleware
+  WEB_ROUTER_KEY
 } from '@midwayjs/decorator';
 import * as extend from 'extend2';
 import * as fs from 'fs';
@@ -53,6 +53,7 @@ export class MidwayWebLoader extends EggLoader {
     this.loadPlugin();
     super.loadConfig();
   }
+
   // Get the real plugin path
   protected getPluginPath(plugin) {
     if (plugin.path) {
@@ -149,10 +150,14 @@ export class MidwayWebLoader extends EggLoader {
   protected loadApplicationContext() {
     // this.app.options.container 测试用例编写方便点
     const containerConfig = this.config.container || this.app.options.container || {};
+    if (!containerConfig.loadDir) {
+      // 如果没有配置，默认就把扫描目录改到 /src or /dist
+      containerConfig.baseDir = this.baseDir;
+    }
     // 在 super constructor 中会调用到getAppInfo，之后会被赋值
     // 如果是typescript会加上 dist 或者 src 目录
     this.containerLoader = new ContainerLoader({
-      baseDir: this.baseDir,
+      baseDir: this.appDir,
       isTsMode: this.isTsMode
     });
     this.containerLoader.initialize();
@@ -246,6 +251,7 @@ export class MidwayWebLoader extends EggLoader {
   protected async refreshContext(): Promise<void> {
     await this.containerLoader.refresh();
   }
+
   /**
    * wrap controller string to middleware function
    * @param controllerMapping like xxxController.index

packages/midway-web/src/utils.ts

@@ -43,5 +43,5 @@ export function getMethodNames(obj) {
 }
 
 export function isTypeScriptEnvironment() {
-  return !!require.extensions['.ts'];
+  return process.env['TS_NODE_FILES'] === 'true';
 }