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

Aw5739 Update to Angular v16

Browse Source
This commit is contained in:
Peter Bastiani 2023-12-29 14:10:07 +01:00
parent 18381975ef
commit 56be829faa
16 changed files with 5570 additions and 7524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12858
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

58
package.json
View File

@ -11,26 +11,26 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^15.2.10",
"@angular/common": "^15.2.10",
"@angular/compiler": "^15.2.10",
"@angular/core": "^15.2.10",
"@angular-eslint/eslint-plugin": "^15.2.1", "@angular-eslint/eslint-plugin": "^15.2.1",
"@angular/forms": "^15.2.10", "@angular/animations": "^16.2.12",
"@angular/platform-browser": "^15.2.10", "@angular/common": "^16.2.12",
"@angular/platform-browser-dynamic": "^15.2.10", "@angular/compiler": "^16.2.12",
"@angular/router": "^15.2.10", "@angular/core": "^16.2.12",
"@farmmaps/common": "4.2.0-prerelease.2410", "@angular/forms": "^16.2.12",
"@farmmaps/common-map": "4.2.0-prerelease.2410", "@angular/platform-browser": "^16.2.12",
"@farmmaps/components": "4.0.0-prerelease.2025", "@angular/platform-browser-dynamic": "^16.2.12",
"ngx-openlayers": "1.0.0-next.19", "@angular/router": "^16.2.12",
"@farmmaps/common": "file:dist/common",
"@farmmaps/common-map": "file:dist/common-map",
"@farmmaps/common-map3d": "file:dist/common-map3d",
"ngx-openlayers": "file:dist/ngx-openlayers",
"@microsoft/signalr": "^3.1.16", "@microsoft/signalr": "^3.1.16",
"@ng-bootstrap/ng-bootstrap": "^13.0.0", "@ng-bootstrap/ng-bootstrap": "^15.0.0",
"@ngrx/effects": "^14", "@ngrx/effects": "^16",
"@ngrx/router-store": "^14", "@ngrx/router-store": "^16",
"@ngrx/store": "^14", "@ngrx/store": "^16",
"@popperjs/core": "^2.11.6", "@popperjs/core": "^2.11.6",
"angular-oauth2-oidc": "^13", "angular-oauth2-oidc": "^16",
"assert": "^2.0.0", "assert": "^2.0.0",
"bootstrap": "^5.2.0", "bootstrap": "^5.2.0",
"browserify-zlib": "^0.2.0", "browserify-zlib": "^0.2.0",
@ -39,10 +39,10 @@
"core-js": "^2.6.12", "core-js": "^2.6.12",
"https-browserify": "^1.0.0", "https-browserify": "^1.0.0",
"moment": "^2.29.4", "moment": "^2.29.4",
"ngrx-store-localstorage": "^14", "ngrx-store-localstorage": "^16",
"ngx-avatar": "^4.1.0", "ngx-avatars": "^1.7.0",
"ngx-clipboard": "^14.0.1", "ngx-clipboard": "^15.0.1",
"ngx-image-cropper": "^3.3.5", "ngx-image-cropper": "^6.0.0",
"ngx-uploadx": "^5.2.0", "ngx-uploadx": "^5.2.0",
"ol": "~6.3.1", "ol": "~6.3.1",
"olcs": "^2.13.1", "olcs": "^2.13.1",
@ -54,15 +54,15 @@
"tslib": "^2.4.0", "tslib": "^2.4.0",
"url": "^0.11.0", "url": "^0.11.0",
"util": "^0.12.4", "util": "^0.12.4",
"zone.js": "~0.11.4" "zone.js": "~0.13.3"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "^14", "@angular-builders/custom-webpack": "^16",
"@angular-devkit/build-angular": "^15.2.10", "@angular-devkit/build-angular": "^16.2.11",
"@angular/cli": "^15.2.10", "@angular/cli": "^16.2.11",
"@angular/compiler-cli": "^15.2.10", "@angular/compiler-cli": "^16.2.12",
"@angular/language-service": "^15.2.10", "@angular/language-service": "^16.2.12",
"@angular/localize": "^15.2.10", "@angular/localize": "^16.2.12",
"@types/arcgis-rest-api": "^10.4.5", "@types/arcgis-rest-api": "^10.4.5",
"@types/jasmine": "~2.8.8", "@types/jasmine": "~2.8.8",
"@types/jasminewd2": "^2.0.9", "@types/jasminewd2": "^2.0.9",
@ -81,7 +81,7 @@
"karma-coverage-istanbul-reporter": "^3.0.3", "karma-coverage-istanbul-reporter": "^3.0.3",
"karma-jasmine": "^5.1.0", "karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.0.0", "karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^15.2.2", "ng-packagr": "^16.2.3",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"ts-node": "^8.8.1", "ts-node": "^8.8.1",
"typescript": "~4.9.5" "typescript": "~4.9.5"

