From 16247c051d11c52e314b5e3f799205c73eca67a4 Mon Sep 17 00:00:00 2001
From: "JiaLi.Passion" <JiaLi.Passion@gmail.com>
Date: Wed, 10 May 2017 17:36:23 +0900
Subject: [PATCH] refactor browser/node module load structure

---
 gulpfile.js                |  2 +-
 lib/browser/browser.ts     |  2 --
 lib/browser/rollup-main.ts |  2 +-
 lib/mix/rollup-mix.ts      |  3 ++-
 lib/node/node.ts           |  3 ---
 lib/node/rollup-main.ts    | 12 ++++++++++++
 test/browser-zone-setup.ts |  1 +
 test/node_entry_point.ts   |  2 ++
 8 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 lib/node/rollup-main.ts

diff --git a/gulpfile.js b/gulpfile.js
index 1e762bdba..ec6cb3118 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -74,7 +74,7 @@ gulp.task('build/zone.js.d.ts', ['compile-esm'], function() {
 
 // Zone for Node.js environment.
 gulp.task('build/zone-node.js', ['compile-esm'], function(cb) {
-  return generateScript('./lib/node/node.ts', 'zone-node.js', false, cb);
+  return generateScript('./lib/node/rollup-main.ts', 'zone-node.js', false, cb);
 });
 
 // Zone for the browser.
diff --git a/lib/browser/browser.ts b/lib/browser/browser.ts
index 4f987b228..f4d7b48fb 100644
--- a/lib/browser/browser.ts
+++ b/lib/browser/browser.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import '../common/to-string';
-
 import {patchTimer} from '../common/timers';
 import {findEventTask, patchClass, patchEventTargetMethods, patchMethod, patchPrototype, zoneSymbol} from '../common/utils';
 
diff --git a/lib/browser/rollup-main.ts b/lib/browser/rollup-main.ts
index 0d6cca1a8..f7dfd8759 100644
--- a/lib/browser/rollup-main.ts
+++ b/lib/browser/rollup-main.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-
 import '../zone';
 import '../common/promise';
+import '../common/to-string';
 import './browser';
diff --git a/lib/mix/rollup-mix.ts b/lib/mix/rollup-mix.ts
index a0acffbd5..57e487773 100644
--- a/lib/mix/rollup-mix.ts
+++ b/lib/mix/rollup-mix.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-
 import '../zone';
+import '../common/promise';
+import '../common/to-string';
 import '../browser/browser';
 import '../node/node';
diff --git a/lib/node/node.ts b/lib/node/node.ts
index c516cd956..f934fae87 100644
--- a/lib/node/node.ts
+++ b/lib/node/node.ts
@@ -6,9 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import '../zone';
-import '../common/promise';
-import '../common/to-string';
 import './events';
 import './fs';
 
diff --git a/lib/node/rollup-main.ts b/lib/node/rollup-main.ts
new file mode 100644
index 000000000..136714b1e
--- /dev/null
+++ b/lib/node/rollup-main.ts
@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import '../zone';
+import '../common/promise';
+import '../common/to-string';
+import './node';
\ No newline at end of file
diff --git a/test/browser-zone-setup.ts b/test/browser-zone-setup.ts
index c75b47dd9..70ec87fd5 100644
--- a/test/browser-zone-setup.ts
+++ b/test/browser-zone-setup.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import '../lib/common/to-string';
 import '../lib/browser/browser';
 import '../lib/zone-spec/async-test';
 import '../lib/zone-spec/fake-async-test';
diff --git a/test/node_entry_point.ts b/test/node_entry_point.ts
index cca820e25..a30da33c7 100644
--- a/test/node_entry_point.ts
+++ b/test/node_entry_point.ts
@@ -12,6 +12,8 @@ import './custom_error';
 
 // Setup tests for Zone without microtask support
 import '../lib/zone';
+import '../lib/common/promise';
+import '../lib/common/to-string';
 import '../lib/node/node';
 import '../lib/zone-spec/async-test';
 import '../lib/zone-spec/fake-async-test';