Update to angular 9

This commit is contained in:
Willem Dantuma 2020-04-01 09:06:11 +02:00
parent 984408cd52
commit 34990e5de2
14 changed files with 3620 additions and 2203 deletions

View File

@ -13,6 +13,7 @@
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:browser",
"options": { "options": {
"aot": true,
"outputPath": "dist/farmmaps-lib-app", "outputPath": "dist/farmmaps-lib-app",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "main": "src/main.ts",
@ -67,6 +68,10 @@
"type": "initial", "type": "initial",
"maximumWarning": "2mb", "maximumWarning": "2mb",
"maximumError": "7mb" "maximumError": "7mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
} }
] ]
} }
@ -160,6 +165,11 @@
"tsConfig": "projects/common/tsconfig.lib.json", "tsConfig": "projects/common/tsconfig.lib.json",
"project": "projects/common/ng-package.json" "project": "projects/common/ng-package.json"
} }
, "configurations": {
"production": {
"tsConfig": "projects/common/tsconfig.lib.prod.json"
}
}
}, },
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular-devkit/build-angular:karma",
@ -195,6 +205,11 @@
"tsConfig": "projects/common-map/tsconfig.lib.json", "tsConfig": "projects/common-map/tsconfig.lib.json",
"project": "projects/common-map/ng-package.json" "project": "projects/common-map/ng-package.json"
} }
, "configurations": {
"production": {
"tsConfig": "projects/common-map/tsconfig.lib.prod.json"
}
}
}, },
"test": { "test": {
"builder": "@angular-devkit/build-angular:karma", "builder": "@angular-devkit/build-angular:karma",

5650
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -11,14 +11,14 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~8.2.14", "@angular/animations": "~9.1.0",
"@angular/common": "~8.2.14", "@angular/common": "~9.1.0",
"@angular/compiler": "~8.2.14", "@angular/compiler": "~9.1.0",
"@angular/core": "~8.2.14", "@angular/core": "~9.1.0",
"@angular/forms": "~8.2.14", "@angular/forms": "~9.1.0",
"@angular/platform-browser": "~8.2.14", "@angular/platform-browser": "~9.1.0",
"@angular/platform-browser-dynamic": "~8.2.14", "@angular/platform-browser-dynamic": "~9.1.0",
"@angular/router": "~8.2.14", "@angular/router": "~9.1.0",
"@aspnet/signalr": "^1.1.4", "@aspnet/signalr": "^1.1.4",
"@farmmaps/common": ">=0.0.1-prerelease.226 <0.0.1", "@farmmaps/common": ">=0.0.1-prerelease.226 <0.0.1",
"@farmmaps/common-map": ">=0.0.1-prerelease.226 <0.0.1", "@farmmaps/common-map": ">=0.0.1-prerelease.226 <0.0.1",
@ -35,18 +35,19 @@
"resumablejs": "^1.1.0", "resumablejs": "^1.1.0",
"rxjs": "^6.5.4", "rxjs": "^6.5.4",
"tassign": "^1.0.0", "tassign": "^1.0.0",
"zone.js": "~0.9.1" "tslib": "^1.10.0",
"zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^0.803.26", "@angular-devkit/build-angular": "~0.901.0",
"@angular-devkit/build-ng-packagr": "^0.803.26", "@angular-devkit/build-ng-packagr": "~0.901.0",
"@angular/cli": "^8.3.26", "@angular/cli": "^9.1.0",
"@angular/compiler-cli": "~8.2.14", "@angular/compiler-cli": "~9.1.0",
"@angular/language-service": "~8.2.14", "@angular/language-service": "~9.1.0",
"@types/jasmine": "~2.8.8", "@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4", "@types/node": "^12.11.1",
"codelyzer": "^5.2.1", "codelyzer": "^5.1.2",
"jasmine-core": "~2.99.1", "jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"karma": "~4.0.0", "karma": "~4.0.0",
@ -54,12 +55,10 @@
"karma-coverage-istanbul-reporter": "~2.0.1", "karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2", "karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^0.2.2",
"ng-packagr": "^5.4.0", "ng-packagr": "^9.0.0",
"protractor": "^5.4.3", "protractor": "^5.4.3",
"ts-node": "~7.0.0", "ts-node": "~7.0.0",
"tsickle": "^0.38",
"tslib": "^1.9.0",
"tslint": "~5.11.0", "tslint": "~5.11.0",
"typescript": "~3.5.3" "typescript": "~3.8.3"
} }
} }

