diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 35132f80..078fe4c7 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -2,7 +2,7 @@ on: workflow_call: env: - NODE_JS_VERSION: 16 + NODE_JS_VERSION: 18 jobs: install-and-scan-deps: diff --git a/package.json b/package.json index a662a721..3e4221b8 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@angular/language-service": "^15.2.10", "@types/arcgis-rest-api": "^10.4.5", "@types/hammerjs": "^2.0.41", - "@types/jasmine": "~4.3.1", + "@types/jasmine": "~5.1.5", "@types/node": "^12.11.1", "@types/topojson-specification": "^1.0.2", "@typescript-eslint/eslint-plugin": "^5.43.0", @@ -52,20 +52,20 @@ "eslint-plugin-jsdoc": "^47.0.2", "eslint-plugin-prefer-arrow": "latest", "improved-yarn-audit": "^3.0.0", - "jasmine-core": "~4.3.0", + "jasmine-core": "~5.5.0", "jasmine-spec-reporter": "~5.0.0", "karma": "~6.4.1", "karma-chrome-launcher": "~3.1.0", "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", - "karma-jasmine-html-reporter": "~2.0.0", + "karma-jasmine-html-reporter": "~2.1.0", "ng-packagr": "~15.2.2", - "prettier": "^2.0.3", + "prettier": "^3.4.2", "protractor": "~7.0.0", "ts-node": "~8.3.0", "typescript": "~4.8.4" }, "volta": { - "node": "16.20.2" + "node": "18.20.5" } } diff --git a/projects/ngx-openlayers/package.json b/projects/ngx-openlayers/package.json index 25e4728a..9c66d99e 100644 --- a/projects/ngx-openlayers/package.json +++ b/projects/ngx-openlayers/package.json @@ -5,8 +5,8 @@ "release": "commit-and-tag-version -m \"chore(release): version %s\" -t \"\" --prerelease next" }, "peerDependencies": { - "@angular/common": ">=6.0.0 <=15.x.x", - "@angular/core": ">=6.0.0 <=15.x.x", + "@angular/common": ">=14.0.0 <=15.x.x", + "@angular/core": ">=14.0.0 <=15.x.x", "ol": "~7.5.2" } } diff --git a/projects/ngx-openlayers/src/lib/controls/attribution.component.ts b/projects/ngx-openlayers/src/lib/controls/attribution.component.ts index b49654d4..b07d3783 100644 --- a/projects/ngx-openlayers/src/lib/controls/attribution.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/attribution.component.ts @@ -14,7 +14,10 @@ export class ControlAttributionComponent implements OnInit, OnDestroy { instance: Attribution; target: HTMLElement; - constructor(private map: MapComponent, private element: ElementRef) {} + constructor( + private map: MapComponent, + private element: ElementRef + ) {} ngOnInit(): void { this.target = this.element.nativeElement; diff --git a/projects/ngx-openlayers/src/lib/controls/mouseposition.component.ts b/projects/ngx-openlayers/src/lib/controls/mouseposition.component.ts index 565690ee..b6705b7f 100644 --- a/projects/ngx-openlayers/src/lib/controls/mouseposition.component.ts +++ b/projects/ngx-openlayers/src/lib/controls/mouseposition.component.ts @@ -19,7 +19,10 @@ export class ControlMousePositionComponent implements OnInit, OnDestroy { instance: MousePosition; - constructor(private map: MapComponent, private element: ElementRef) {} + constructor( + private map: MapComponent, + private element: ElementRef + ) {} ngOnInit(): void { this.target = this.element.nativeElement; diff --git a/projects/ngx-openlayers/src/lib/geom/simplegeometry.component.ts b/projects/ngx-openlayers/src/lib/geom/simplegeometry.component.ts index a75fa8fa..a336173c 100644 --- a/projects/ngx-openlayers/src/lib/geom/simplegeometry.component.ts +++ b/projects/ngx-openlayers/src/lib/geom/simplegeometry.component.ts @@ -10,7 +10,10 @@ export abstract class SimpleGeometryComponent implements OnInit { instance: SimpleGeometry; componentType = 'simple-geometry'; - constructor(protected map: MapComponent, protected host: FeatureComponent) {} + constructor( + protected map: MapComponent, + protected host: FeatureComponent + ) {} ngOnInit(): void { this.host.instance.setGeometry(this.instance); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 93f17001..515a2650 100755 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -23,7 +23,10 @@ import { Component } from '@angular/core'; font-family: Roboto, sans-serif; font-size: 16px; opacity: 1; - box-shadow: 0 2px 4px -1px rgba(0, 0, 0, 0.2), 0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12); + box-shadow: + 0 2px 4px -1px rgba(0, 0, 0, 0.2), + 0 4px 5px 0 rgba(0, 0, 0, 0.14), + 0 1px 10px 0 rgba(0, 0, 0, 0.12); } header h1 { diff --git a/src/app/cluster/cluster.component.ts b/src/app/cluster/cluster.component.ts index b84b5a3d..89228b14 100644 --- a/src/app/cluster/cluster.component.ts +++ b/src/app/cluster/cluster.component.ts @@ -43,8 +43,8 @@ import { Component, OnInit } from '@angular/core'; [1.47, 43.545], [1.51, 43.545], [1.51, 43.565], - [1.47, 43.565] - ] + [1.47, 43.565], + ], ]" [srid]="'EPSG:4326'" > diff --git a/src/app/swipe/swipe.component.ts b/src/app/swipe/swipe.component.ts index ea7b3769..3a25bde1 100644 --- a/src/app/swipe/swipe.component.ts +++ b/src/app/swipe/swipe.component.ts @@ -32,7 +32,9 @@ import { MapComponent } from 'ngx-openlayers'; styles: [ ` .swipe-button { - box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), + box-shadow: + 0 3px 5px -1px rgba(0, 0, 0, 0.2), + 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12); background-color: #0a2340; color: white; diff --git a/yarn.lock b/yarn.lock index 8817f911..575f7776 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2061,10 +2061,10 @@ dependencies: "@types/node" "*" -"@types/jasmine@~4.3.1": - version "4.3.6" - resolved "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.6.tgz#d9855fa9f808138488784610f888046bb9a59aff" - integrity sha512-3N0FpQTeiWjm+Oo1WUYWguUS7E6JLceiGTriFrG8k5PU7zRLJCzLcWURU3wjMbZGS//a2/LgjsnO3QxIlwxt9g== +"@types/jasmine@~5.1.5": + version "5.1.5" + resolved "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.5.tgz#bba343c504f48e596837415f0558e10b8a0e5f7d" + integrity sha512-SaCZ3kM5NjOiJqMRYwHpLbTfUC2Dyk1KS3QanNFsUYPGTk70CWVK/J9ueun6zNhw/UkgV7xl8V4ZLQZNRbfnNw== "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" @@ -6133,10 +6133,10 @@ jasmine-core@~2.8.0: resolved "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha512-SNkOkS+/jMZvLhuSx1fjhcNWUC/KG6oVyFUGkSBEr9n1axSNduWU8GlI7suaHXr4yxjet6KjrUZxUTE5WzzWwQ== -jasmine-core@~4.3.0: - version "4.3.0" - resolved "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.3.0.tgz#aee841fbe7373c2586ed8d8d48f5cc4a88be8390" - integrity sha512-qybtBUesniQdW6n+QIHMng2vDOHscIC/dEXjW+JzO9+LoAZMb03RCUC5xFOv/btSKPm1xL42fn+RjlU4oB42Lg== +jasmine-core@~5.5.0: + version "5.5.0" + resolved "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.5.0.tgz#43564e4b41f73a37cff3aeb262e23bbd073576d8" + integrity sha512-NHOvoPO6o9gVR6pwqEACTEpbgcH+JJ6QDypyymGbSUIFIFsMMbBJ/xsFNud8MSClfnWclXd7RQlAZBz7yVo5TQ== jasmine-spec-reporter@~5.0.0: version "5.0.2" @@ -6336,10 +6336,10 @@ karma-coverage@~2.2.0: istanbul-reports "^3.0.5" minimatch "^3.0.4" -karma-jasmine-html-reporter@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-2.0.0.tgz#76c26ce40e217dc36a630fbcd7b31c3462948bf2" - integrity sha512-SB8HNNiazAHXM1vGEzf8/tSyEhkfxuDdhYdPBX2Mwgzt0OuF2gicApQ+uvXLID/gXyJQgvrM9+1/2SxZFUUDIA== +karma-jasmine-html-reporter@~2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-2.1.0.tgz#f951ad00b08d61d03595402c914d1a589c4930e3" + integrity sha512-sPQE1+nlsn6Hwb5t+HHwyy0A1FNCVKuL1192b+XNauMYWThz2kweiBVW1DqloRpVvZIJkIoHVB7XRpK78n1xbQ== karma-jasmine@~5.1.0: version "5.1.0" @@ -7815,10 +7815,10 @@ prelude-ls@^1.2.1: resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@^2.0.3: - version "2.8.8" - resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.4.2: + version "3.4.2" + resolved "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz#a5ce1fb522a588bf2b78ca44c6e6fe5aa5a2b13f" + integrity sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ== pretty-bytes@^5.3.0: version "5.6.0"