38
projects/common-map/package-lock.json generated
View File

@ -8,23 +8,45 @@
"name": "@farmmaps/common-map", "name": "@farmmaps/common-map",
"version": "2.0.0", "version": "2.0.0",
"dependencies": { "dependencies": {
"ngx-avatars": "^1.6.1",
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": ">=14.0.0", "@angular/core": ">=16.0.0",
"@ngrx/effects": ">=14.0.0", "@ngrx/effects": ">=16.0.0",
"@ngrx/router-store": ">=14.0.0", "@ngrx/router-store": ">=16.0.0",
"@ngrx/store": ">=14.0.0", "@ngrx/store": ">=16.0.0",
"ngrx-store-localstorage": ">=14.0.0", "ngrx-store-localstorage": ">=16.0.0",
"ngx-openlayers": "file:dist/ngx-openlayers", "ngx-openlayers": "file:dist/ngx-openlayers",
"ol": ">=6.8.1", "ol": ">=6.8.1",
"tassign": ">=1.0.0" "tassign": ">=1.0.0"
} }
}, },
"node_modules/ngx-avatars": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/ngx-avatars/-/ngx-avatars-1.7.0.tgz",
"integrity": "sha512-wD1mDx809QOhsh33P6DsgXc58SQ1PjSN0Xq9FzkXmynHDCmboHyg4DjD4aL+GQKcn5n0Lg/AtRbhWvVb7Xvd8A==",
"dependencies": {
"ts-md5": "^1.3.1",
"tslib": "^2.6.2"
},
"peerDependencies": {
"@angular/common": "^17.0.0",
"@angular/core": "^17.0.0"
}
},
"node_modules/ts-md5": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.3.1.tgz",
"integrity": "sha512-DiwiXfwvcTeZ5wCE0z+2A9EseZsztaiZtGrtSaY5JOD7ekPnR/GoIVD5gXZAlK9Na9Kvpo9Waz5rW64WKAWApg==",
"engines": {
"node": ">=12"
}
},
"node_modules/tslib": { "node_modules/tslib": {
"version": "2.0.1", "version": "2.6.2",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
} }
} }
} }

12
projects/common-map/package.json
View File

@ -8,13 +8,13 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": ">=15.0.0", "@angular/core": ">=16.0.0",
"ngrx-store-localstorage": ">=15.0.0", "ngrx-store-localstorage": ">=16.0.0",
"@ngrx/effects": ">=15.0.0", "@ngrx/effects": ">=16.0.0",
"@ngrx/router-store":">=15.0.0", "@ngrx/router-store":">=16.0.0",
"@ngrx/store":">=15.0.0", "@ngrx/store":">=16.0.0",
"tassign": ">=1.0.0", "tassign": ">=1.0.0",
"ngx-openlayers": "4.2.0-prerelease.2414", "ngx-openlayers": "file:dist/ngx-openlayers",
"ol": ">=6.8.1" "ol": ">=6.8.1"
} }
} }

6
projects/common-map/tsconfig.lib.prod.json
View File

