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

Aw5739 Update to Angular v15

Browse Source
This commit is contained in:
Peter Bastiani 2023-12-29 12:30:35 +01:00
parent bdd3d7fe4d
commit 18381975ef
44 changed files with 7575 additions and 2756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10055
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

36
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "4.2.0", "version": "4.2.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
@ -10,16 +10,16 @@
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^14.1.3", "@angular/animations": "^15.2.10",
"@angular/common": "^14.1.3", "@angular/common": "^15.2.10",
"@angular/compiler": "^14.1.3", "@angular/compiler": "^15.2.10",
"@angular/core": "^14.1.3", "@angular/core": "^15.2.10",
"@angular-eslint/eslint-plugin": "^15.2.1", "@angular-eslint/eslint-plugin": "^15.2.1",
"@angular/forms": "^14.1.3", "@angular/forms": "^15.2.10",
"@angular/platform-browser": "^14.1.3", "@angular/platform-browser": "^15.2.10",
"@angular/platform-browser-dynamic": "^14.1.3", "@angular/platform-browser-dynamic": "^15.2.10",
"@angular/router": "^14.1.3", "@angular/router": "^15.2.10",
"@farmmaps/common": "4.2.0-prerelease.2410", "@farmmaps/common": "4.2.0-prerelease.2410",
"@farmmaps/common-map": "4.2.0-prerelease.2410", "@farmmaps/common-map": "4.2.0-prerelease.2410",
"@farmmaps/components": "4.0.0-prerelease.2025", "@farmmaps/components": "4.0.0-prerelease.2025",
@ -56,13 +56,13 @@
"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": "^15.2.10",
"@angular/cli": "^14.1.3", "@angular/cli": "^15.2.10",
"@angular/compiler-cli": "^14.1.3", "@angular/compiler-cli": "^15.2.10",
"@angular/language-service": "^14.1.3", "@angular/language-service": "^15.2.10",
"@angular/localize": "^14.1.3", "@angular/localize": "^15.2.10",
"@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,9 +81,9 @@
"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": "^14.1.0", "ng-packagr": "^15.2.2",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"ts-node": "^8.8.1", "ts-node": "^8.8.1",
"typescript": "~4.6.4" "typescript": "~4.9.5"
} }
} }

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

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

13
projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.scss
View File

@ -1,6 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.gps-location { .gps-location {
display:none; display:none;
} }
@ -14,7 +11,7 @@
} }
.tolerance { .tolerance {
fill: $primary; fill: var(--bs-primary);
fill-opacity:0.4; fill-opacity:0.4;
} }
@ -23,20 +20,20 @@
} }
.border { .border {
fill: $white; fill: var(--bs-white);
} }
.center { .center {
fill: $primary; fill: var(--bs-primary);
} }
.stop1 { .stop1 {
stop-color: $primary; stop-color: var(--bs-primary);
stop-opacity:1; stop-opacity:1;
} }
.stop2 { .stop2 {
stop-color:$primary; stop-color: var(--bs-primary);
stop-opacity: 0; stop-opacity: 0;
} }

13
projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss
View File

