fix(zone.js): zone-mix should import correct browser module

Close angular#31626
JiaLiPassion · Jul 23, 2019 · 0ce21d6 · 0ce21d6
1 parent e8ae3c5
commit 0ce21d6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -668,6 +668,7 @@ jobs:
         # Run zone.js tools tests
       - run: yarn --cwd packages/zone.js promisetest
       - run: yarn --cwd packages/zone.js promisefinallytest
+      - run: yarn bazel build //packages/zone.js:npm_package && cp dist/bin/packages/zone.js/npm_package/dist/zone-mix.js ./packages/zone.js/test/extra/ && yarn --cwd packages/zone.js electrontest
 
 workflows:
   version: 2

diff --git a/packages/zone.js/lib/mix/rollup-mix.ts b/packages/zone.js/lib/mix/rollup-mix.ts
@@ -6,8 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import '../zone';
-import '../common/promise';
-import '../common/to-string';
-import '../browser/browser';
+import '../browser/rollup-main';
 import '../node/node';
diff --git a/packages/zone.js/package.json b/packages/zone.js/package.json
@@ -15,13 +15,15 @@
     "test": "test"
   },
   "devDependencies": {
+    "domino": "2.1.2",
     "mocha": "^3.1.2",
     "promises-aplus-tests": "^2.1.2",
     "typescript": "~3.4.2"
   },
   "scripts": {
     "promisetest": "tsc -p . && node ./promise-test.js",
-    "promisefinallytest": "tsc -p . && mocha promise.finally.spec.js"
+    "promisefinallytest": "tsc -p . && mocha promise.finally.spec.js",
+    "build": "cd test/extra && node electron.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/zone.js/test/extra/electron.js b/packages/zone.js/test/extra/electron.js
@@ -0,0 +1,9 @@
+/**
+ * @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
+ */
+var domino = require('domino');
+require('./zone-mix');