Skip to content

Commit 3728d29

Browse files
dankreigersebholstein
dankreiger
authored and
sebholstein
committed
feat: agm angular 7 compatibility (sebholstein#1572)
* chore(AgmMap): update to angular 7 * chore(AgmMaps): update peer dependency info * chore(AgmMaps) Update changelog * chore(AgmMaps): update peer dependencies * chore: give angular deps min of 7.0.0 * chore: use https in getting started readme
1 parent 0e8f1ab commit 3728d29

7 files changed

Lines changed: 2597 additions & 1409 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
<a name="1.0.0-beta.6"></a>
2+
# [1.0.0-beta.6](https://github.com/SebastianM/angular-google-maps/compare/1.0.0-beta.5...1.0.0-beta.6) (2018-11-13)
3+
14
<a name="1.0.0-beta.5"></a>
25
# [1.0.0-beta.5 yellow-tape](https://github.com/SebastianM/angular-google-maps/compare/1.0.0-beta.4...1.0.0-beta.5) (2018-09-24)
36

@@ -77,7 +80,7 @@ Angular 4.x is not officially supported anymore. Please update to Angular 5.x or
7780
* **snazzy-info-window:** support angular 4.x and 5.x ([28c9646](https://github.com/SebastianM/angular-google-maps/commit/28c9646))
7881

7982
### BREAKING CHANGES
80-
Angular 2.x is not officially supported anymore. Please update to Angular 4.x or 5.x.
83+
Angular 2.x is not officially supported anymore. Please update to Angular 4.x or 5.x.
8184

8285

8386
<a name="1.0.0-beta.1"></a>
@@ -161,7 +164,7 @@ You can simply migrate by search/replace these class/selector names.
161164

162165
The package structure also changes. The root directory now contains **esm** code (ES5 code with ES2015 modules).
163166

164-
**A CommonJS compatible format and TS are not part of the package any more!
167+
**A CommonJS compatible format and TS are not part of the package any more!
165168
This change aligns with structure of the @angular packages.**
166169

167170
The styling of the maps is now more intuitive.
@@ -541,17 +544,17 @@ New:
541544
import {SebmGoogleMap} from 'angular2-google-maps/directives/google-map';
542545
```
543546

544-
* The module name has changed. So you have to change your import path.
545-
old: `angular2_google_maps/angular2_google_maps`
547+
* The module name has changed. So you have to change your import path.
548+
old: `angular2_google_maps/angular2_google_maps`
546549
new: `angular2-google-maps/core`
547550
* ES5 files that can be consumed using CommonJS are now in the root directory (old path was `/cjs/angular2_google_maps`)
548551
* The ES6 files directory has changed:
549-
Old dir: `/es6/angular2_google_maps`
552+
Old dir: `/es6/angular2_google_maps`
550553
New dir: `/es6`
551-
* The TypeScript files directory has changed:
552-
Old dir: `/ts/angular2_google_maps`
554+
* The TypeScript files directory has changed:
555+
Old dir: `/ts/angular2_google_maps`
553556
New dir: `/ts`
554-
* The `/typings` directory with bundled typings was deleted.
557+
* The `/typings` directory with bundled typings was deleted.
555558
(Typings are now in the root directory seperated by file)
556559

557560

‎docs/content/guides/getting-started.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If you just want to play with AGM and don't want to set up a full project with N
1818

1919
There's also a really great video tutorial that follows exactly this guide. So if you prefer videos, we recommend watching this tutorial:
2020

21-
[![Google Maps & Angular | ANGULAR SNIPPETS](http://img.youtube.com/vi/lApggVS0icc/0.jpg)](http://www.youtube.com/watch?v=lApggVS0icc "")
21+
[![Google Maps & Angular | ANGULAR SNIPPETS](https://img.youtube.com/vi/lApggVS0icc/0.jpg)](https://www.youtube.com/watch?v=lApggVS0icc "")
2222

2323
## Setting up a basic project structure
2424

@@ -56,7 +56,7 @@ npm install @agm/core --save
5656

5757
### Setup @NgModule
5858

59-
Open `src/app/app.module.ts` and import the `AgmCoreModule`.
59+
Open `src/app/app.module.ts` and import the `AgmCoreModule`.
6060
**You neeed to provide a Google Maps API key to be able to see a Map. Get an API key [here](https://developers.google.com/maps/documentation/javascript/get-api-key?hl=en#key).**
6161

6262
```typescript
@@ -85,7 +85,7 @@ export class AppModule {}
8585
```
8686

8787
### Extending the app component
88-
Angular CLI already created an app component the we'll now use to create our first google map.
88+
Angular CLI already created an app component the we'll now use to create our first google map.
8989
Open the file `src/app/app.component.ts` and modify it like below:
9090

9191
```typescript

‎package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@agm/_dev",
33
"private": true,
4-
"version": "1.0.0-beta.5",
4+
"version": "1.0.0-beta.6",
55
"description": "Angular components for Google Maps",
66
"repository": {
77
"type": "git",
@@ -49,34 +49,34 @@
4949
},
5050
"homepage": "https://angular-maps.com",
5151
"peerDependencies": {
52-
"@angular/common": "^5.0.0 || ^6.0.0",
53-
"@angular/core": "^5.0.0 || ^6.0.0"
52+
"@angular/common": "^6.0.0 || ^7.0.0",
53+
"@angular/core": "^6.0.0 || ^7.0.0"
5454
},
5555
"devDependencies": {
56-
"@angular/animations": "^6.0.0",
57-
"@angular/common": "^6.0.0",
58-
"@angular/compiler": "^6.0.0",
59-
"@angular/compiler-cli": "^6.0.0",
60-
"@angular/core": "^6.0.0",
61-
"@angular/platform-browser": "^6.0.0",
62-
"@angular/platform-browser-dynamic": "^6.0.0",
63-
"@angular/platform-server": "^6.0.0",
64-
"@angular/tsc-wrapped": "4.4.6",
56+
"@angular/animations": "^7.0.0",
57+
"@angular/common": "^7.0.0",
58+
"@angular/compiler": "^7.0.0",
59+
"@angular/compiler-cli": "^7.0.0",
60+
"@angular/core": "^7.0.0",
61+
"@angular/http": "^7.0.0",
62+
"@angular/platform-browser": "^7.0.0",
63+
"@angular/platform-browser-dynamic": "^7.0.0",
64+
"@angular/platform-server": "^7.0.0",
6565
"@compodoc/compodoc": "^1.0.0-beta.9",
66-
"@ngtools/webpack": "6.0.0",
66+
"@ngtools/webpack": "^7.2.1",
6767
"@types/jest": "^23.0.0",
6868
"angular2-template-loader": "^0.6.2",
69-
"awesome-typescript-loader": "^5.0.0",
69+
"awesome-typescript-loader": "^5.2.1",
7070
"clang-format": "1.2.3",
71-
"codelyzer": "^4.3.0",
71+
"codelyzer": "^4.5.0",
7272
"conventional-changelog": "^1.1.0",
7373
"copy-webpack-plugin": "^4.0.1",
7474
"copyfiles": "^2.0.0",
7575
"glob": "^7.1.2",
7676
"html-webpack-plugin": "^3.2.0",
7777
"istanbul-instrumenter-loader": "^3.0.1",
7878
"jasmine-core": "3.1.0",
79-
"jest": "^23.1.0",
79+
"jest": "^23.6.0",
8080
"jest-zone-patch": "^0.0.8",
8181
"js-marker-clusterer": "^1.0.0",
8282
"karma-chrome-launcher": "2.2.0",
@@ -89,19 +89,19 @@
8989
"rxjs": "^6.1.0",
9090
"snazzy-info-window": "^1.1.1",
9191
"ts-helpers": "^1.1.2",
92-
"ts-jest": "^22.4.6",
92+
"ts-jest": "^23.10.5",
9393
"ts-loader": "^4.3.0",
9494
"tslint": "^5.8.0",
9595
"tslint-loader": "^3.4.3",
96-
"typescript": "~2.7.2",
96+
"typescript": "^3.2.2",
9797
"webpack": "4.8.0",
9898
"zone.js": "^0.8.26"
9999
},
100100
"jspm": {
101101
"jspmNodeConversion": false,
102102
"dependencies": {
103-
"@angular/common": "^5.0.0 || ^6.0.0",
104-
"@angular/core": "^5.0.0 || ^6.0.0"
103+
"@angular/common": "^6.0.0 || ^7.0.0",
104+
"@angular/core": "^6.0.0 || ^7.0.0"
105105
}
106106
}
107107
}

‎packages/core/services/managers/rectangle-manager.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {Injectable, NgZone} from '@angular/core';
22

3-
import {Observable} from 'rxjs';
4-
import {Observer} from 'rxjs';
3+
import {Observable, Observer} from 'rxjs';
54

65
import {AgmRectangle} from '../../directives/rectangle';
76
import {GoogleMapsAPIWrapper} from '../google-maps-api-wrapper';

‎packages/js-marker-clusterer/package.tpl.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"url": "https://github.com/SebastianM/angular-google-maps/issues"
2121
},
2222
"peerDependencies": {
23-
"@angular/core": "^5.0.0 || ^6.0.0",
24-
"@agm/core": "^1.0.0-beta.3",
23+
"@angular/core": "^6.0.0 || ^7.0.0",
24+
"@agm/core": "^1.0.0-beta.6",
2525
"js-marker-clusterer": "^1.0.0"
2626
},
2727
"homepage": "https://github.com/SebastianM/angular-google-maps#readme"

‎packages/snazzy-info-window/package.tpl.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"url": "https://github.com/SebastianM/angular-google-maps/issues"
2222
},
2323
"peerDependencies": {
24-
"@angular/core": "^5.0.0 || ^6.0.0",
25-
"@agm/core": "^1.0.0-beta.3",
24+
"@angular/core": "^6.0.0 || ^7.0.0",
25+
"@agm/core": "^1.0.0-beta.6",
2626
"snazzy-info-window": "^1.1.0"
2727
},
2828
"homepage": "https://github.com/SebastianM/angular-google-maps#readme"

0 commit comments

Comments
 (0)