changed agm cluster and updated agm dependencies

the changelog didnt mention this properly to do but as seen in change 7982bfbcf0 the module was renamed and needed changing.
This commit is contained in:
Finn Kempers 2020-07-29 14:32:51 +01:00
parent 7c651e1522
commit 611dbc4bac
4 changed files with 27 additions and 15 deletions

View file

@ -17,7 +17,12 @@
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets"
"src/assets",
{"input":
"./node_modules/@google/markerclustererplus/images",
"glob": "*",
"output": "/images"
},
],
"styles": [
"src/scss/style.scss"

27
package-lock.json generated
View file

@ -19,12 +19,19 @@
}
}
},
"@agm/js-marker-clusterer": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@agm/js-marker-clusterer/-/js-marker-clusterer-1.1.0.tgz",
"integrity": "sha512-BLgzmYlRP8ApWwyt6N8/jlHESn4LQVWCGFGBu+7gR6hZHqpxyeU9p0ptNEGBORuyZE5O3r5N4yTJFLtvYwjA4g==",
"@agm/markerclusterer": {
"version": "3.0.0-beta.0",
"resolved": "https://registry.npmjs.org/@agm/markerclusterer/-/markerclusterer-3.0.0-beta.0.tgz",
"integrity": "sha512-abJHZsLKFH8AkBgVCQ9GqN17CI1IZEW6pTzQxeihK24F+n0rxeptJ0mFETNA+l844GziEJ3jmkygOQ4AqpCWog==",
"requires": {
"tslib": "^1.9.0"
"tslib": "^2.0.0"
},
"dependencies": {
"tslib": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
"integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g=="
}
}
},
"@angular-devkit/architect": {
@ -2965,6 +2972,11 @@
"resolved": "https://registry.npmjs.org/@coreui/icons/-/icons-0.3.0.tgz",
"integrity": "sha512-RbBi5K5hUA8LUI9mM/i1BTaLjlyoS6kHwKbxWsH62+/j9L9WF8gAiJUhrNjMt1br8TY9RLeolyQys0E9480fIg=="
},
"@google/markerclustererplus": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@google/markerclustererplus/-/markerclustererplus-5.0.4.tgz",
"integrity": "sha512-D3RnpzzLVBVggv84t+kkQXL5+2bSyhlGxDckAtbDpVXsLyfawKUyropkAQ9oYMXZh7h4+2Rkdkxaq8kDME6Jqg=="
},
"@istanbuljs/schema": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
@ -9531,11 +9543,6 @@
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"js-marker-clusterer": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/js-marker-clusterer/-/js-marker-clusterer-1.0.0.tgz",
"integrity": "sha1-yUvoWuiJaBnlHBMfiR3StVVY3Rc="
},
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

View file

@ -22,8 +22,8 @@
},
"private": true,
"dependencies": {
"@agm/core": "3.0.0-beta.0",
"@agm/js-marker-clusterer": "1.1.0",
"@agm/core": "^3.0.0-beta.0",
"@agm/markerclusterer": "^3.0.0-beta.0",
"@angular/common": "9.1.12",
"@angular/compiler": "9.1.12",
"@angular/core": "9.1.12",
@ -34,6 +34,7 @@
"@angular/upgrade": "9.1.12",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
"@coreui/icons": "0.3.0",
"@google/markerclustererplus": "^5.0.4",
"ajv": "^6.10.0",
"ajv-keywords": "^3.4.0",
"angular2-datetimepicker": "^1.1.1",
@ -44,7 +45,6 @@
"devextreme-angular": "^19.1.4",
"jasmine": "^3.4.0",
"jquery": "^3.5.1",
"js-marker-clusterer": "1.0.0",
"jszip": "^3.2.2",
"luxon": "^1.16.1",
"moment": "^2.24.0",

View file

@ -5,7 +5,7 @@ import { ChartsModule } from 'ng2-charts';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { NgxPaginationModule } from 'ngx-pagination';
import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core';
import { AgmJsMarkerClustererModule } from '@agm/js-marker-clusterer';
import { AgmJsMarkerClustererModule } from '@agm/markerclusterer';
import { ModalModule } from 'ngx-bootstrap/modal';
import { CurrencyPipe } from '@angular/common';