FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good
Details

Browse Source
This commit is contained in:
Peter Bastiani 2020-03-26 14:06:32 +01:00
commit 8db1edb262
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -3477,9 +3477,9 @@
} }
}, },
"@farmmaps/common": { "@farmmaps/common": {
"version": "0.0.1-prerelease.206", "version": "0.0.1-prerelease.226",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.206.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.226.tgz",
"integrity": "sha512-dATz9F1/N3VU2/r7a4IHKGeTJdflwoRR855aRW97vhQDUpCl8QFE8tEQetTlPbbWOIDsm6HRDRhxY+A0iR/7Cw==", "integrity": "sha512-DEIV1yt7FQtsOrafPvLaBFIb4qY7N+H/DUKZOg/TieoiQjENFMVwmIo9opElXZvu4gr80GARdXvazY6acTm49Q==",
"requires": { "requires": {
"angular-oauth2-oidc": "^8.0.2", "angular-oauth2-oidc": "^8.0.2",
"ngx-uploadx": "^3.3.2", "ngx-uploadx": "^3.3.2",
@ -3487,9 +3487,9 @@
} }
}, },
"@farmmaps/common-map": { "@farmmaps/common-map": {
"version": "0.0.1-prerelease.206", "version": "0.0.1-prerelease.226",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.206.tgz", "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.226.tgz",
"integrity": "sha512-lc7T6DpSx3fVbU3uMwxx7tX3/xi1JKS4CY4Vzc5kFSrzPZE/Rw0/fsoic7drcS2H09OKwChr0UKAmk5jcVq+uA==", "integrity": "sha512-HtQ1gNiRJZZjrQhY/eLJQDsIedA4Dfrqbxzdnl/w2woBuBOW6nKbW7FjbNLwjEPn5KMwtgygKsdSsjWXrPePKA==",
"requires": { "requires": {
"ngx-openlayers": "1.0.0-next.13", "ngx-openlayers": "1.0.0-next.13",
"ol": "6.1.1", "ol": "6.1.1",

6
package.json
View File

@ -20,12 +20,14 @@
"@angular/platform-browser-dynamic": "~8.2.14", "@angular/platform-browser-dynamic": "~8.2.14",
"@angular/router": "~8.2.14", "@angular/router": "~8.2.14",
"@aspnet/signalr": "^1.1.4", "@aspnet/signalr": "^1.1.4",
"@farmmaps/common": ">=0.0.1-prerelease.206 <0.0.1", "@farmmaps/common": ">=0.0.1-prerelease.226 <0.0.1",
"@farmmaps/common-map": ">=0.0.1-prerelease.206 <0.0.1", "@farmmaps/common-map": ">=0.0.1-prerelease.226 <0.0.1",
"@ng-bootstrap/ng-bootstrap": "^4.2.1", "@ng-bootstrap/ng-bootstrap": "^4.2.1",
"@ngrx/effects": "^8.6.0", "@ngrx/effects": "^8.6.0",
"@ngrx/router-store": "^8.6.0", "@ngrx/router-store": "^8.6.0",
"@ngrx/store": "^8.6.0", "@ngrx/store": "^8.6.0",
"ngx-uploadx": "^3.3.4",
"angular-oauth2-oidc": "^8.0.2",
"bootstrap": "^4.4.1", "bootstrap": "^4.4.1",
"core-js": "^2.6.11", "core-js": "^2.6.11",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",

8
projects/common/package.json
View File

@ -4,10 +4,6 @@
"publishConfig": { "publishConfig": {
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"dependencies": {
"angular-oauth2-oidc": "^8.0.2",
"ngx-uploadx": "^3.3.2"
},
"peerDependencies": { "peerDependencies": {
"@ng-bootstrap/ng-bootstrap": "^4.2.1", "@ng-bootstrap/ng-bootstrap": "^4.2.1",
"@angular/common": "^8.2.0", "@angular/common": "^8.2.0",
@ -19,6 +15,8 @@
"tassign": "^1.0.0", "tassign": "^1.0.0",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"@aspnet/signalr": "^1.1.4", "@aspnet/signalr": "^1.1.4",
"font-awesome": "^4.7.0" "font-awesome": "^4.7.0",
"ngx-uploadx": "^3.3.2",
"angular-oauth2-oidc": "^8.0.2"
} }
} }