@ -22,7 +22,8 @@
"node_modules/@angular/*" "node_modules/@angular/*"
] ]
} },
"preserveSymlinks": true,
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"skipTemplateCodegen": true, "skipTemplateCodegen": true,
@ -30,7 +31,8 @@
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,
"strictInjectionParameters": true, "strictInjectionParameters": true,
"enableResourceInlining": true, "enableResourceInlining": true,
"compilationMode": "partial" "compilationMode": "partial",
"preserveSymlinks": true,
}, },
"exclude": [ "exclude": [
"src/test.ts", "src/test.ts",

6
projects/common-map3d/package-lock.json generated
View File

@ -11,10 +11,10 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": ">=14.0.0", "@angular/common": ">=16.0.0",
"@angular/core": ">=14.0.0", "@angular/core": ">=16.0.0",
"cesium": ">=1.82.1", "cesium": ">=1.82.1",
"ngx-openlayers": "file:dist/ngx-openlayers", "ngx-openlayers": "4.2.0-prerelease.2414",
"ol-cesium": ">=2.13.0" "ol-cesium": ">=2.13.0"
} }
}, },

4
projects/common-map3d/package.json
View File

@ -5,8 +5,8 @@
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": ">=15.0.0", "@angular/common": ">=16.0.0",
"@angular/core": ">=15.0.0", "@angular/core": ">=16.0.0",
"ngx-openlayers": "4.2.0-prerelease.2414", "ngx-openlayers": "4.2.0-prerelease.2414",
"cesium": ">=1.82.1", "cesium": ">=1.82.1",
"ol-cesium": ">=2.13.0" "ol-cesium": ">=2.13.0"

20
projects/common/package-lock.json generated
View File

@ -8,20 +8,20 @@
"name": "@farmmaps/common", "name": "@farmmaps/common",
"version": "2.0.0", "version": "2.0.0",
"peerDependencies": { "peerDependencies": {
"@angular/common": ">=14.0.0", "@angular/common": ">=16.0.0",
"@angular/core": ">=14.0.0", "@angular/core": ">=16.0.0",
"@angular/forms": ">=14.0.0", "@angular/forms": ">=16.0.0",
"@microsoft/signalr": ">=3.1.3", "@microsoft/signalr": ">=3.1.3",
"@ng-bootstrap/ng-bootstrap": ">=10.0.0", "@ng-bootstrap/ng-bootstrap": ">=16.0.0",
"@ngrx/effects": ">=14.0.0", "@ngrx/effects": ">=16.0.0",
"@ngrx/router-store": ">=14.0.0", "@ngrx/router-store": ">=16.0.0",
"@ngrx/store": ">=14.0.0", "@ngrx/store": ">=16.0.0",
"angular-oauth2-oidc": ">=13.0.0", "angular-oauth2-oidc": ">=13.0.0",
"bootstrap": ">=4.4.1", "bootstrap": ">=4.4.1",
"moment": ">=2.27.0", "moment": ">=2.27.0",
"ngx-avatar": ">=4.1.0", "ngx-avatars": "^1.6.1",
"ngx-clipboard": ">=14.0.1", "ngx-clipboard": "^15.0.1",
"ngx-image-cropper": ">=3.3.5", "ngx-image-cropper": "^6.0.0",
"ngx-uploadx": ">=5.1.0", "ngx-uploadx": ">=5.1.0",
"tassign": ">=1.0.0" "tassign": ">=1.0.0"
} }

20
projects/common/package.json
View File

@ -5,21 +5,21 @@
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@ng-bootstrap/ng-bootstrap": ">=10.0.0", "@ng-bootstrap/ng-bootstrap": ">=16.0.0",
"@angular/common": ">=15.0.0", "@angular/common": ">=16.0.0",
"@angular/core": ">=15.0.0", "@angular/core": ">=16.0.0",
"@angular/forms": ">=15.0.0", "@angular/forms": ">=16.0.0",
"@ngrx/effects": ">=15.0.0", "@ngrx/effects": ">=16.0.0",
"@ngrx/router-store": ">=15.0.0", "@ngrx/router-store": ">=16.0.0",
"@ngrx/store": ">=15.0.0", "@ngrx/store": ">=16.0.0",
"tassign": ">=1.0.0", "tassign": ">=1.0.0",
"bootstrap": ">=4.4.1", "bootstrap": ">=4.4.1",
"@microsoft/signalr": ">=3.1.3", "@microsoft/signalr": ">=3.1.3",
"ngx-uploadx": ">=5.1.0", "ngx-uploadx": ">=5.1.0",
"angular-oauth2-oidc": ">=13.0.0", "angular-oauth2-oidc": ">=13.0.0",
"moment": ">=2.27.0", "moment": ">=2.27.0",
"ngx-avatar": ">=4.1.0", "ngx-avatars": "^1.6.1",
"ngx-image-cropper": ">=3.3.5", "ngx-image-cropper": "^6.0.0",
"ngx-clipboard": ">=14.0.1" "ngx-clipboard": "^15.0.1"
} }
} }

