fix: add appDir in appInfo

midwayjs · Jan 7, 2019 · 4399aba · 4399aba
1 parent f140a18
commit 4399aba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/packages/midway-core/src/loader.ts b/packages/midway-core/src/loader.ts
@@ -5,6 +5,7 @@ import { MidwayContainer } from './container';
 import { MidwayHandlerKey } from './constants';
 import { MidwayLoaderOptions } from './interface';
 import { MidwayRequestContainer } from './requestContainer';
+import * as extend from 'extend2';
 
 const EggLoader = require('egg-core').EggLoader;
 const TS_SRC_DIR = 'src';
@@ -220,8 +221,10 @@ export class MidwayLoader extends EggLoader {
   getAppInfo() {
     if (!this.appInfo) {
       const appInfo = super.getAppInfo();
-      this.appInfo = Object.assign(appInfo, {
-        root: appInfo.env === 'local' || appInfo.env === 'unittest' ? this.appDir : appInfo.root
+      // ROOT == HOME in prod env
+      this.appInfo = extend(true, appInfo, {
+        root: appInfo.env === 'local' || appInfo.env === 'unittest' ? this.appDir : appInfo.root,
+        appDir: this.appDir,
       });
     }
     return this.appInfo;

diff --git a/packages/midway-web/config/config.default.js b/packages/midway-web/config/config.default.js
@@ -34,12 +34,11 @@ module.exports = (appInfo) => {
     ]
   };
 
-  const appRoot = appInfo.env === 'local' || appInfo.env === 'unittest' ? appInfo.appDir : appInfo.HOME;
   exports.alinode = {
-    logdir: path.join(appRoot, 'logs/alinode'),
+    logdir: path.join(appInfo.root, 'logs/alinode'),
     error_log: [
-      path.join(appRoot, `logs/${appInfo.pkg.name}/common-error.log`),
-      path.join(appRoot, 'logs/stderr.log'),
+      path.join(appInfo.root, `logs/${appInfo.pkg.name}/common-error.log`),
+      path.join(appInfo.root, 'logs/stderr.log'),
     ],
     packages: [
       path.join(appInfo.appDir, 'package.json'),

diff --git a/packages/midway/README.md b/packages/midway/README.md
@@ -27,6 +27,7 @@ Node.js >= 8.0.0 required.
 - ✔︎ Scalable plug-in capabilities and group plug-in Ecology
 - ✔︎ Good application layering and decoupling capability
 - ✔︎ A good development experience for the future
+- ✔︎ Support Egg plugins and koa middleware
 
 
 ## Getting Started
@@ -43,8 +44,8 @@ $ open http://localhost:7001
 
 ## Docs & Community
 
-[Website && Documentations](https://midwayjs.org/midway/)
-[All Egg Plugins](https://github.com/search?q=topic%3Aegg-plugin&type=Repositories)
+- [Website && Documentations](https://midwayjs.org/midway/)
+- [All Egg Plugins](https://github.com/search?q=topic%3Aegg-plugin&type=Repositories)
 
 ## Examples