Merge branch 'feature/angular-10' into develop

angular.json

@@ -39,5 +39,8 @@
       }
     }
   },
-  "defaultProject": "ngx-googlemaps-tracking-view"
+  "defaultProject": "ngx-googlemaps-tracking-view",
+  "cli": {
+    "analytics": false
+  }
 }

package.json

@@ -17,42 +17,41 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~7.2.0",
-    "@angular/common": "~7.2.0",
-    "@angular/compiler": "~7.2.0",
-    "@angular/core": "~7.2.0",
-    "@angular/forms": "~7.2.0",
-    "@angular/platform-browser": "~7.2.0",
-    "@angular/platform-browser-dynamic": "~7.2.0",
-    "@angular/router": "~7.2.0",
+    "@angular/animations": "~10.2.4",
+    "@angular/common": "~10.2.4",
+    "@angular/compiler": "~10.2.4",
+    "@angular/core": "~10.2.4",
+    "@angular/forms": "~10.2.4",
+    "@angular/platform-browser": "~10.2.4",
+    "@angular/platform-browser-dynamic": "~10.2.4",
+    "@angular/router": "~10.2.4",
     "angular-cli-ghpages": "^0.5.3",
     "core-js": "^2.5.4",
-    "rxjs": "~6.3.3",
-    "zone.js": "~0.8.26"
+    "rxjs": "~6.6.3",
+    "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.13.0",
-    "@angular-devkit/build-ng-packagr": "~0.13.0",
-    "@angular/cli": "~7.3.3",
-    "@angular/compiler-cli": "~7.2.0",
-    "@angular/language-service": "~7.2.0",
-    "@types/googlemaps": "^3.37.3",
+    "@angular-devkit/build-angular": "~0.1002.1",
+    "@angular-devkit/build-ng-packagr": "~0.1002.1",
+    "@angular/cli": "~10.2.1",
+    "@angular/compiler-cli": "~10.2.4",
+    "@angular/language-service": "~10.2.4",
+    "@types/googlemaps": "^3.43.2",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "~4.5.0",
+    "codelyzer": "^6.0.1",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~4.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "ng-packagr": "^4.2.0",
+    "ng-packagr": "^10.1.2",
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",
-    "tsickle": ">=0.34.0",
-    "tslib": "^1.9.0",
+    "tslib": "^2.1.0",
     "tslint": "~5.11.0",
-    "typescript": "~3.2.2"
+    "typescript": "~4.0.5"
   }
 }

projects/ngx-googlemaps-tracking-view/package.json

@@ -2,8 +2,8 @@
   "name": "ngx-googlemaps-tracking-view",
   "version": "1.5.1",
   "peerDependencies": {
-    "@angular/common": "^7.2.0",
-    "@angular/core": "^7.2.0",
+    "@angular/common": "~10.2.4",
+    "@angular/core": "~10.2.4",
     "@types/googlemaps": "^3.39.3"
   },
   "description": "A General-purpose embedded Angular map for tracking objects in real time using [Google Maps](https://developers.google.com/maps/documentation/javascript/tutorial).",

projects/ngx-googlemaps-tracking-view/src/index.ts

@@ -1,3 +1 @@
 export * from './public-api';
-export * from './lib/models/tracked-object';
-export * from './lib/components/geolocation-button/geolocation-button';

projects/ngx-googlemaps-tracking-view/src/lib/components/infowindow/infowindow.component.ts

@@ -31,10 +31,10 @@ import { GoogleMapsWrapper } from '../../services/googlemaps-wrapper';
               </div>`
 })
 export class InfowindowComponent implements AfterContentInit, OnDestroy {
-  @ViewChild('root') root: ElementRef;
+  @ViewChild('root', { static: true }) root: ElementRef;
   // tslint:disable-next-line: no-any
-  @ViewChild('defaultTemplate') defaultTemplateRef: TemplateRef<any>;
-  @ViewChild('vc', { read: ViewContainerRef }) vc: ViewContainerRef;
+  @ViewChild('defaultTemplate', { static: true }) defaultTemplateRef: TemplateRef<any>;
+  @ViewChild('vc', { static: true, read: ViewContainerRef }) vc: ViewContainerRef;
   /** When infowindow has closed */
   @Output() closed = new EventEmitter<void>();
   /** Triggered on clicking on the X button */

projects/ngx-googlemaps-tracking-view/src/lib/components/tracked-object/tracked-object.component.ts

@@ -66,7 +66,7 @@ export class TrackedObjectComponent implements AfterContentInit, OnChanges, OnDe
    */
   @Input() triggerInfowindow: 'hover' | 'click' = 'hover';
 
-  @ViewChild(InfowindowComponent) infowindow: InfowindowComponent;
+  @ViewChild(InfowindowComponent, { static: true }) infowindow: InfowindowComponent;
   constructor(private googleMaps: GoogleMapsWrapper) { }
 
   async ngAfterContentInit() {

projects/ngx-googlemaps-tracking-view/src/lib/ngx-googlemaps-tracking-view.component.ts

@@ -23,8 +23,7 @@ import { HttpClient } from '@angular/common/http';
   // encapsulation: ViewEncapsulation.ShadowDom,
 })
 export class NgxGooglemapsTrackingViewComponent implements OnInit {
-  // tslint:disable-next-line: no-any
-  @ViewChild('map', { static: true } as any) mapDiv: ElementRef;
+  @ViewChild('map', { static: true }) mapDiv: ElementRef;
   /**
    * A marker fixed to the center of the map which emits the geo-decoded location
    * as a full address.

projects/ngx-googlemaps-tracking-view/src/public-api.ts

@@ -3,4 +3,7 @@
  */
 
 export * from './lib/ngx-googlemaps-tracking-view.component';
-export * from './lib/ngx-googlemaps-tracking-view.module';
+export * from './lib/ngx-googlemaps-tracking-view.module';
+export * from './lib/models/tracked-object';
+export * from './lib/components/geolocation-button/geolocation-button';
+export * from './lib/components/infowindow/infowindow.component';