@ -1,11 +1,8 @@
@import "~bootstrap/scss/bootstrap.scss";
.gps-location { .gps-location {
display:block; display:block;
width:2.5em; width:2.5em;
height:2.5em; height:2.5em;
background-color: $body-bg; background-color: var(--bs-body-bg);
background-size: contain; background-size: contain;
margin-top:0.5em; margin-top:0.5em;
border-radius: 1.75em; border-radius: 1.75em;
@ -17,15 +14,15 @@
} }
.pan-to { .pan-to {
fill: $secondary; fill: var(--bs-secondary);
} }
div.gps-location:hover .pan-to { div.gps-location:hover .pan-to {
fill: $white; fill: var(--bs-white);
} }
.pan-to-centered { .pan-to-centered {
fill: $primary; fill: var(--bs-primary);
} }
div.gps-location:hover .pan-to-centered { div.gps-location:hover .pan-to-centered {
@ -33,5 +30,5 @@ div.gps-location:hover .pan-to-centered {
} }
.pan-to.pan-to-disabled { .pan-to.pan-to-disabled {
fill: $gray-300; fill: var(--bs-gray-300);
} }

14
projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.compass { .compass {
width:2.5em; width:2.5em;
height:2.5em; height:2.5em;
@ -13,7 +11,7 @@
#north { #north {
display: none; display: none;
fill:$black; fill: var(--bs-black);
} }
#top-l { #top-l {
@ -33,23 +31,23 @@
} }
div.compass:hover #top-l { div.compass:hover #top-l {
fill:$white; fill: var(--bs-white);
} }
div.compass:hover #top-r { div.compass:hover #top-r {
fill:$gray-300; fill: var(--bs-gray-300);
} }
div.compass:hover #bottom-l { div.compass:hover #bottom-l {
fill:$gray-300; fill: var(--bs-gray-300);
} }
div.compass:hover #bottom-r { div.compass:hover #bottom-r {
fill:$white; fill: var(--bs-white);
} }
div.compass:hover #north { div.compass:hover #north {
fill:$white; fill: var(--bs-white);
} }
.compass-n { .compass-n {

8
projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.scss
View File

@ -1,14 +1,10 @@
@import "~bootstrap/scss/bootstrap.scss";
.row { .row {
border-bottom: 1px solid $gray-500; border-bottom: 1px solid var(--bs-gray-500);
user-select: none; user-select: none;
} }
.row.selected { .row.selected {
background-color: $gray-100; background-color: var(--bs-gray-100);
} }
@media screen and (min-width: 44rem) { @media screen and (min-width: 44rem) {

8
projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.scss
View File

@ -1,22 +1,20 @@
@import "~bootstrap/scss/bootstrap.scss";
fm-map-feature-list-feature-container { fm-map-feature-list-feature-container {
width:100%; width:100%;
pointer-events:none; pointer-events:none;
} }
.row { .row {
border-bottom: 1px solid $gray-500; border-bottom: 1px solid var(--bs-gray-500);;
user-select: none; user-select: none;
padding-left:1.5rem; padding-left:1.5rem;
} }
.row.selected { .row.selected {
background-color: $gray-100; background-color: var(--bs-gray-100);
} }
.cropfields { .cropfields {
border-top: 1px solid $gray-500; border-top: 1px solid var(--bs-gray-500);;
margin-left: -1.25rem; margin-left: -1.25rem;
margin-right: -1.25rem; margin-right: -1.25rem;
} }

8
projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.scss
View File

@ -1,22 +1,20 @@
@import "~bootstrap/scss/bootstrap.scss";
fm-map-feature-list-feature-container { fm-map-feature-list-feature-container {
width:100%; width:100%;
pointer-events:none; pointer-events:none;
} }
.row { .row {
border-bottom: 1px solid $gray-500; border-bottom: 1px solid var(--bs-gray-500);;
user-select: none; user-select: none;
padding-left:1.5rem; padding-left:1.5rem;
} }
.row.selected { .row.selected {
background-color: $gray-100; background-color: var(--bs-gray-100);
} }
.farms { .farms {
border-top: 1px solid $gray-500; border-top: 1px solid var(--bs-gray-500);;
margin-left: -1.25rem; margin-left: -1.25rem;
margin-right: -1.25rem; margin-right: -1.25rem;
} }

4
projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.scss
View File

@ -1,7 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.card-title { .card-title {
font-size: 1rem; font-size: 1rem;
white-space: nowrap; white-space: nowrap;

4
projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.scss
View File

@ -1,7 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.card-title { .card-title {
font-size: 1rem; font-size: 1rem;
white-space: nowrap; white-space: nowrap;

4
projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.scss
View File

@ -1,7 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.card-title { .card-title {
font-size: 1rem; font-size: 1rem;
white-space: nowrap; white-space: nowrap;

6
projects/common-map/src/fm-map/components/feature-list/feature-list.component.scss
View File

@ -1,15 +1,13 @@
@import "~bootstrap/scss/bootstrap.scss";
fm-map-feature-list-feature-container { fm-map-feature-list-feature-container {
width: 100%; width: 100%;
pointer-events: none; pointer-events: none;
} }
.row { .row {
border-bottom: 1px solid $gray-500; border-bottom: 1px solid var(--bs-gray-500);;
user-select: none; user-select: none;
} }
.row.selected { .row.selected {
background-color: $gray-100; background-color: var(--bs-gray-100);
} }

2
projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.widget { .widget {
padding:0.8rem; padding:0.8rem;
height:100%; height:100%;

6
projects/common-map/src/fm-map/components/item-list/item-list.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.widget-container { .widget-container {
overflow:auto; overflow:auto;
margin-bottom:1rem; margin-bottom:1rem;
@ -7,7 +5,7 @@
.widget { .widget {
position:relative; position:relative;
border: 1px solid $gray-500; border: 1px solid var(--bs-gray-500);;
user-select: none; user-select: none;
display:inline-block; display:inline-block;
width:50%; width:50%;
@ -28,7 +26,7 @@
} }
.widget:hover { .widget:hover {
background-color: $gray-100; background-color: var(--bs-gray-100);
} }
.widget-container { .widget-container {

6
projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.widget-container { .widget-container {
overflow:auto; overflow:auto;
margin-bottom:1rem; margin-bottom:1rem;
@ -7,7 +5,7 @@
.widget { .widget {
position:relative; position:relative;
border: 1px solid $gray-500; border: 1px solid var(--bs-gray-500);;
user-select: none; user-select: none;
display:inline-block; display:inline-block;
width:50%; width:50%;
@ -28,7 +26,7 @@
} }
.widget:hover { .widget:hover {
background-color: $gray-100; background-color: var(--bs-gray-100);
} }
.widget-container { .widget-container {

9
projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss
View File

@ -1,18 +1,15 @@
@import "~bootstrap/scss/bootstrap.scss";
.layer-switcher { .layer-switcher {
display:block; display:block;
width:2.5em; width:2.5em;
height:2.5em; height:2.5em;
background-color: $body-bg; background-color: var(--bs-body-bg);
background-size: contain; background-size: contain;
margin-top:0.5em; margin-top:0.5em;
text-align: center; text-align: center;
line-height: 2.5em; line-height: 2.5em;
border-radius: 1.75em; border-radius: 1.75em;
padding: 0; padding: 0;
color: $secondary; color: var(--bs-secondary);
} }
.layer-switcher i { .layer-switcher i {
@ -24,7 +21,7 @@
} }
.layers { .layers {
color:$secondary; color: var(--bs-secondary);;
position: absolute; position: absolute;
overflow: hidden; overflow: hidden;
bottom: -1em; bottom: -1em;

4
projects/common-map/src/fm-map/components/map-search/map-search.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
div.map-search { div.map-search {
position: absolute; position: absolute;
top: 0.5rem; top: 0.5rem;
@ -106,7 +104,7 @@ div.map-search.searchcollapsed button[type="submit"] {
} }
.form-control, .form-control:focus { .form-control, .form-control:focus {
border-color: $secondary; border-color: var(--bs-secondary);
} }

4
projects/common-map/src/fm-map/components/map/map.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
aol-map { position:absolute;width:100%;height:calc( 100vh );} aol-map { position:absolute;width:100%;height:calc( 100vh );}
.arrow { .arrow {
@ -195,7 +193,7 @@ timespan.menuVisible {
width: 4rem; width: 4rem;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: $primary; color: var(--bs-primary);
} }
.shortcut-icon > .farm-icon { .shortcut-icon > .farm-icon {

8
projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss
View File

@ -1,13 +1,9 @@
@import "~bootstrap/scss/bootstrap.scss";
.row { .row {
border-bottom: 1px solid $gray-500; border-bottom: 1px solid var(--bs-gray-500);;
user-select: none; user-select: none;
} }
.row:hover { .row:hover {
background-color: $gray-100; background-color: var(--bs-gray-100);
} }

2
projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {
width: 100%; width: 100%;
color: white; color: white;

2
projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {
width: 100%; width: 100%;
color: white; color: white;

2
projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {
width: 100%; width: 100%;
color: white; color: white;

2
projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {
width: 100%; width: 100%;
color: white; color: white;

2
projects/common-map/src/fm-map/components/selected-item/selected-item.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.big-icon { .big-icon {
width: 100%; width: 100%;
color: white; color: white;

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

@ -9,8 +9,6 @@ import {
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } from '@angular/platform-browser-dynamic/testing';
declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
@ -18,7 +16,3 @@ getTestBed().initTestEnvironment(
teardown: { destroyAfterEach: false } teardown: { destroyAfterEach: false }
} }
); );
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

1
projects/common-map/tsconfig.lib.json
View File

@ -2,7 +2,6 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2020",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,

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

@ -2,7 +2,6 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2020",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,

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": ">=14.0.0", "@angular/common": ">=15.0.0",
"@angular/core": ">=14.0.0", "@angular/core": ">=15.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"

6
projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss
View File

@ -1,17 +1,15 @@
@import "~bootstrap/scss/bootstrap.scss";
.twotreed { .twotreed {
display:block; display:block;
width:2.5em; width:2.5em;
height:2.5em; height:2.5em;
background-color: $body-bg; background-color: var(--bs-body-bg);
background-size: contain; background-size: contain;
margin-top:0.5em; margin-top:0.5em;
text-align: center; text-align: center;
line-height: 2.5em; line-height: 2.5em;
border-radius: 1.75em; border-radius: 1.75em;
padding: 0; padding: 0;
color: $secondary; color: var(--bs-secondary);
} }
.fa-spinner { .fa-spinner {

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

@ -8,13 +8,6 @@ import {
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } from '@angular/platform-browser-dynamic/testing';
declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
keys(): string[];
<T>(id: string): T;
};
};
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
@ -22,7 +15,3 @@ getTestBed().initTestEnvironment(
teardown: { destroyAfterEach: false } teardown: { destroyAfterEach: false }
} }
); );
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

12
projects/common/package.json
View File

@ -6,12 +6,12 @@
}, },
"peerDependencies": { "peerDependencies": {
"@ng-bootstrap/ng-bootstrap": ">=10.0.0", "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
"@angular/common": ">=14.0.0", "@angular/common": ">=15.0.0",
"@angular/core": ">=14.0.0", "@angular/core": ">=15.0.0",
"@angular/forms": ">=14.0.0", "@angular/forms": ">=15.0.0",
"@ngrx/effects": ">=14.0.0", "@ngrx/effects": ">=15.0.0",
"@ngrx/router-store": ">=14.0.0", "@ngrx/router-store": ">=15.0.0",
"@ngrx/store": ">=14.0.0", "@ngrx/store": ">=15.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",

8
projects/common/src/fm/components/app/app.component.scss
View File

@ -1,9 +1,3 @@
/* Import Bootstrap & Fonts */
@import "~bootstrap/scss/bootstrap.scss";
// custom styles // custom styles
.btn:focus { .btn:focus {
@ -16,7 +10,7 @@
.form-control:focus { .form-control:focus {
box-shadow: none; box-shadow: none;
border-color: $input-border-color; border-color: var(--bs-input-border-color);
} }

6
projects/common/src/fm/components/back-button/back-button.component.scss
View File

@ -1,12 +1,10 @@
@import "~bootstrap/scss/bootstrap.scss";
.back-button { .back-button {
cursor: default; cursor: default;
color: $primary; color: var(--bs-primary);
display: block; display: block;
} }
.back-button:hover { .back-button:hover {
cursor: pointer; cursor: pointer;
color: $secondary; color: var(--bs-secondary);
} }

8
projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
View File

@ -1,7 +1,3 @@
/* Import Bootstrap & Fonts */
@import "~bootstrap/scss/bootstrap.scss";
div.resumable-file-upload { div.resumable-file-upload {
position: fixed; position: fixed;
right: 0px; right: 0px;
@ -76,7 +72,7 @@ div.card-header span.fa {
} }
.upload-file.busy > div > span.fa-times { .upload-file.busy > div > span.fa-times {
color: $danger; color: var(--bs-danger);
width: 20px; width: 20px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
@ -94,7 +90,7 @@ div.card-header span.fa {
} }
.upload-file > div.errormessage { .upload-file > div.errormessage {
color: $danger; color: var(--bs-danger);
display: none; display: none;
} }

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

@ -9,8 +9,6 @@ import {
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } from '@angular/platform-browser-dynamic/testing';
declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
@ -18,7 +16,3 @@ getTestBed().initTestEnvironment(
teardown: { destroyAfterEach: false } teardown: { destroyAfterEach: false }
} }
); );
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

1
projects/common/tsconfig.lib.json
View File

@ -2,7 +2,6 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2020",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,

1
projects/common/tsconfig.lib.prod.json
View File

@ -2,7 +2,6 @@
"extends": "../../tsconfig.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2020",
"module": "es2015", "module": "es2015",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,

6
projects/ngx-openlayers/src/test.ts
View File

@ -5,13 +5,7 @@ import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: true }, teardown: { destroyAfterEach: true },
}); });
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

1
projects/ngx-openlayers/tsconfig.lib.json
View File

@ -3,7 +3,6 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"declarationMap": true, "declarationMap": true,
"target": "es2020",
"declaration": true, "declaration": true,
"inlineSources": true, "inlineSources": true,
"types": [], "types": [],

2
src/app/landingpage/landingpage.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
/*! /*!
* Start Bootstrap - Landing Page v5.0.8 (https://startbootstrap.com/themes/landing-page) * Start Bootstrap - Landing Page v5.0.8 (https://startbootstrap.com/themes/landing-page)
* Copyright 2013-2020 Start Bootstrap * Copyright 2013-2020 Start Bootstrap

4
src/app/menu/menu.component.scss
View File

@ -1,5 +1,3 @@
@import "~bootstrap/scss/bootstrap.scss";
.menu-card { .menu-card {
padding-left:7px; padding-left:7px;
padding-right:7px; padding-right:7px;
@ -29,7 +27,7 @@
width: 4rem; width: 4rem;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: $primary; color: var(--bs-primary);
} }
.shortcut-icon > .farm-icon { .shortcut-icon > .farm-icon {

8
src/test.ts
View File

@ -7,16 +7,10 @@ import {
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } from '@angular/platform-browser-dynamic/testing';
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 } teardown: { destroyAfterEach: false }
} }
); );
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

7
tsconfig.json
View File

@ -13,7 +13,7 @@
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"importHelpers": true, "importHelpers": true,
"skipLibCheck": true, "skipLibCheck": true,
"target": "es2020", "target": "ES2022",
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],
@ -34,7 +34,8 @@
], ],
"ngx-openlayers/*": [ "ngx-openlayers/*": [
"dist/ngx-openlayers/*" "dist/ngx-openlayers/*"
], ]
} },
"useDefineForClassFields": false
} }
} }