chore(deps): update Angular2 to beta.12, remove es6-shim

Author: marclaval

gulpfile.js

@@ -4,8 +4,7 @@ var glob = require('glob');
 var JasmineRunner = require('jasmine');
 var path = require('path');
 
-require('zone.js/dist/zone-microtask.js');
-require('es6-shim/es6-shim.js');
+require('zone.js/dist/zone.js');
 require('reflect-metadata/Reflect');
 
 global.angularDevMode = true;

jasmine-test-shim.js

@@ -35,16 +35,15 @@
  "marked": "^0.3.5",
  "parse5": "1.5.0",
  "run-sequence": "~1.1.2",
+ "systemjs": "^0.19.9",
  "through2": "~0.6.3"
  },
  "dependencies": {
- "angular2": "2.0.0-beta.9",
+ "angular2": "2.0.0-beta.12",
  "hammerjs": "2.0.6",
  "react-native": "0.22.2",
  "reflect-metadata": "0.1.2",
  "rxjs": "5.0.0-beta.2",
- "zone.js": "0.5.15",
- "es6-shim": "^0.33.13",
- "systemjs": "^0.19.9"
+ "zone.js": "^0.6.6"
  }
 }

package.json

@@ -1,26 +1,21 @@
 //React Native wrapper
-import {ReactNativeWrapper} from "./../wrapper/wrapper";
 import {ReactNativeWrapperImpl} from './../wrapper/wrapper_impl';
 
 //Dependencies
-import 'reflect-metadata';
- // Zone.js
-import {Zone} from 'zone.js/build/lib/core';
-global.Zone = Zone;
-global.zone = new Zone();
-import {patchSetClearFunction} from 'zone.js/build/lib/patch/functions';
-import {apply} from 'zone.js/build/lib/patch/promise';
-patchSetClearFunction(global, global.Zone,
- [['setTimeout', 'clearTimeout', false, false],
- ['setInterval', 'clearInterval', true, false],
- ['setImmediate', 'clearImmediate', false, false]]);
+import 'reflect-metadata'
 
-//Needed for Android or iOS, but to be imported after zone.js, and
-var originalIsExtensible = Object.isExtensible;
-import 'es6-shim';
-Object.isExtensible = originalIsExtensible;
-//Patch promises after es6-shim overrides them
-apply();
+//Zone.js, patching RN's polyfill of XMLHttpRequest is needed to make it compatible with Zone.js
+var onreadystatechangeGetter = function() {return this._onreadystatechange;};
+var onreadystatechangeSetter = function(v: any) {this._onreadystatechange = v;};
+Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', {
+ get: onreadystatechangeGetter,
+ set: onreadystatechangeSetter,
+ configurable: true
+});
+import 'zone.js/dist/zone.js';
+Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', {
+ get: onreadystatechangeGetter,
+});
 
 // Finally, define the bootstrap
 import {RootRenderer, Renderer, provide, NgZone, Provider, enableProdMode, PLATFORM_DIRECTIVES} from 'angular2/core';
@@ -51,7 +46,7 @@ import {MapView} from "../components/ios/map_view";
 import {TabBar} from "../components/ios/tabbar";
 import {TabBarItem} from "../components/ios/tabbar_item";
 
-export function bootstrapReactNative(appName:string, cpt: any, customProviders?: Array<any> = []) {
+export function bootstrapReactNative(appName:string, cpt: any, customProviders?: Array<any>) {
  ReactNativeWrapperImpl.registerApp(appName, function() {
  enableProdMode();
  bootstrap(cpt, [
@@ -89,11 +84,11 @@ export function bootstrapReactNative(appName:string, cpt: any, customProviders?:
  provide(ElementSchemaRegistry, {useExisting: ReactNativeElementSchemaRegistry}),
  provide(ReactNativeRootRenderer, {useClass: ReactNativeRootRenderer_}),
  provide(RootRenderer, {useExisting: ReactNativeRootRenderer})
- ].concat(customProviders)).then(function(appRef) {
+ ].concat(customProviders || [])).then(function(appRef) {
  var zone = appRef.injector.get(NgZone);
  var rootRenderer = appRef.injector.get(RootRenderer);
- zone.onTurnDone.subscribe(() => { rootRenderer.executeCommands(); });
- appRef.injector.get(ReactNativeWrapperImpl).patchReactUpdates(zone._innerZone);
+ zone.onStable.subscribe(() => { rootRenderer.executeCommands(); });
+ appRef.injector.get(ReactNativeWrapperImpl).patchReactUpdates(zone);
  });
  });
 }

src/renderer/bootstrap.ts

@@ -141,7 +141,7 @@ export class ReactNativeWrapperImpl extends ReactNativeWrapper {
  }
 
  patchReactUpdates(zone: any): void {
- ReactNative.addons.batchedUpdates = zone.bind(ReactNative.addons.batchedUpdates);
+ //ReactNative.addons.batchedUpdates = zone.bind(ReactNative.addons.batchedUpdates);
  }
 
  patchReactNativeEventEmitter(nodeMap: Map<number, any>): void {

src/wrapper/wrapper_impl.ts

@@ -81,7 +81,7 @@ describe('Toolbar component (Android)', () => {
  rootRenderer.executeCommands();
  expect(fixture.componentInstance.log.join(',')).toEqual('1');
  resolve();
- }, 30);
+ }, 100);
  });
 
  });

test/components/android/toolbar_spec.ts

@@ -84,7 +84,7 @@ describe('DatePicker component (iOS)', () => {
  setTimeout(() => {
  expect(fixture.componentInstance.log.join(',')).toEqual('click');
  resolve();
- }, 30);
+ }, 100);
  });
 
  });

test/components/ios/map_view_spec.ts

@@ -80,7 +80,7 @@ describe('Slider component (iOS)', () => {
  setTimeout(() => {
  expect(fixture.componentInstance.log.join(',')).toEqual('0.55');
  resolve();
- }, 30);
+ }, 50);
  });
 
  });

test/components/ios/slider_spec.ts

@@ -112,7 +112,7 @@ describe('ScrollView component', () => {
  rootRenderer.executeCommands();
  expect(fixture.componentInstance.log.join(',')).toEqual('foo');
  resolve();
- }, 30);
+ }, 100);
  });
 
  });

test/components/scrollview_spec.ts

@@ -84,7 +84,7 @@ describe('Input component', () => {
  expect(fixture.componentInstance.log.join(',')).toEqual('foo');
  expect(mock.commandLogs.toString()).toEqual('UPDATE+3+native-textinput+{"text":"bar"}');
  resolve();
- }, 30);
+ }, 50);
  });
 
  });