View File

@ -251,7 +251,7 @@ export {
export class AppCommonMapModule { export class AppCommonMapModule {
static forRoot(): ModuleWithProviders { static forRoot(): ModuleWithProviders<AppCommonMapModule> {
return { return {
ngModule: AppCommonMapModule, ngModule: AppCommonMapModule,
providers: [ providers: [

View File

@ -20,8 +20,8 @@ import * as style from 'ol/style';
}) })
export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent implements AfterViewInit { export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent implements AfterViewInit {
@ViewChild('canvas', { static: false }) canvas; @ViewChild('canvas') canvas;
@ViewChild('container', { static: false }) container; @ViewChild('container') container;
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,config:AppConfig) { constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,config:AppConfig) {
super(store, itemTypeService,config); super(store, itemTypeService,config);

View File

@ -79,7 +79,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles); public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
private setStateCount$:Observable<number> = this.store.select(mapReducers.selectgetSetStateCount); private setStateCount$:Observable<number> = this.store.select(mapReducers.selectgetSetStateCount);
@ViewChild('map', { static: false }) map; @ViewChild('map') map;
constructor(private store: Store<mapReducers.State | commonReducers.State>, constructor(private store: Store<mapReducers.State | commonReducers.State>,
private route: ActivatedRoute, private route: ActivatedRoute,

View File

@ -18,7 +18,6 @@
] ]
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"annotateForClosureCompiler": true,
"skipTemplateCodegen": true, "skipTemplateCodegen": true,
"strictMetadataEmit": true, "strictMetadataEmit": true,
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,

View File

@ -0,0 +1,6 @@
{
"extends": "./tsconfig.lib.json",
"angularCompilerOptions": {
"enableIvy": false
}
}

View File

@ -62,7 +62,7 @@ export class AppCommonServiceModule {
'AppCommonServiceModule is already loaded. Import it in the AppModule only'); 'AppCommonServiceModule is already loaded. Import it in the AppModule only');
} }
} }
static forRoot(): ModuleWithProviders { static forRoot(): ModuleWithProviders<AppCommonServiceModule> {
return { return {
ngModule: AppCommonServiceModule, ngModule: AppCommonServiceModule,
providers: [ providers: [

View File

@ -13,7 +13,7 @@ export class SidePanelComponent implements OnChanges {
@Input() public collapsable: boolean; @Input() public collapsable: boolean;
@Input() public resizeable: boolean = false; @Input() public resizeable: boolean = false;
@Input() public left: boolean = false; @Input() public left: boolean = false;
@ViewChild("resizeGrip", { static: false }) elementView: ElementRef; @ViewChild("resizeGrip") elementView: ElementRef;
public mobile:boolean = true; public mobile:boolean = true;
private parentHeight:number = 0; private parentHeight:number = 0;
public top = "100%"; public top = "100%";

View File

@ -25,7 +25,6 @@
} }
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"annotateForClosureCompiler": true,
"skipTemplateCodegen": true, "skipTemplateCodegen": true,
"strictMetadataEmit": true, "strictMetadataEmit": true,
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,

View File

@ -0,0 +1,6 @@
{
"extends": "./tsconfig.lib.json",
"angularCompilerOptions": {
"enableIvy": false
}
}

View File

@ -1,6 +1,8 @@
import { IAuthconfigFactory, AppConfig } from '@farmmaps/common'; import { IAuthconfigFactory, AppConfig } from '@farmmaps/common';
import { AuthConfig } from 'angular-oauth2-oidc'; import { AuthConfig } from 'angular-oauth2-oidc';
import { Injectable } from "@angular/core";
@Injectable()
export class Id4AuthconfigFactory implements IAuthconfigFactory { export class Id4AuthconfigFactory implements IAuthconfigFactory {
constructor() { constructor() {

View File

@ -4,8 +4,11 @@
"outDir": "../out-tsc/app", "outDir": "../out-tsc/app",
"types": [] "types": []
}, },
"exclude": [ "files": [
"test.ts", "main.ts",
"**/*.spec.ts" "polyfills.ts"
],
"include": [
"src/**/*.d.ts"
] ]
} }