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

Update to angular 13

Browse Source
This commit is contained in:
Willem Dantuma 2022-08-19 20:39:00 +02:00
parent 2f165b4b48
commit 897ac3dab5
11 changed files with 4908 additions and 7575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -33,6 +33,7 @@ speed-measure-plugin.json
.history/* .history/*
# misc # misc
/.angular/cache
/.sass-cache /.sass-cache
/connect.lock /connect.lock
/coverage /coverage

57
angular.json
View File

@ -148,18 +148,6 @@
"src/assets" "src/assets"
] ]
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
} }
} }
}, },
@ -179,15 +167,6 @@
"devServerTarget": "farmmaps-lib-app:serve:production" "devServerTarget": "farmmaps-lib-app:serve:production"
} }
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
} }
} }
}, },
@ -216,18 +195,6 @@
"tsConfig": "projects/common/tsconfig.spec.json", "tsConfig": "projects/common/tsconfig.spec.json",
"karmaConfig": "projects/common/karma.conf.js" "karmaConfig": "projects/common/karma.conf.js"
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/common/tsconfig.lib.json",
"projects/common/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
} }
} }
}, },
@ -256,18 +223,6 @@
"tsConfig": "projects/common-map/tsconfig.spec.json", "tsConfig": "projects/common-map/tsconfig.spec.json",
"karmaConfig": "projects/common-map/karma.conf.js" "karmaConfig": "projects/common-map/karma.conf.js"
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/common-map/tsconfig.lib.json",
"projects/common-map/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
} }
} }
}, },
@ -296,18 +251,6 @@
"tsConfig": "projects/common-map3d/tsconfig.spec.json", "tsConfig": "projects/common-map3d/tsconfig.spec.json",
"karmaConfig": "projects/common-map3d/karma.conf.js" "karmaConfig": "projects/common-map3d/karma.conf.js"
} }
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/common-map3d/tsconfig.lib.json",
"projects/common-map3d/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
} }
} }
} }

12109
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

44
package.json
View File

@ -11,28 +11,28 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~12.2.8", "@angular/animations": "~13.3.11",
"@angular/common": "~12.2.8", "@angular/common": "~13.3.11",
"@angular/compiler": "~12.2.8", "@angular/compiler": "~13.3.11",
"@angular/core": "~12.2.8", "@angular/core": "~13.3.11",
"@angular/forms": "~12.2.8", "@angular/forms": "~13.3.11",
"@angular/platform-browser": "~12.2.8", "@angular/platform-browser": "~13.3.11",
"@angular/platform-browser-dynamic": "~12.2.8", "@angular/platform-browser-dynamic": "~13.3.11",
"@angular/router": "~12.2.8", "@angular/router": "~13.3.11",
"@farmmaps/common": "file:dist/common", "@farmmaps/common": "file:dist/common",
"@farmmaps/common-map": "file:dist/common-map", "@farmmaps/common-map": "file:dist/common-map",
"@farmmaps/common-map3d": "file:dist/common-map3d", "@farmmaps/common-map3d": "file:dist/common-map3d",
"@microsoft/signalr": "^3.1.16", "@microsoft/signalr": "^3.1.16",
"@ng-bootstrap/ng-bootstrap": "^9.1.3", "@ng-bootstrap/ng-bootstrap": "^9.1.3",
"@ngrx/effects": "^12.0", "@ngrx/effects": "^13",
"@ngrx/router-store": "^12.0", "@ngrx/router-store": "^13",
"@ngrx/store": "^12.0", "@ngrx/store": "^13",
"angular-oauth2-oidc": "^12.0", "angular-oauth2-oidc": "^13",
"bootstrap": "^4.6.0", "bootstrap": "^4.6.0",
"cesium": "^1.82.1", "cesium": "^1.82.1",
"core-js": "^2.6.12", "core-js": "^2.6.12",
"moment": "^2.29.4", "moment": "^2.29.4",
"ngrx-store-localstorage": "^12.0", "ngrx-store-localstorage": "^13",
"ngx-avatar": "^4.1.0", "ngx-avatar": "^4.1.0",
"ngx-clipboard": "^14.0.1", "ngx-clipboard": "^14.0.1",
"ngx-image-cropper": "^3.3.5", "ngx-image-cropper": "^3.3.5",
@ -43,16 +43,16 @@
"resumablejs": "^1.1.0", "resumablejs": "^1.1.0",
"rxjs": "^6.6.7", "rxjs": "^6.6.7",
"tassign": "^1.0.0", "tassign": "^1.0.0",
"tslib": "^2.2.0", "tslib": "^2.4.0",
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "^12.1.3", "@angular-builders/custom-webpack": "^13",
"@angular-devkit/build-angular": "^12.2.8", "@angular-devkit/build-angular": "^13.3.9",
"@angular/cli": "^12.2.8", "@angular/cli": "^13.3.9",
"@angular/compiler-cli": "~12.2.8", "@angular/compiler-cli": "~13.3.11",
"@angular/language-service": "~12.2.8", "@angular/language-service": "~13.3.11",
"@angular/localize": "^12.2.8", "@angular/localize": "^13.3.11",
"@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",
@ -65,10 +65,10 @@
"karma-coverage-istanbul-reporter": "~3.0.2", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.6.0", "karma-jasmine-html-reporter": "^1.6.0",
"ng-packagr": "^12.2.2", "ng-packagr": "^13.3.1",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"ts-node": "^8.8.1", "ts-node": "^8.8.1",
"tslint": "~6.1.0", "tslint": "~6.1.0",
"typescript": "~4.3.5" "typescript": "~4.6.4"
} }
} }

241
projects/common-map/src/fm-map/common-map.module.ts
View File

@ -169,134 +169,119 @@ export {
GeometryThumbnailComponent GeometryThumbnailComponent
} }
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
AngularOpenlayersModule, AngularOpenlayersModule,
MapRoutingModule, MapRoutingModule,
StoreModule.forFeature(MODULE_NAME, mapReducers.reducer,{metaReducers:metaReducers}), StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
EffectsModule.forFeature([mapEffects.MapEffects]), EffectsModule.forFeature([mapEffects.MapEffects]),
NgbModule, NgbModule,
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
AppCommonModule AppCommonModule
], ],
declarations: [ declarations: [
ZoomToExtentComponent, ZoomToExtentComponent,
ItemVectorSourceComponent, ItemVectorSourceComponent,
ItemLayersComponent, ItemLayersComponent,
FileDropTargetComponent, FileDropTargetComponent,
MapComponent, MapComponent,
MetaDataModalComponent, MetaDataModalComponent,
RotationResetComponent, RotationResetComponent,
MapSearchComponent, MapSearchComponent,
SelectPeriodModalComponent, SelectPeriodModalComponent,
LayerListComponent, LayerListComponent,
LegendComponent, LegendComponent,
LayerVectorImageComponent, LayerVectorImageComponent,
FeatureListComponent, FeatureListComponent,
WidgetHostDirective, WidgetHostDirective,
FeatureListContainerComponent, FeatureListContainerComponent,
FeatureListCroppingschemeComponent, FeatureListCroppingschemeComponent,
FeatureListCropfieldComponent, FeatureListCropfieldComponent,
FeatureListFeatureContainerComponent, FeatureListFeatureContainerComponent,
FeatureListFeatureComponent, FeatureListFeatureComponent,
FeatureListFeatureCroppingschemeComponent, FeatureListFeatureCroppingschemeComponent,
FeatureListFeatureCropfieldComponent, FeatureListFeatureCropfieldComponent,
SelectedItemContainerComponent, SelectedItemContainerComponent,
SelectedItemComponent, SelectedItemComponent,
SelectedItemCropfieldComponent, SelectedItemCropfieldComponent,
SelectedItemGeotiffComponent, SelectedItemGeotiffComponent,
SelectedItemTemporalComponent, SelectedItemTemporalComponent,
SelectedItemShapeComponent, SelectedItemShapeComponent,
ItemListItemComponent, ItemListItemComponent,
ItemListItemContainerComponent, ItemListItemContainerComponent,
ItemListComponent, ItemListComponent,
ItemWidgetListComponent, ItemWidgetListComponent,
WidgetStatusComponent, WidgetStatusComponent,
GpsLocation, GpsLocation,
PanToLocation, PanToLocation,
LayerSwitcher, LayerSwitcher,
HistogramDetailsComponent, HistogramDetailsComponent,
StatisticsDetailsComponent, StatisticsDetailsComponent,
ifZoomToShowDirective, ifZoomToShowDirective,
ZoomToShowAlert, ZoomToShowAlert,
LayerValuesComponent, LayerValuesComponent,
GeometryThumbnailComponent GeometryThumbnailComponent
], ],
entryComponents: [ exports: [
FeatureListComponent, ItemVectorSourceComponent,
FeatureListCroppingschemeComponent, ItemLayersComponent,
FeatureListCropfieldComponent, FileDropTargetComponent,
FeatureListFeatureComponent, MetaDataModalComponent,
FeatureListFeatureCroppingschemeComponent, MapComponent,
FeatureListFeatureCropfieldComponent, GpsLocation,
SelectedItemComponent, PanToLocation,
SelectedItemCropfieldComponent, LayerSwitcher,
SelectedItemGeotiffComponent, FeatureListFeatureComponent,
SelectedItemTemporalComponent, FeatureListFeatureCropfieldComponent,
SelectedItemShapeComponent, FeatureListFeatureCroppingschemeComponent,
ItemListComponent, SelectedItemContainerComponent,
ItemListItemComponent, SelectedItemComponent,
], SelectedItemCropfieldComponent,
exports: [ SelectedItemGeotiffComponent,
ItemVectorSourceComponent, SelectedItemTemporalComponent,
ItemLayersComponent, SelectedItemShapeComponent,
FileDropTargetComponent, ItemListItemComponent,
MetaDataModalComponent, ItemListItemContainerComponent,
MapComponent, ItemListComponent,
GpsLocation, ItemWidgetListComponent,
PanToLocation, WidgetStatusComponent,
LayerSwitcher, RotationResetComponent,
FeatureListFeatureComponent, MapSearchComponent,
FeatureListFeatureCropfieldComponent, SelectPeriodModalComponent,
FeatureListFeatureCroppingschemeComponent, LayerListComponent,
SelectedItemContainerComponent, LegendComponent,
SelectedItemComponent, LayerVectorImageComponent,
SelectedItemCropfieldComponent, FeatureListComponent,
SelectedItemGeotiffComponent, WidgetHostDirective,
SelectedItemTemporalComponent, FeatureListContainerComponent,
SelectedItemShapeComponent, FeatureListCroppingschemeComponent,
ItemListItemComponent, FeatureListCropfieldComponent,
ItemListItemContainerComponent, FeatureListFeatureContainerComponent,
ItemListComponent, ZoomToExtentComponent,
ItemWidgetListComponent, ifZoomToShowDirective,
WidgetStatusComponent, ZoomToShowAlert,
RotationResetComponent, GeometryThumbnailComponent
MapSearchComponent, ],
SelectPeriodModalComponent, providers: [
LayerListComponent, FeatureIconService,
LegendComponent, GeolocationService,
LayerVectorImageComponent, DeviceOrientationService,
FeatureListComponent, TemporalService,
WidgetHostDirective, { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
FeatureListContainerComponent, { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
FeatureListCroppingschemeComponent, { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
FeatureListCropfieldComponent, { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
FeatureListFeatureContainerComponent, { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
ZoomToExtentComponent, { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
ifZoomToShowDirective, { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
ZoomToShowAlert, { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
GeometryThumbnailComponent { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
], { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
providers: [ { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
FeatureIconService, { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
GeolocationService, ]
DeviceOrientationService,
TemporalService,
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
{ provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
{ provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
{ provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
]
}) })

4
projects/common-map/src/test.ts
View File

@ -14,7 +14,9 @@ declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);

4
projects/common-map3d/src/test.ts
View File

@ -18,7 +18,9 @@ declare const require: {
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);

5
projects/common/ng-package.json
View File

@ -2,10 +2,7 @@
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json", "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/common", "dest": "../../dist/common",
"lib": { "lib": {
"entryFile": "src/public-api.ts", "entryFile": "src/public-api.ts"
"umdModuleIds": {
"my-data": "my-data"
}
}, },
"allowedNonPeerDependencies": [ "allowedNonPeerDependencies": [
"." "."

4
projects/common/src/test.ts
View File

@ -14,7 +14,9 @@ declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);

10
src/polyfills.ts
View File

@ -18,16 +18,6 @@
* BROWSER POLYFILLS * BROWSER POLYFILLS
*/ */
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/** /**
* By default, zone.js will patch all possible macroTask and DomEvents * By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags * user can disable parts of macroTask/DomEvents patch by setting following flags

4
src/test.ts
View File

@ -12,7 +12,9 @@ declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);