refactor: split zone.js into CJS modules, add zone-microtask.js

BREAKING CHANGES: zone.js as well as *-zone.js files are moved from / to dist/
angular · May 8, 2015 · 2e52900 · 2e52900
1 parent 9b6d558
commit 2e52900
Show file tree

Hide file tree

Showing 37 changed files with 4,438 additions and 426 deletions.
diff --git a/counting-zone.js → dist/counting-zone.js b/counting-zone.js → dist/counting-zone.js
diff --git a/except-zone.js → dist/except-zone.js b/except-zone.js → dist/except-zone.js
diff --git a/long-stack-trace-zone.js → dist/long-stack-trace-zone.js b/long-stack-trace-zone.js → dist/long-stack-trace-zone.js
diff --git a/dist/zone-microtask.js b/dist/zone-microtask.js
diff --git a/dist/zone-microtask.min.js b/dist/zone-microtask.min.js
diff --git a/zone.js → dist/zone.js b/zone.js → dist/zone.js
diff --git a/dist/zone.min.js b/dist/zone.min.js
diff --git a/example/basic.html b/example/basic.html
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
   <title>Zone.js Basic Demo</title>
   <link rel="stylesheet" href="style.css">
-  <script src="../zone.js"></script>
-  <script src="../long-stack-trace-zone.js"></script>
+  <script src="../dist/zone.js"></script>
+  <script src="../dist/long-stack-trace-zone.js"></script>
 </head>
 <body>
 

diff --git a/example/counting.html b/example/counting.html
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
   <title>Counting Pending Tasks</title>
   <link rel="stylesheet" href="style.css">
-  <script src="../zone.js"></script>
-  <script src="../counting-zone.js"></script>
+  <script src="../dist/zone.js"></script>
+  <script src="../dist/counting-zone.js"></script>
 </head>
 <body>
 

diff --git a/example/except.html b/example/except.html
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
   <title>Except Zone</title>
   <link rel="stylesheet" href="style.css">
-  <script src="../zone.js"></script>
-  <script src="../except-zone.js"></script>
+  <script src="../dist/zone.js"></script>
+  <script src="../dist/except-zone.js"></script>
 </head>
 <body>
 

diff --git a/example/index.html b/example/index.html
@@ -4,8 +4,6 @@
   <meta charset="utf-8">
   <title>Zone.js Examples</title>
   <link rel="stylesheet" href="style.css">
-  <script src="../zone.js"></script>
-  <script src="../long-stack-trace-zone.js"></script>
 </head>
 <body>
 

diff --git a/example/profiling.html b/example/profiling.html
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
   <title>Zones Profiling</title>
   <link rel="stylesheet" href="style.css">
-  <script src="../zone.js"></script>
-  <script src="../long-stack-trace-zone.js"></script>
+  <script src="../dist/zone.js"></script>
+  <script src="../dist/long-stack-trace-zone.js"></script>
 </head>
 <body>
 

diff --git a/example/throttle.html b/example/throttle.html
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
   <title>Zones throttle</title>
   <link rel="stylesheet" href="style.css">
-  <script src="../zone.js"></script>
-  <script src="../long-stack-trace-zone.js"></script>
+  <script src="../dist/zone.js"></script>
+  <script src="../dist/long-stack-trace-zone.js"></script>
 </head>
 <body>
   <h1>Throttle Example</h1>
@@ -88,4 +88,4 @@ <h1>Throttle Example</h1>
   </script>
 
 </body>
-</html>
+</html>
diff --git a/example/web-socket.html b/example/web-socket.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>WebSockets with Zones</title>
   <link rel="stylesheet" href="style.css">
-  <script src="../zone.js"></script>
+  <script src="../dist/zone.js"></script>
 </head>
 <body>
 

diff --git a/example/xml-http-request.html b/example/xml-http-request.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>HTTP requests with Zones</title>
   <link rel="stylesheet" href="style.css">
-  <script src="../zone.js"></script>
+  <script src="../dist/zone.js"></script>
 </head>
 <body>
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -0,0 +1,40 @@
+'use strict';
+
+var gulp = require('gulp');
+var browserify = require('browserify');
+var source = require('vinyl-source-stream');
+var rename = require('gulp-rename');
+var uglify = require('gulp-uglify');
+var buffer = require('vinyl-buffer');
+
+var distFolder = './dist';
+
+function generateBrowserScript(inFile, outFile) {
+  var b = browserify({
+    entries: inFile,
+    debug: false
+  });
+
+  return b
+    .bundle()
+    .pipe(source(outFile))
+    .pipe(buffer())
+    .pipe(gulp.dest(distFolder))
+    .pipe(uglify())
+    .pipe(rename({ extname: '.min.js' }))
+    .pipe(gulp.dest(distFolder));
+  ;
+}
+
+gulp.task('build/zone.js', function() {
+  return generateBrowserScript('./lib/browser/zone.js', 'zone.js');
+});
+
+gulp.task('build/zone-microtask.js', function() {
+  return generateBrowserScript('./lib/browser/zone-microtask.js', 'zone-microtask.js');
+});
+
+gulp.task('build', ['build/zone.js', 'build/zone-microtask.js']);
+
+
+
diff --git a/karma-browserify.conf.js b/karma-browserify.conf.js
@@ -5,14 +5,13 @@ module.exports = function (config) {
     basePath: '',
     files: [
       'test/util.js',
-      {pattern: 'zone.js', watched: true, served: false, included: false},
-      //'test/lib/brick.js',
+      {pattern: 'lib/zone.js', watched: true, served: false, included: false},
       'test/commonjs.spec.js',
       {pattern: 'test/assets/**/*.html', watched: true, served: true, included: false}
     ],
 
     exclude: [
-      
+
     ],
 
     reporters: ['progress'],

diff --git a/karma.conf.js b/karma.conf.js
@@ -5,8 +5,8 @@ module.exports = function (config) {
     basePath: '',
     files: [
       'test/util.js',
-      'zone.js',
-      '*-zone.js',
+      'dist/zone.js',
+      'dist/*-zone.js',
       //'test/lib/brick.js',
       'test/**/*.spec.js',
       {pattern: 'test/assets/**/*.html', watched: true, served: true, included: false}

diff --git a/lib/browser/zone-microtask.js b/lib/browser/zone-microtask.js
@@ -0,0 +1,19 @@
+'use strict';
+
+var core = require('../core');
+var microtask = require('../microtask');
+var browserPatch = require('../patch/browser');
+var es6Promise = require('../ext/es6-promise.js');
+
+if (global.Zone) {
+  console.warn('Zone already exported on window the object!');
+}
+
+global.Zone = microtask.addMicrotaskSupport(core.Zone);
+global.zone = new global.Zone();
+
+// Monkey path ẗhe Promise implementation to add support for microtasks
+global.Promise = es6Promise.Promise;
+
+browserPatch.apply();
+
diff --git a/lib/browser/zone.js b/lib/browser/zone.js
@@ -0,0 +1,13 @@
+'use strict';
+
+var core = require('../core');
+var browserPatch = require('../patch/browser');
+
+if (global.Zone) {
+  console.warn('Zone already exported on window the object!');
+}
+
+global.Zone = core.Zone;
+global.zone = new global.Zone();
+
+browserPatch.apply();