feat: [BREAKING_CHANGE] use egg-core

lib/core/app/extend/agent.js → app/extend/agent.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Singleton = require('../../singleton');
+const Singleton = require('../../lib/core/singleton');
 
 // 空的 instrument 返回，用于生产环境，避免每次创建对象
 const emptyInstrument = {

lib/core/app/extend/application.js → app/extend/application.js

@@ -3,12 +3,12 @@
 const http = require('http');
 const assert = require('assert');
 const accepts = require('accepts');
-const Keygrip = require('../../keygrip');
-const Service = require('../../base_service');
-const view = require('../../view');
-const AppWorkerClient = require('../../app_worker_client');
-const util = require('../../util');
-const Singleton = require('../../singleton');
+const Keygrip = require('../../lib/core/keygrip');
+const Service = require('../../lib/core/base_service');
+const view = require('../../lib/core/view');
+const AppWorkerClient = require('../../lib/core/app_worker_client');
+const util = require('../../lib/core/util');
+const Singleton = require('../../lib/core/singleton');
 
 const KEYS = Symbol('Application#keys');
 const APP_CLIENTS = Symbol('Application#appClients');

lib/core/app/extend/context.js → app/extend/context.js

@@ -10,7 +10,7 @@ const delegate = require('delegates');
 const jsonpBody = require('jsonp-body');
 const ContextLogger = require('egg-logger').EggContextLogger;
 const Cookies = require('egg-cookies');
-const util = require('../../util');
+const util = require('../../lib/core/util');
 
 const LOGGER = Symbol('LOGGER');
 const CORE_LOGGER = Symbol('CORE_LOGGER');

lib/core/config/plugin.js → config/plugin.js

@@ -31,7 +31,7 @@ module.exports = {
    * @since 1.0.0
    */
   userrole: {
-    enable: true,
+    enable: false,
     package: 'egg-userrole',
   },
 
@@ -53,7 +53,7 @@ module.exports = {
    * @since 1.0.0
    */
   i18n: {
-    enable: true,
+    enable: false,
     package: 'egg-i18n',
   },
 
@@ -119,7 +119,7 @@ module.exports = {
    * @since 1.0.0
    */
   logrotater: {
-    enable: true,
+    enable: false,
     package: 'egg-logrotater',
   },
 
@@ -130,7 +130,7 @@ module.exports = {
    * @since 2.7.0
    */
   schedule: {
-    enable: true,
+    enable: false,
     package: 'egg-schedule',
   },
 

index.js

@@ -8,7 +8,7 @@
  * Start egg application with cluster mode
  * @since 1.0.0
  */
-exports.startCluster = require('./lib/cluster/index').startCluster;
+exports.startCluster = require('egg-cluster').startCluster;
 
 /**
  * @member {Application} Egg#Application
@@ -34,33 +34,14 @@ exports.AgentWorkerClient = require('./lib/core/agent_worker_client');
  */
 exports.AppWorkerClient = require('./lib/core/app_worker_client');
 
-/**
- * @member {MasterLoader} Egg#MasterLoader
- * @since 1.0.0
- */
-exports.MasterLoader = require('./lib/core/loader').MasterLoader;
-
 /**
  * @member {AppWorkerLoader} Egg#AppWorkerLoader
  * @since 1.0.0
  */
-exports.AppWorkerLoader = require('./lib/core/loader').AppWorkerLoader;
+exports.AppWorkerLoader = require('./lib/loader').AppWorkerLoader;
 
 /**
  * @member {AgentWorkerLoader} Egg#AgentWorkerLoader
  * @since 1.0.0
  */
-exports.AgentWorkerLoader = require('./lib/core/loader').AgentWorkerLoader;
-
-/**
- * @member {Service} Egg#Service
- * @since 1.0.0
- */
-exports.Service = require('./lib/core/base_service');
-
-/**
- * @member {Logger} Egg#console
- * @see Application#console
- * @since 1.0.0
- */
-exports.console = require('./lib/core/console');
+exports.AgentWorkerLoader = require('./lib/loader').AgentWorkerLoader;

lib/agent.js

@@ -1,7 +1,8 @@
 'use strict';
 
+const path = require('path');
 const EggApplication = require('./egg');
-const AgentWorkerLoader = require('./core/loader').AgentWorkerLoader;
+const AgentWorkerLoader = require('./loader').AgentWorkerLoader;
 const AgentWorkerClient = require('./core/agent_worker_client');
 
 const AGENT_CLIENTS = Symbol('Agent#agentClients');
@@ -21,10 +22,7 @@ class Agent extends EggApplication {
     options.type = 'agent';
     super(options);
 
-    // 扩展 Agent API
-    this.loader.loadAgent();
-    // 加载自定义 agent.js
-    this.loader.loadCustomAgent();
+    this.loader.load();
 
     // 不让 agent 退出
     setInterval(() => {}, 24 * 60 * 60 * 1000);
@@ -89,6 +87,10 @@ class Agent extends EggApplication {
     return AgentWorkerLoader;
   }
 
+  get [Symbol.for('egg#eggPath')]() {
+    return path.join(__dirname, '..');
+  }
+
   close() {
     process.removeListener('uncaughtException', this._uncaughtExceptionHandler);
     super.close();

lib/application.js

@@ -6,9 +6,10 @@
 
 'use strict';
 
+const path = require('path');
 const graceful = require('graceful');
 const EggApplication = require('./egg');
-const AppWorkerLoader = require('./core/loader').AppWorkerLoader;
+const AppWorkerLoader = require('./loader').AppWorkerLoader;
 
 /**
  * Application 对象，由 AppWorker 实例化，和 {@link Agent} 共用继承 {@link EggApplication} 的 API
@@ -24,7 +25,6 @@ class Application extends EggApplication {
     options = options || {};
     options.type = 'application';
     super(options);
-    this.loader.loadApplication();
     this.loader.load();
     this.on('server', server => this.onServer(server));
   }
@@ -33,6 +33,10 @@ class Application extends EggApplication {
     return AppWorkerLoader;
   }
 
+  get [Symbol.for('egg#eggPath')]() {
+    return path.join(__dirname, '..');
+  }
+
   onServer(server) {
     graceful({
       server: [ server ],