From 2fb89df413c8ff134ebe29d95e0fc8a561a89398 Mon Sep 17 00:00:00 2001
From: Haoliang Gao <sakura9515@gmail.com>
Date: Thu, 2 Mar 2017 21:40:55 +0800
Subject: [PATCH] feat: remove default customEgg (#487)

If customEgg is not specified, master will lookup egg from node_modules
by default
---
 .gitignore                                             |  3 ++-
 index.js                                               |  2 +-
 lib/cluster/index.js                                   | 10 ----------
 .../master-worker-started/node_modules/egg/index.js    |  3 +++
 .../node_modules/egg/package.json                      |  3 +++
 5 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 lib/cluster/index.js
 create mode 100644 test/fixtures/apps/master-worker-started/node_modules/egg/index.js
 create mode 100644 test/fixtures/apps/master-worker-started/node_modules/egg/package.json

diff --git a/.gitignore b/.gitignore
index 5778d2446..e1365d4a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-node_modules
+/node_modules
 coverage
 *.log
 npm-debug.log
@@ -11,6 +11,7 @@ run
 .DS_Store
 .tmp
 docs/CONTRIBUTING.md
+docs/node_modules
 docs/README.md
 docs/db.json
 docs/source/release/index.md
diff --git a/index.js b/index.js
index d289d2ff9..4faaae26c 100644
--- a/index.js
+++ b/index.js
@@ -8,7 +8,7 @@
  * Start egg application with cluster mode
  * @since 1.0.0
  */
-exports.startCluster = require('./lib/cluster');
+exports.startCluster = require('egg-cluster').startCluster;
 
 /**
  * @member {Application} Egg#Application
diff --git a/lib/cluster/index.js b/lib/cluster/index.js
deleted file mode 100644
index f2d2fd234..000000000
--- a/lib/cluster/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const path = require('path');
-const startCluster = require('egg-cluster').startCluster;
-
-module.exports = (options = {}, callback) => {
-  /* istanbul ignore next */
-  options.customEgg = options.customEgg || path.join(__dirname, '../..');
-  startCluster(options, callback);
-};
diff --git a/test/fixtures/apps/master-worker-started/node_modules/egg/index.js b/test/fixtures/apps/master-worker-started/node_modules/egg/index.js
new file mode 100644
index 000000000..9f6eaa5c6
--- /dev/null
+++ b/test/fixtures/apps/master-worker-started/node_modules/egg/index.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('../../../../../..');
diff --git a/test/fixtures/apps/master-worker-started/node_modules/egg/package.json b/test/fixtures/apps/master-worker-started/node_modules/egg/package.json
new file mode 100644
index 000000000..6697ad3f1
--- /dev/null
+++ b/test/fixtures/apps/master-worker-started/node_modules/egg/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "egg"
+}