From c7e2573f62659ecb38bb4c395ced28038bb10128 Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Tue, 9 Jul 2024 10:06:47 +0900 Subject: [PATCH 01/12] chore: Update npm dependencies to latest versions Signed-off-by: Daniel Kastl --- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 34824b1..1253ee4 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,11 @@ "dependencies": { "@juggle/resize-observer": "^3.4.0", "@mdi/font": "^7.4.47", - "dompurify": "^3.1.5", + "dompurify": "^3.1.6", "fontfaceobserver": "^2.3.0", "geojson": "^0.5.0", "ol": "^9.1.0", - "ol-ext": "^4.0.15", + "ol-ext": "^4.0.19", "ol-mapbox-style": "^12.3.4" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 458f9e9..9eacdac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -543,10 +543,10 @@ cssesc@^3.0.0: resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -dompurify@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.5.tgz#2c6a113fc728682a0f55684b1388c58ddb79dc38" - integrity sha512-lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA== +dompurify@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.6.tgz#43c714a94c6a7b8801850f82e756685300a027e2" + integrity sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ== earcut@^2.2.3: version "2.2.4" @@ -895,10 +895,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -ol-ext@^4.0.15: - version "4.0.18" - resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.18.tgz#87e68566bae1a7821e3a1af8b7019409ce922324" - integrity sha512-zzeTAoCg9IocaM7LlXiLNnVCgVmfxxLzlDTWvYn3Y2gFxtICHSfRrIQl/8vumgBjftBksVl1Fds8P5uFReTmew== +ol-ext@^4.0.19: + version "4.0.19" + resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.19.tgz#774d368b82791f59ebda44c08d038ca3eb54afff" + integrity sha512-QMhmys/ux7eYKZFtca6CeK+l9YgZb5yL5hHFJLKkiObw/qz6xKu+gy+SSnF/QyvJbfAJDleuFHf2mqkYqC9hZQ== ol-mapbox-style@^12.3.4: version "12.3.4" From 452f369e666e5d6804f30f32838d7bff846bab9f Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Fri, 19 Jul 2024 14:17:53 +0900 Subject: [PATCH 02/12] chore: Update npm dependencies to latest versions Signed-off-by: Daniel Kastl --- package.json | 6 +++--- yarn.lock | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 1253ee4..d0b339e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "fontfaceobserver": "^2.3.0", "geojson": "^0.5.0", "ol": "^9.1.0", - "ol-ext": "^4.0.19", + "ol-ext": "^4.0.21", "ol-mapbox-style": "^12.3.4" }, "devDependencies": { @@ -38,12 +38,12 @@ "@types/jqueryui": "^1.12.23", "@types/ol-ext": "npm:@siedlerchr/types-ol-ext", "css-loader": "^7.1.2", - "sass": "^1.77.6", + "sass": "^1.77.8", "sass-loader": "^14.2.1", "style-loader": "^4.0.0", "ts-loader": "^9.5.1", "typescript": "^5.5.3", - "webpack": "^5.92.1", + "webpack": "^5.93.0", "webpack-cli": "^5.1.4" } } diff --git a/yarn.lock b/yarn.lock index 9eacdac..a5e134f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -895,10 +895,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -ol-ext@^4.0.19: - version "4.0.19" - resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.19.tgz#774d368b82791f59ebda44c08d038ca3eb54afff" - integrity sha512-QMhmys/ux7eYKZFtca6CeK+l9YgZb5yL5hHFJLKkiObw/qz6xKu+gy+SSnF/QyvJbfAJDleuFHf2mqkYqC9hZQ== +ol-ext@^4.0.21: + version "4.0.21" + resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.21.tgz#78ba613d1b95e66629c3ce252da6f8367ba0f3eb" + integrity sha512-xP4oVD5KBvJW6P9UQwmPcgqMDh6nzUrHjle4qhNqzRW7OkP02mObw5UMGAgz+uhIW8doJ3hYCwy2HcpU1JFpig== ol-mapbox-style@^12.3.4: version "12.3.4" @@ -1132,10 +1132,10 @@ sass-loader@^14.2.1: dependencies: neo-async "^2.6.2" -sass@^1.77.6: - version "1.77.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4" - integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q== +sass@^1.77.8: + version "1.77.8" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd" + integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -1378,10 +1378,10 @@ webpack-sources@^3.2.3: resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.92.1: - version "5.92.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.92.1.tgz#eca5c1725b9e189cffbd86e8b6c3c7400efc5788" - integrity sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA== +webpack@^5.93.0: + version "5.93.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" + integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" From 5b4914e3b29bb3091eecd81a54d2cda62a270d21 Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Tue, 9 Jul 2024 10:06:47 +0900 Subject: [PATCH 03/12] chore: Update npm dependencies to latest versions Signed-off-by: Daniel Kastl --- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 34824b1..1253ee4 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,11 @@ "dependencies": { "@juggle/resize-observer": "^3.4.0", "@mdi/font": "^7.4.47", - "dompurify": "^3.1.5", + "dompurify": "^3.1.6", "fontfaceobserver": "^2.3.0", "geojson": "^0.5.0", "ol": "^9.1.0", - "ol-ext": "^4.0.15", + "ol-ext": "^4.0.19", "ol-mapbox-style": "^12.3.4" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 8f5c1c9..da27eba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -543,10 +543,10 @@ cssesc@^3.0.0: resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -dompurify@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.5.tgz#2c6a113fc728682a0f55684b1388c58ddb79dc38" - integrity sha512-lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA== +dompurify@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.6.tgz#43c714a94c6a7b8801850f82e756685300a027e2" + integrity sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ== earcut@^2.2.3: version "2.2.4" @@ -900,10 +900,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -ol-ext@^4.0.15: - version "4.0.18" - resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.18.tgz#87e68566bae1a7821e3a1af8b7019409ce922324" - integrity sha512-zzeTAoCg9IocaM7LlXiLNnVCgVmfxxLzlDTWvYn3Y2gFxtICHSfRrIQl/8vumgBjftBksVl1Fds8P5uFReTmew== +ol-ext@^4.0.19: + version "4.0.19" + resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.19.tgz#774d368b82791f59ebda44c08d038ca3eb54afff" + integrity sha512-QMhmys/ux7eYKZFtca6CeK+l9YgZb5yL5hHFJLKkiObw/qz6xKu+gy+SSnF/QyvJbfAJDleuFHf2mqkYqC9hZQ== ol-mapbox-style@^12.3.4: version "12.3.4" From 6e4dfad0628c46d7e6eec4a94733a6eda4f8c148 Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Fri, 19 Jul 2024 14:17:53 +0900 Subject: [PATCH 04/12] chore: Update npm dependencies to latest versions Signed-off-by: Daniel Kastl --- package.json | 6 +++--- yarn.lock | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 1253ee4..d0b339e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "fontfaceobserver": "^2.3.0", "geojson": "^0.5.0", "ol": "^9.1.0", - "ol-ext": "^4.0.19", + "ol-ext": "^4.0.21", "ol-mapbox-style": "^12.3.4" }, "devDependencies": { @@ -38,12 +38,12 @@ "@types/jqueryui": "^1.12.23", "@types/ol-ext": "npm:@siedlerchr/types-ol-ext", "css-loader": "^7.1.2", - "sass": "^1.77.6", + "sass": "^1.77.8", "sass-loader": "^14.2.1", "style-loader": "^4.0.0", "ts-loader": "^9.5.1", "typescript": "^5.5.3", - "webpack": "^5.92.1", + "webpack": "^5.93.0", "webpack-cli": "^5.1.4" } } diff --git a/yarn.lock b/yarn.lock index da27eba..66012a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -900,10 +900,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -ol-ext@^4.0.19: - version "4.0.19" - resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.19.tgz#774d368b82791f59ebda44c08d038ca3eb54afff" - integrity sha512-QMhmys/ux7eYKZFtca6CeK+l9YgZb5yL5hHFJLKkiObw/qz6xKu+gy+SSnF/QyvJbfAJDleuFHf2mqkYqC9hZQ== +ol-ext@^4.0.21: + version "4.0.21" + resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.21.tgz#78ba613d1b95e66629c3ce252da6f8367ba0f3eb" + integrity sha512-xP4oVD5KBvJW6P9UQwmPcgqMDh6nzUrHjle4qhNqzRW7OkP02mObw5UMGAgz+uhIW8doJ3hYCwy2HcpU1JFpig== ol-mapbox-style@^12.3.4: version "12.3.4" @@ -1137,10 +1137,10 @@ sass-loader@^14.2.1: dependencies: neo-async "^2.6.2" -sass@^1.77.6: - version "1.77.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4" - integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q== +sass@^1.77.8: + version "1.77.8" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd" + integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -1383,10 +1383,10 @@ webpack-sources@^3.2.3: resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.92.1: - version "5.92.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.92.1.tgz#eca5c1725b9e189cffbd86e8b6c3c7400efc5788" - integrity sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA== +webpack@^5.93.0: + version "5.93.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" + integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" From 6b0928643a84c8f41ad8635a28bab15a493b510e Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Mon, 29 Jul 2024 12:50:26 +0200 Subject: [PATCH 05/12] Update npm dependencies to latest versions Signed-off-by: Daniel Kastl --- package.json | 6 +++--- yarn.lock | 29 ++++++++++++----------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index d0b339e..7d0eac2 100644 --- a/package.json +++ b/package.json @@ -33,16 +33,16 @@ "@types/dompurify": "^3.0.5", "@types/fontfaceobserver": "^2.1.3", "@types/geojson": "^7946.0.14", - "@types/google.maps": "^3.55.11", + "@types/google.maps": "^3.55.12", "@types/jquery": "^3.5.30", "@types/jqueryui": "^1.12.23", "@types/ol-ext": "npm:@siedlerchr/types-ol-ext", "css-loader": "^7.1.2", "sass": "^1.77.8", - "sass-loader": "^14.2.1", + "sass-loader": "^16.0.0", "style-loader": "^4.0.0", "ts-loader": "^9.5.1", - "typescript": "^5.5.3", + "typescript": "^5.5.4", "webpack": "^5.93.0", "webpack-cli": "^5.1.4" } diff --git a/yarn.lock b/yarn.lock index 66012a6..82efdab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -152,10 +152,10 @@ resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613" integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg== -"@types/google.maps@^3.55.11": - version "3.55.11" - resolved "https://registry.yarnpkg.com/@types/google.maps/-/google.maps-3.55.11.tgz#a8227bfc30df54973dc7046b01f8eff5bb9fc63e" - integrity sha512-F3VuPtjKj4UGuyym75pqmgPBOHbT/i7I6/D+4DdtSzbeu2aWZG1ENwpbZOd46uO+PSAz9flJEhxxi+b4MVb4gQ== +"@types/google.maps@^3.55.12": + version "3.55.12" + resolved "https://registry.yarnpkg.com/@types/google.maps/-/google.maps-3.55.12.tgz#66b50be48533d116dddb3d705d277d06457735b0" + integrity sha512-Q8MsLE+YYIrE1H8wdN69YHHAF8h7ApvF5MiMXh/zeCpP9Ut745mV9M0F4X4eobZ2WJe9k8tW2ryYjLa87IO2Sg== "@types/jquery@*": version "3.5.16" @@ -634,11 +634,6 @@ fastest-levenshtein@^1.0.12: resolved "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz" integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== -fflate@^0.4.8: - version "0.4.8" - resolved "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz" - integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA== - fill-range@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" @@ -1130,10 +1125,10 @@ safe-buffer@^5.1.0: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -sass-loader@^14.2.1: - version "14.2.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.1.tgz#db9ad96b56dc1c1ea546101e76375d5b008fec70" - integrity sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ== +sass-loader@^16.0.0: + version "16.0.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.0.tgz#9b8d497e24bc176dc368df2b5b9e90b4ad24bf4e" + integrity sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw== dependencies: neo-async "^2.6.2" @@ -1313,10 +1308,10 @@ ts-loader@^9.5.1: semver "^7.3.4" source-map "^0.7.4" -typescript@^5.5.3: - version "5.5.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.3.tgz#e1b0a3c394190838a0b168e771b0ad56a0af0faa" - integrity sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ== +typescript@^5.5.4: + version "5.5.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba" + integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== update-browserslist-db@^1.0.13: version "1.0.13" From 8df44e042d435250b74d13befcb66b8d9fb04e6d Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Mon, 29 Jul 2024 16:18:52 +0200 Subject: [PATCH 06/12] Update ol dependencies to latest version, downgrades ol-ext Signed-off-by: Daniel Kastl --- package.json | 4 ++-- yarn.lock | 52 +++++++++++++++++++++++----------------------------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 7d0eac2..d1d9a9f 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "dompurify": "^3.1.6", "fontfaceobserver": "^2.3.0", "geojson": "^0.5.0", - "ol": "^9.1.0", - "ol-ext": "^4.0.21", + "ol": "^10.0.0", + "ol-ext": "4.0.18", "ol-mapbox-style": "^12.3.4" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 82efdab..873b7fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -548,10 +548,10 @@ dompurify@^3.1.6: resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.6.tgz#43c714a94c6a7b8801850f82e756685300a027e2" integrity sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ== -earcut@^2.2.3: - version "2.2.4" - resolved "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz" - integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== +earcut@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/earcut/-/earcut-3.0.0.tgz#a8d5bf891224eaea8287201b5e787c6c0318af89" + integrity sha512-41Fs7Q/PLq1SDbqjsgcY7GA42T0jvaCNGXgGtsNdvg+Yv8eIu06bxv4/PoREkZ9nMDNwnUSG9OFB9+yv8eKhDg== electron-to-chromium@^1.4.648: version "1.4.659" @@ -716,11 +716,6 @@ icss-utils@^5.0.0, icss-utils@^5.1.0: resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -ieee754@^1.1.12: - version "1.2.1" - resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - immutable@^4.0.0: version "4.3.0" resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz" @@ -895,10 +890,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -ol-ext@^4.0.21: - version "4.0.21" - resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.21.tgz#78ba613d1b95e66629c3ce252da6f8367ba0f3eb" - integrity sha512-xP4oVD5KBvJW6P9UQwmPcgqMDh6nzUrHjle4qhNqzRW7OkP02mObw5UMGAgz+uhIW8doJ3hYCwy2HcpU1JFpig== +ol-ext@4.0.18: + version "4.0.18" + resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.18.tgz#87e68566bae1a7821e3a1af8b7019409ce922324" + integrity sha512-zzeTAoCg9IocaM7LlXiLNnVCgVmfxxLzlDTWvYn3Y2gFxtICHSfRrIQl/8vumgBjftBksVl1Fds8P5uFReTmew== ol-mapbox-style@^12.3.4: version "12.3.4" @@ -908,17 +903,17 @@ ol-mapbox-style@^12.3.4: "@mapbox/mapbox-gl-style-spec" "^13.23.1" mapbox-to-css-font "^2.4.1" -ol@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/ol/-/ol-9.1.0.tgz#738e9f17093f65dafe114b8a78c69f110f5d0220" - integrity sha512-nDrkJ2tzZNpo/wzN/PpHV5zdxbnXZaFktoMaD2cFLEc6gCwlgLY21Yd8wnt/4FjaVYwLBnbN9USXSwIBGcyksQ== +ol@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/ol/-/ol-10.0.0.tgz#2d37ca13a18375b20b873a4264d69feda3936d8d" + integrity sha512-Gzfh61cQAxseCWL97VpGwbF91R2D69y3ABUewTl2H1Hjy6ipCtnoKshgO+n3WBrjsbsyS8QnkfmiJZNQGQNeOA== dependencies: color-rgba "^3.0.0" color-space "^2.0.1" - earcut "^2.2.3" + earcut "^3.0.0" geotiff "^2.0.7" - pbf "3.2.1" - rbush "^3.0.1" + pbf "4.0.1" + rbush "^4.0.0" p-limit@^2.2.0: version "2.3.0" @@ -964,12 +959,11 @@ path-parse@^1.0.7: resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -pbf@3.2.1: - version "3.2.1" - resolved "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz" - integrity sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ== +pbf@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pbf/-/pbf-4.0.1.tgz#ad9015e022b235dcdbe05fc468a9acadf483f0d4" + integrity sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA== dependencies: - ieee754 "^1.1.12" resolve-protobuf-schema "^2.1.0" picocolors@^1.0.0: @@ -1066,10 +1060,10 @@ randombytes@^2.1.0: dependencies: safe-buffer "^5.1.0" -rbush@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz" - integrity sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w== +rbush@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/rbush/-/rbush-4.0.0.tgz#0536f105aa9d6dc8c0f2be6363a09d474b41cad6" + integrity sha512-F5xw+166FYDZI6jEcz+sWEHL5/J+du3kQWkwqWrPKb6iVoLPZh+2KhTS4OoYqrw1v/RO1xQe6WsLwBvrUAlvXw== dependencies: quickselect "^2.0.0" From d91131be62895e8a87193f16fc2d01777976fd88 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 9 Aug 2024 10:05:34 +0900 Subject: [PATCH 07/12] Limit ol-ext version to 4.0.18 and update yarn.lock --- package.json | 2 +- yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index d0b339e..0cc66d0 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "fontfaceobserver": "^2.3.0", "geojson": "^0.5.0", "ol": "^9.1.0", - "ol-ext": "^4.0.21", + "ol-ext": "4.0.18", "ol-mapbox-style": "^12.3.4" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 66012a6..3ab1998 100644 --- a/yarn.lock +++ b/yarn.lock @@ -634,11 +634,6 @@ fastest-levenshtein@^1.0.12: resolved "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz" integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== -fflate@^0.4.8: - version "0.4.8" - resolved "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz" - integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA== - fill-range@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" @@ -900,10 +895,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -ol-ext@^4.0.21: - version "4.0.21" - resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.21.tgz#78ba613d1b95e66629c3ce252da6f8367ba0f3eb" - integrity sha512-xP4oVD5KBvJW6P9UQwmPcgqMDh6nzUrHjle4qhNqzRW7OkP02mObw5UMGAgz+uhIW8doJ3hYCwy2HcpU1JFpig== +ol-ext@4.0.18: + version "4.0.18" + resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.18.tgz#87e68566bae1a7821e3a1af8b7019409ce922324" + integrity sha512-zzeTAoCg9IocaM7LlXiLNnVCgVmfxxLzlDTWvYn3Y2gFxtICHSfRrIQl/8vumgBjftBksVl1Fds8P5uFReTmew== ol-mapbox-style@^12.3.4: version "12.3.4" From 3d4d2d29772e85f71f9c6bfe1944469d8e603aa2 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 9 Aug 2024 11:28:40 +0900 Subject: [PATCH 08/12] Fix deface overrides for zeitwerk reload --- app/overrides/issues.rb | 33 --------------------------------- app/overrides/issues/index.rb | 15 +++++++++++++++ app/overrides/issues/show.rb | 15 +++++++++++++++ app/overrides/projects.rb | 17 ----------------- app/overrides/projects/show.rb | 15 +++++++++++++++ app/overrides/users.rb | 9 --------- app/overrides/users/show.rb | 7 +++++++ init.rb | 7 ++++--- 8 files changed, 56 insertions(+), 62 deletions(-) delete mode 100644 app/overrides/issues.rb create mode 100644 app/overrides/issues/index.rb create mode 100644 app/overrides/issues/show.rb delete mode 100644 app/overrides/projects.rb create mode 100644 app/overrides/projects/show.rb delete mode 100644 app/overrides/users.rb create mode 100644 app/overrides/users/show.rb diff --git a/app/overrides/issues.rb b/app/overrides/issues.rb deleted file mode 100644 index 83475e8..0000000 --- a/app/overrides/issues.rb +++ /dev/null @@ -1,33 +0,0 @@ -module Issues - Deface::Override.new( - :virtual_path => "issues/index", - :name => "deface_view_issues_index_map", - :insert_after => "h2", - :original => 'b807967c7184cb012c4bd5ccce90893349bc66e3', - :partial => "issues/index/map" - ) - - Deface::Override.new( - :virtual_path => "issues/index", - :name => "deface_view_issues_index_format_geojson", - :insert_after => "erb[loud]:contains('PDF')", - :original => '2b4102bf118f0a9866cf50477dce9cc7a78da6d5', - :partial => "issues/index/geojson" - ) - - Deface::Override.new( - :virtual_path => "issues/show", - :name => "deface_view_issues_show_map", - :insert_before => "div.attributes", - :original => 'c56981aa84b0fee66ff43ea773cf1444193a2862', - :partial => "issues/show/map" - ) - - Deface::Override.new( - :virtual_path => "issues/show", - :name => "deface_view_issues_show_format_geojson", - :insert_after => "erb[loud]:contains('PDF')", - :original => '1419e0dcba37f62ff95372d41d9b73845889d826', - :partial => "issues/show/geojson" - ) -end diff --git a/app/overrides/issues/index.rb b/app/overrides/issues/index.rb new file mode 100644 index 0000000..77dc401 --- /dev/null +++ b/app/overrides/issues/index.rb @@ -0,0 +1,15 @@ +Deface::Override.new( + :virtual_path => "issues/index", + :name => "deface_view_issues_index_map", + :insert_after => "h2", + :original => 'b807967c7184cb012c4bd5ccce90893349bc66e3', + :partial => "issues/index/map" +) + +Deface::Override.new( + :virtual_path => "issues/index", + :name => "deface_view_issues_index_format_geojson", + :insert_after => "erb[loud]:contains('PDF')", + :original => '2b4102bf118f0a9866cf50477dce9cc7a78da6d5', + :partial => "issues/index/geojson" +) diff --git a/app/overrides/issues/show.rb b/app/overrides/issues/show.rb new file mode 100644 index 0000000..b9b0a56 --- /dev/null +++ b/app/overrides/issues/show.rb @@ -0,0 +1,15 @@ +Deface::Override.new( + :virtual_path => "issues/show", + :name => "deface_view_issues_show_map", + :insert_before => "div.attributes", + :original => 'c56981aa84b0fee66ff43ea773cf1444193a2862', + :partial => "issues/show/map" +) + +Deface::Override.new( + :virtual_path => "issues/show", + :name => "deface_view_issues_show_format_geojson", + :insert_after => "erb[loud]:contains('PDF')", + :original => '1419e0dcba37f62ff95372d41d9b73845889d826', + :partial => "issues/show/geojson" +) diff --git a/app/overrides/projects.rb b/app/overrides/projects.rb deleted file mode 100644 index 2ec8baa..0000000 --- a/app/overrides/projects.rb +++ /dev/null @@ -1,17 +0,0 @@ -module Projects - Deface::Override.new( - :virtual_path => "projects/show", - :name => "deface_view_projects_show_map", - :insert_bottom => "div.splitcontentright", - :original => 'b939fb5ea208476399dbfb4b253dcff0ab1ace91', - :partial => "projects/show/map" - ) - - Deface::Override.new( - :virtual_path => "projects/show", - :name => "deface_view_projects_show_other_formats", - :insert_bottom => "div.splitcontentright", - :original => '1d2f0cb0b1439dddc34ac9c50b6b1b111fe702ce', - :partial => "projects/show/other_formats" - ) -end diff --git a/app/overrides/projects/show.rb b/app/overrides/projects/show.rb new file mode 100644 index 0000000..8a61320 --- /dev/null +++ b/app/overrides/projects/show.rb @@ -0,0 +1,15 @@ +Deface::Override.new( + :virtual_path => "projects/show", + :name => "deface_view_projects_show_map", + :insert_bottom => "div.splitcontentright", + :original => 'b939fb5ea208476399dbfb4b253dcff0ab1ace91', + :partial => "projects/show/map" +) + +Deface::Override.new( + :virtual_path => "projects/show", + :name => "deface_view_projects_show_other_formats", + :insert_bottom => "div.splitcontentright", + :original => '1d2f0cb0b1439dddc34ac9c50b6b1b111fe702ce', + :partial => "projects/show/other_formats" +) diff --git a/app/overrides/users.rb b/app/overrides/users.rb deleted file mode 100644 index 824cd4c..0000000 --- a/app/overrides/users.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Users - Deface::Override.new( - :virtual_path => "users/show", - :name => "deface_view_users_show_other_formats", - :insert_bottom => "div.splitcontentleft", - :original => 'abe916df0691ebe8848cfc0dde536abd3bfe39b8', - :partial => "users/show/other_formats" - ) -end diff --git a/app/overrides/users/show.rb b/app/overrides/users/show.rb new file mode 100644 index 0000000..1960a44 --- /dev/null +++ b/app/overrides/users/show.rb @@ -0,0 +1,7 @@ +Deface::Override.new( + :virtual_path => "users/show", + :name => "deface_view_users_show_other_formats", + :insert_bottom => "div.splitcontentleft", + :original => 'abe916df0691ebe8848cfc0dde536abd3bfe39b8', + :partial => "users/show/other_formats" +) diff --git a/init.rb b/init.rb index 4759cdb..fe8b1f5 100644 --- a/init.rb +++ b/init.rb @@ -58,9 +58,10 @@ end if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled? - require File.expand_path('../app/overrides/issues', __FILE__) - require File.expand_path('../app/overrides/projects', __FILE__) - require File.expand_path('../app/overrides/users', __FILE__) + Dir.glob("#{Rails.root}/plugins/redmine_gtt/app/overrides/**/*.rb").each do |path| + Rails.autoloaders.main.ignore(path) + load File.expand_path(path, __FILE__) + end RedmineGtt.setup_normal_patches Rails.application.config.after_initialize do RedmineGtt.setup_controller_patches From cd07727e950f7566128f715c83c0b1afbc57e0d7 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 9 Aug 2024 14:22:49 +0900 Subject: [PATCH 09/12] Use require instead of load to avoid reload issue --- init.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.rb b/init.rb index fe8b1f5..53dbac8 100644 --- a/init.rb +++ b/init.rb @@ -60,7 +60,7 @@ if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled? Dir.glob("#{Rails.root}/plugins/redmine_gtt/app/overrides/**/*.rb").each do |path| Rails.autoloaders.main.ignore(path) - load File.expand_path(path, __FILE__) + require path end RedmineGtt.setup_normal_patches Rails.application.config.after_initialize do From 07977d5e8ba7174a3769a40509d01f8032f81447 Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Tue, 13 Aug 2024 14:21:44 +0200 Subject: [PATCH 10/12] Update ol-ext dependency to version 4.0.22 Signed-off-by: Daniel Kastl --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d1d9a9f..64a1944 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "fontfaceobserver": "^2.3.0", "geojson": "^0.5.0", "ol": "^10.0.0", - "ol-ext": "4.0.18", + "ol-ext": "^4.0.22", "ol-mapbox-style": "^12.3.4" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 873b7fa..50cd847 100644 --- a/yarn.lock +++ b/yarn.lock @@ -890,10 +890,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -ol-ext@4.0.18: - version "4.0.18" - resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.18.tgz#87e68566bae1a7821e3a1af8b7019409ce922324" - integrity sha512-zzeTAoCg9IocaM7LlXiLNnVCgVmfxxLzlDTWvYn3Y2gFxtICHSfRrIQl/8vumgBjftBksVl1Fds8P5uFReTmew== +ol-ext@^4.0.22: + version "4.0.22" + resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.22.tgz#6cc5453df31e9ec7df0303749b969e5ad56a09a8" + integrity sha512-ljujTaJK3TX9jzjAqyDw9vl5WRGTMpNLfTS2GsFeKZqohByHb8OurvnOwGlJtQExnSHEjqyyqh9K57TYqxoRDA== ol-mapbox-style@^12.3.4: version "12.3.4" From 8dbd8500100b35f306e6f6519c91825ac93b6dcd Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Tue, 13 Aug 2024 14:21:59 +0200 Subject: [PATCH 11/12] Prepares for v5.1.2 Signed-off-by: Daniel Kastl --- init.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.rb b/init.rb index 53dbac8..86ec1fe 100644 --- a/init.rb +++ b/init.rb @@ -8,7 +8,7 @@ author_url 'https://github.com/georepublic' url 'https://github.com/gtt-project/redmine_gtt' description 'Adds location-based task management and maps' - version '5.1.0' + version '5.1.2' requires_redmine :version_or_higher => '5.0.0' From 86473f974d223fbd9282ababc0ce35fe6f7c7a33 Mon Sep 17 00:00:00 2001 From: Daniel Kastl Date: Thu, 29 Aug 2024 16:08:21 +0900 Subject: [PATCH 12/12] Update dependencies --- package.json | 10 +++---- yarn.lock | 80 +++++++++++++++++++++------------------------------- 2 files changed, 37 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 64a1944..a4d6ea4 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "dompurify": "^3.1.6", "fontfaceobserver": "^2.3.0", "geojson": "^0.5.0", - "ol": "^10.0.0", - "ol-ext": "^4.0.22", - "ol-mapbox-style": "^12.3.4" + "ol": "^10.1.0", + "ol-ext": "^4.0.23", + "ol-mapbox-style": "^12.3.5" }, "devDependencies": { "@types/dompurify": "^3.0.5", @@ -39,11 +39,11 @@ "@types/ol-ext": "npm:@siedlerchr/types-ol-ext", "css-loader": "^7.1.2", "sass": "^1.77.8", - "sass-loader": "^16.0.0", + "sass-loader": "^16.0.1", "style-loader": "^4.0.0", "ts-loader": "^9.5.1", "typescript": "^5.5.4", - "webpack": "^5.93.0", + "webpack": "^5.94.0", "webpack-cli": "^5.1.4" } } diff --git a/yarn.lock b/yarn.lock index 50cd847..c09ab55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -116,27 +116,6 @@ dependencies: "@types/trusted-types" "*" -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.37.0" - resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz" - integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "1.0.1" - resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz" - integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== - "@types/estree@^1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" @@ -178,7 +157,7 @@ dependencies: "@types/jquery" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.8": +"@types/json-schema@^7.0.8": version "7.0.11" resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== @@ -193,6 +172,11 @@ resolved "https://registry.yarnpkg.com/@siedlerchr/types-ol-ext/-/types-ol-ext-3.4.0.tgz#e57292b89fc6b00226a751479c41e78d266c283a" integrity sha512-LtS9YNitiQ2UZV+RHVOS0Pehlkpcsp6qX9Sa2I33l4ZNqFCRB0T8YefGj0Se4SP8cPr1jc9+q1UU86BjFpg8ww== +"@types/rbush@^3.0.3": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/rbush/-/rbush-3.0.4.tgz#265d84ec76dc48e464e95ae4f58e085f28f0a227" + integrity sha512-knSt9cCW8jj1ZSFcFeBZaX++OucmfPxxHiRwTahZfJlnQsek7O0bazTJHWD2RVj9LEoejUYF2de3/stf+QXcXw== + "@types/sizzle@*": version "2.3.3" resolved "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz" @@ -566,10 +550,10 @@ enhanced-resolve@^5.0.0: graceful-fs "^4.2.4" tapable "^2.2.0" -enhanced-resolve@^5.17.0: - version "5.17.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5" - integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA== +enhanced-resolve@^5.17.1: + version "5.17.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" + integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -890,24 +874,25 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -ol-ext@^4.0.22: - version "4.0.22" - resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.22.tgz#6cc5453df31e9ec7df0303749b969e5ad56a09a8" - integrity sha512-ljujTaJK3TX9jzjAqyDw9vl5WRGTMpNLfTS2GsFeKZqohByHb8OurvnOwGlJtQExnSHEjqyyqh9K57TYqxoRDA== +ol-ext@^4.0.23: + version "4.0.23" + resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.23.tgz#13b405451f7696ce4d0a6bd466ce5b6b69786c1b" + integrity sha512-g1TBIEC9je2SoPx0qz8w4emCIRcOhz87eYxeszoLSWm6HMAbCQcymjmEIqpOHxL+R9BVKs4ar5KJShobv6510g== -ol-mapbox-style@^12.3.4: - version "12.3.4" - resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-12.3.4.tgz#ecdc544f8f5c9a27b7b84710ba39145a27e22c08" - integrity sha512-TxGJZw4hmvc6n5dHSyAE8ZpgALJ6hVG5Q9yl0j2Q1KmLS9iq4wMpb383TAitWiG86SvJV4oDkWMGkyyMLfVyew== +ol-mapbox-style@^12.3.5: + version "12.3.5" + resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-12.3.5.tgz#8653890ce9f1ee2c0fc98cad6857bd0ca1e64628" + integrity sha512-1tdq+jpzJ7BuqCeRpNV5u90X369MXDbHKpPPt0BNpbzi+4UEJ2dJIrd3eFQV9VbqvZeEIioEjyK7qOqXsUZs8w== dependencies: "@mapbox/mapbox-gl-style-spec" "^13.23.1" mapbox-to-css-font "^2.4.1" -ol@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/ol/-/ol-10.0.0.tgz#2d37ca13a18375b20b873a4264d69feda3936d8d" - integrity sha512-Gzfh61cQAxseCWL97VpGwbF91R2D69y3ABUewTl2H1Hjy6ipCtnoKshgO+n3WBrjsbsyS8QnkfmiJZNQGQNeOA== +ol@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/ol/-/ol-10.1.0.tgz#f163fc57585c454c149a87f201c207fe642d2f46" + integrity sha512-/efepydpzhFoeczA9KAN5t7G0WpFhP46ZXEfSl6JbZ7ipQZ2axpkYB2qt0qcOUlPFYMt7/XQFApH652KB08tTg== dependencies: + "@types/rbush" "^3.0.3" color-rgba "^3.0.0" color-space "^2.0.1" earcut "^3.0.0" @@ -1119,10 +1104,10 @@ safe-buffer@^5.1.0: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -sass-loader@^16.0.0: - version "16.0.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.0.tgz#9b8d497e24bc176dc368df2b5b9e90b4ad24bf4e" - integrity sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw== +sass-loader@^16.0.1: + version "16.0.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.1.tgz#57049c1787076e923b21a1dccc612546ecaf4295" + integrity sha512-xACl1ToTsKnL9Ce5yYpRxrLj9QUDCnwZNhzpC7tKiFyA8zXsd3Ap+HGVnbCgkdQcm43E+i6oKAWBsvGA6ZoiMw== dependencies: neo-async "^2.6.2" @@ -1372,12 +1357,11 @@ webpack-sources@^3.2.3: resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.93.0: - version "5.93.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" - integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== +webpack@^5.94.0: + version "5.94.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" + integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== dependencies: - "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" "@webassemblyjs/ast" "^1.12.1" "@webassemblyjs/wasm-edit" "^1.12.1" @@ -1386,7 +1370,7 @@ webpack@^5.93.0: acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.0" + enhanced-resolve "^5.17.1" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0"