2
projects/common/src/fm/common.module.ts
View File

@ -68,7 +68,7 @@ import { BackButtonComponent } from './components/back-button/back-button.compon
import { EditImageModalComponent } from './components/edit-image-modal/edit-image-modal.component'; import { EditImageModalComponent } from './components/edit-image-modal/edit-image-modal.component';
import { AvatarComponent } from './components/avatar/avatar.component'; import { AvatarComponent } from './components/avatar/avatar.component';
import { ItemLinkComponent } from './components/item-link/item-link.component'; import { ItemLinkComponent } from './components/item-link/item-link.component';
import { AvatarModule } from 'ngx-avatar'; import { AvatarModule } from 'ngx-avatars';
import { ImageCropperModule } from 'ngx-image-cropper'; import { ImageCropperModule } from 'ngx-image-cropper';
export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage'); export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');

4
projects/common/src/fm/components/auth-callback/auth-callback.guard.ts
View File

@ -1,4 +1,4 @@
import { Router, CanActivate } from '@angular/router'; import { Router } from '@angular/router';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { OAuthService } from 'angular-oauth2-oidc'; import { OAuthService } from 'angular-oauth2-oidc';
import { } from '@angular/router'; import { } from '@angular/router';
@ -6,7 +6,7 @@ import { } from '@angular/router';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class AuthCallbackGuard implements CanActivate { export class AuthCallbackGuard {
constructor(private router$: Router,private oauthService$:OAuthService) {} constructor(private router$: Router,private oauthService$:OAuthService) {}

4
projects/common/src/fm/components/avatar/avatar.component.html
View File

@ -1,10 +1,10 @@
<span class="avatar-container" [title]="name"> <span class="avatar-container" [title]="name">
<ngx-avatar <ngx-avatars
class="farmmaps-avatar" class="farmmaps-avatar"
[src]="src" [src]="src"
[name]="name" [name]="name"
[size]="size" [size]="size"
[round]='true' [round]='true'
> >
</ngx-avatar> </ngx-avatars>
</span> </span>

10
projects/common/src/fm/services/auth-guard.service.ts
View File

@ -1,11 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { import { Router, Route, ActivatedRouteSnapshot, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
CanActivate, Router, CanLoad, Route, CanActivateChild ,
ActivatedRouteSnapshot,
RouterStateSnapshot,
UrlSegment,
UrlTree
} from '@angular/router';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
@ -19,7 +13,7 @@ import * as appCommonReducer from '../reducers/app-common.reducer';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class AuthGuard implements CanActivate, CanLoad, CanActivateChild { export class AuthGuard {
constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { } constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { }

4
projects/common/src/fm/services/full-screen-guard.service.ts
View File

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { CanActivate, CanActivateChild, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router'; import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class FullScreenGuard implements CanActivate,CanActivateChild { export class FullScreenGuard {
private loginDispatched = false; private loginDispatched = false;
constructor(private store: Store<appCommonReducer.State> ) { } constructor(private store: Store<appCommonReducer.State> ) { }

4
projects/common/src/fm/services/nav-bar-guard.service.ts
View File

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { CanLoad, Route, CanActivate, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; import { Route, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class NavBarGuard implements CanActivate { export class NavBarGuard {
private loginDispatched = false; private loginDispatched = false;
constructor(private store: Store<appCommonReducer.State>) { } constructor(private store: Store<appCommonReducer.State>) { }

4
projects/common/src/fm/services/package-guard.service.ts
View File

@ -1,11 +1,11 @@
import {Injectable} from '@angular/core'; import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot} from '@angular/router'; import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import {PackageService} from './package.service'; import {PackageService} from './package.service';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class PackageGuard implements CanActivate { export class PackageGuard {
constructor(private packageService: PackageService) { } constructor(private packageService: PackageService) { }