feat(angular2): add angular2.0.0-alpha.52 support

- All Angular2 peer dependencies are now also angular2-google-maps dependencies. - rx package gets replaced with rxjs package
sebholstein · Dec 10, 2015 · 8a1d813 · 8a1d813
1 parent 9a3d33b
commit 8a1d813
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/gulp/bundle.js b/gulp/bundle.js
@@ -10,8 +10,7 @@ const bundleConfig = {
   defaultJSExtensions: true,
   paths: {
     'angular2/*': path.join(__dirname, '../node_modules/angular2/*'),
-    '@reactivex/*': path.join(__dirname, '../node_modules/angular2/node_modules/@reactivex/*'),
-    'rx': path.join(__dirname, '../node_modules/rx/dist/rx.all.js'),
+    'rxjs/*': path.join(__dirname, '../node_modules/rxjs/*'),
   },
 };
 
@@ -23,7 +22,7 @@ function bundle(moduleName, outputFile, outputConfig) {
 
 gulp.task('bundle:cjs', ['scripts:cjs'], function cleanDist(done) {
   const distFileName = path.join(config.PATHS.dist.bundles, 'angular2_google_maps.js');
-  bundle('angular2_google_maps/angular2_google_maps - angular2/* - @reactivex/*', distFileName, {
+  bundle('angular2_google_maps/angular2_google_maps - angular2/* - rxjs/*', distFileName, {
     sourceMaps: true,
   }).then(() => {
     gulp.src(distFileName)
@@ -33,7 +32,7 @@ gulp.task('bundle:cjs', ['scripts:cjs'], function cleanDist(done) {
 });
 
 gulp.task('bundle:cjs-min', ['scripts:cjs'], function cleanDist() {
-  bundle('angular2_google_maps/angular2_google_maps - angular2/* - @reactivex/*', path.join(config.PATHS.dist.bundles, 'angular2_google_maps.min.js'), {
+  bundle('angular2_google_maps/angular2_google_maps - angular2/* - rxjs/*', path.join(config.PATHS.dist.bundles, 'angular2_google_maps.min.js'), {
     sourceMaps: true,
     minify: true,
   });

diff --git a/package.json b/package.json
@@ -18,9 +18,16 @@
     "url": "https://github.com/SebastianM/angular2-google-maps/issues"
   },
   "homepage": "https://github.com/SebastianM/angular2-google-maps#readme",
+  "dependencies": {
+    "angular2": "^2.0.0-alpha.52",
+    "es6-promise": "^3.0.2",
+    "es6-shim": "^0.33.3",
+    "reflect-metadata": "0.1.2",
+    "rxjs": "5.0.0-alpha.14",
+    "zone.js": "0.5.8"
+  },
   "devDependencies": {
     "@reactivex/rxjs": "5.0.0-alpha.10",
-    "angular2": "2.0.0-alpha.46",
     "babel-eslint": "4.1.6",
     "conventional-github-releaser": "0.5.0",
     "del": "2.2.0",

diff --git a/src/components/google_map_marker.ts b/src/components/google_map_marker.ts
@@ -15,7 +15,7 @@ export class SebmGoogleMapMarker implements OnDestroy, OnChanges {
 
   constructor(private _markerManager: MarkerManager) { this._id = (markerId++).toString(); }
 
-  onChanges(changes: {[key: string]: SimpleChange}) {
+  ngOnChanges(changes: {[key: string]: SimpleChange}) {
     if (!this._markerAddedToManger && this.latitude && this.longitude) {
       this._markerManager.addMarker(this);
       this._markerAddedToManger = true;
@@ -36,5 +36,5 @@ export class SebmGoogleMapMarker implements OnDestroy, OnChanges {
 
   toString(): string { return 'SebmGoogleMapMarker-' + this._id.toString(); }
 
-  onDestroy() { this._markerManager.deleteMarker(this); }
+  ngOnDestroy() { this._markerManager.deleteMarker(this); }
 }
diff --git a/src/custom_typings/typings.d.ts b/src/custom_typings/typings.d.ts
diff --git a/src/services/google_maps_api_wrapper.ts b/src/services/google_maps_api_wrapper.ts
@@ -1,5 +1,5 @@
-import {Injectable} from 'angular2/angular2';
-import {Observable} from 'rx';
+import {Injectable, Observable} from 'angular2/angular2';
+import {Observer} from 'rxjs/Observer';
 
 import {MapsAPILoader} from './maps_api_loader/maps_api_loader';
 
@@ -30,25 +30,25 @@ export class GoogleMapsAPIWrapper {
     });
   }
 
-  createEventObservable<E>(eventName: string, callback: (observer: Rx.Observer<E>) => void):
+  createEventObservable<E>(eventName: string, callback: (observer: Observer<E>) => void):
       Observable<E> {
-    return Observable.create((observer: Rx.Observer<E>) => {
+    return Observable.create((observer: Observer<E>) => {
       this._map.then(
           (m: google.maps.Map) => m.addListener(eventName, () => { callback(observer); }));
     });
   }
 
   private _createObservables() {
     this._centerChangeObservable = this.createEventObservable<google.maps.LatLngLiteral>(
-        'center_changed', (observer: Rx.Observer<google.maps.LatLngLiteral>) => {
+        'center_changed', (observer: Observer<google.maps.LatLngLiteral>) => {
           this._map.then((map: google.maps.Map) => {
             const center = map.getCenter();
-            observer.onNext({lat: center.lat(), lng: center.lng()});
+            observer.next({lat: center.lat(), lng: center.lng()});
           });
         });
     this._zoomChangeObservable =
-        this.createEventObservable<number>('zoom_changed', (observer: Rx.Observer<number>) => {
-          this._map.then((map: google.maps.Map) => { observer.onNext(map.getZoom()); });
+        this.createEventObservable<number>('zoom_changed', (observer: Observer<number>) => {
+          this._map.then((map: google.maps.Map) => { observer.next(map.getZoom()); });
         });
   }