Merge branch 'develop'
Some checks reported errors
FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit

This commit is contained in:
Peter Bastiani 2023-11-16 17:37:13 +01:00
commit d074cd81cf
2 changed files with 72 additions and 60 deletions

122
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "3.5.0", "version": "4.0.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "3.5.0", "version": "4.0.0",
"dependencies": { "dependencies": {
"@angular-eslint/eslint-plugin": "^15.2.1", "@angular-eslint/eslint-plugin": "^15.2.1",
"@angular/animations": "^14.1.3", "@angular/animations": "^14.1.3",
@ -84,6 +84,62 @@
"typescript": "~4.6.4" "typescript": "~4.6.4"
} }
}, },
"dist/common": {
"name": "@farmmaps/common",
"version": "3.5.1-prerelease.2385",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/common": ">=14.0.0",
"@angular/core": ">=14.0.0",
"@angular/forms": ">=14.0.0",
"@microsoft/signalr": ">=3.1.3",
"@ng-bootstrap/ng-bootstrap": ">=10.0.0",
"@ngrx/effects": ">=14.0.0",
"@ngrx/router-store": ">=14.0.0",
"@ngrx/store": ">=14.0.0",
"angular-oauth2-oidc": ">=13.0.0",
"bootstrap": ">=4.4.1",
"moment": ">=2.27.0",
"ngx-avatar": ">=4.1.0",
"ngx-clipboard": ">=14.0.1",
"ngx-image-cropper": ">=3.3.5",
"ngx-uploadx": ">=5.1.0",
"tassign": ">=1.0.0"
}
},
"dist/common-map": {
"name": "@farmmaps/common-map",
"version": "3.5.1-prerelease.2385",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/core": ">=14.0.0",
"@ngrx/effects": ">=14.0.0",
"@ngrx/router-store": ">=14.0.0",
"@ngrx/store": ">=14.0.0",
"ngrx-store-localstorage": ">=14.0.0",
"ngx-openlayers": ">=1.0.0-next.19",
"ol": ">=6.8.1",
"tassign": ">=1.0.0"
}
},
"dist/common-map3d": {
"name": "@farmmaps/common-map3d",
"version": "3.5.1-prerelease.2385",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/common": ">=14.0.0",
"@angular/core": ">=14.0.0",
"cesium": ">=1.82.1",
"ngx-openlayers": "1.0.0-next.19",
"ol-cesium": ">=2.13.0"
}
},
"node_modules/@adobe/css-tools": { "node_modules/@adobe/css-tools": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz", "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz",
@ -2971,60 +3027,16 @@
} }
}, },
"node_modules/@farmmaps/common": { "node_modules/@farmmaps/common": {
"version": "2.0.0", "resolved": "dist/common",
"resolved": "file:dist/common", "link": true
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/common": ">=14.0.0",
"@angular/core": ">=14.0.0",
"@angular/forms": ">=14.0.0",
"@microsoft/signalr": ">=3.1.3",
"@ng-bootstrap/ng-bootstrap": ">=10.0.0",
"@ngrx/effects": ">=14.0.0",
"@ngrx/router-store": ">=14.0.0",
"@ngrx/store": ">=14.0.0",
"angular-oauth2-oidc": ">=13.0.0",
"bootstrap": ">=4.4.1",
"moment": ">=2.27.0",
"ngx-avatar": ">=4.1.0",
"ngx-clipboard": ">=14.0.1",
"ngx-image-cropper": ">=3.3.5",
"ngx-uploadx": ">=5.1.0",
"tassign": ">=1.0.0"
}
}, },
"node_modules/@farmmaps/common-map": { "node_modules/@farmmaps/common-map": {
"version": "2.0.0", "resolved": "dist/common-map",
"resolved": "file:dist/common-map", "link": true
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/core": ">=14.0.0",
"@ngrx/effects": ">=14.0.0",
"@ngrx/router-store": ">=14.0.0",
"@ngrx/store": ">=14.0.0",
"ngrx-store-localstorage": ">=14.0.0",
"ngx-openlayers": ">=1.0.0-next.19",
"ol": ">=6.8.1",
"tassign": ">=1.0.0"
}
}, },
"node_modules/@farmmaps/common-map3d": { "node_modules/@farmmaps/common-map3d": {
"version": "2.0.0", "resolved": "dist/common-map3d",
"resolved": "file:dist/common-map3d", "link": true
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/common": ">=14.0.0",
"@angular/core": ">=14.0.0",
"cesium": ">=1.82.1",
"ngx-openlayers": "1.0.0-next.19",
"ol-cesium": ">=2.13.0"
}
}, },
"node_modules/@gar/promisify": { "node_modules/@gar/promisify": {
"version": "1.1.3", "version": "1.1.3",
@ -19071,19 +19083,19 @@
"dev": true "dev": true
}, },
"@farmmaps/common": { "@farmmaps/common": {
"version": "2.0.0", "version": "file:dist/common",
"requires": { "requires": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
} }
}, },
"@farmmaps/common-map": { "@farmmaps/common-map": {
"version": "2.0.0", "version": "file:dist/common-map",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@farmmaps/common-map3d": { "@farmmaps/common-map3d": {
"version": "2.0.0", "version": "file:dist/common-map3d",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }

View File

@ -1,7 +1,7 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "3.5.1", "version": "4.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
@ -10,7 +10,7 @@
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^14.1.3", "@angular/animations": "^14.1.3",
"@angular/common": "^14.1.3", "@angular/common": "^14.1.3",
"@angular/compiler": "^14.1.3", "@angular/compiler": "^14.1.3",
@ -56,7 +56,7 @@
"util": "^0.12.4", "util": "^0.12.4",
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "^14", "@angular-builders/custom-webpack": "^14",
"@angular-devkit/build-angular": "^14.1.3", "@angular-devkit/build-angular": "^14.1.3",
"@angular/cli": "^14.1.3", "@angular/cli": "^14.1.3",
@ -86,4 +86,4 @@
"ts-node": "^8.8.1", "ts-node": "^8.8.1",
"typescript": "~4.6.4" "typescript": "~4.6.4"
} }
} }