From 241b4e83c05e7086493564e536f5ce69d17dde0c Mon Sep 17 00:00:00 2001
From: Yiyu He <dead-horse@users.noreply.github.com>
Date: Tue, 11 Apr 2017 15:58:21 +0800
Subject: [PATCH] feat: expose egg.Controller and egg.Service (#741)

---
 index.js           | 12 ++++++++++++
 package.json       | 10 +++++-----
 test/index.test.js | 18 ++++++++++++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 test/index.test.js

diff --git a/index.js b/index.js
index 4faaae26c7..b196cc63d1 100644
--- a/index.js
+++ b/index.js
@@ -33,3 +33,15 @@ exports.AppWorkerLoader = require('./lib/loader').AppWorkerLoader;
  * @since 1.0.0
  */
 exports.AgentWorkerLoader = require('./lib/loader').AgentWorkerLoader;
+
+/**
+ * @member {Controller} Egg#Controller
+ * @since 1.1.0
+ */
+exports.Controller = require('egg-core').BaseContextClass;
+
+/**
+ * @member {Service} Egg#Service
+ * @since 1.1.0
+ */
+exports.Service = require('egg-core').BaseContextClass;
diff --git a/package.json b/package.json
index 94a4100682..cd6871f8da 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "delegates": "^1.0.0",
     "egg-cluster": "^1.6.2",
     "egg-cookies": "^2.2.1",
-    "egg-core": "^3.0.0",
+    "egg-core": "^3.2.0",
     "egg-development": "^1.2.0",
     "egg-i18n": "^1.1.0",
     "egg-jsonp": "^1.0.0",
@@ -33,7 +33,7 @@
     "egg-security": "^1.9.0",
     "egg-session": "^2.1.0",
     "egg-static": "^1.3.0",
-    "egg-view": "^1.0.1",
+    "egg-view": "^1.1.0",
     "egg-watcher": "^2.1.0",
     "extend2": "^1.0.0",
     "graceful": "^1.0.1",
@@ -42,7 +42,7 @@
     "koa-is-json": "^1.0.0",
     "mime-types": "^2.1.15",
     "sendmessage": "^1.1.0",
-    "urllib": "^2.21.2",
+    "urllib": "^2.22.0",
     "utility": "^1.11.0"
   },
   "devDependencies": {
@@ -50,11 +50,11 @@
     "autod-egg": "^1.0.0",
     "coffee": "^3.3.0",
     "egg-alinode": "^1.0.3",
-    "egg-bin": "^3.1.0",
+    "egg-bin": "^3.2.1",
     "egg-mock": "^3.2.0",
     "egg-plugin-puml": "^1.0.0",
     "egg-view-nunjucks": "^2.0.0",
-    "eslint": "^3.18.0",
+    "eslint": "^3.19.0",
     "eslint-config-egg": "^3.2.0",
     "formstream": "^1.1.0",
     "gh-pages": "^0.12.0",
diff --git a/test/index.test.js b/test/index.test.js
new file mode 100644
index 0000000000..3ea1287557
--- /dev/null
+++ b/test/index.test.js
@@ -0,0 +1,18 @@
+'use strict';
+
+const assert = require('assert');
+const egg = require('..');
+
+describe('test/index.test.js', () => {
+  it('should expose properties', () => {
+    assert.deepEqual(Object.keys(egg).sort(), [
+      'Agent',
+      'AgentWorkerLoader',
+      'AppWorkerLoader',
+      'Application',
+      'Controller',
+      'Service',
+      'startCluster',
+    ]);
+  });
+});