Skip to content

Commit 8cdb639

Browse files
authored
Merge pull request #330 from gtt-project/dkastl/issue329
Updates OpenLayers to v10
2 parents a824233 + 86473f9 commit 8cdb639

File tree

3 files changed

+63
-85
lines changed

3 files changed

+63
-85
lines changed

init.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
author_url 'https://github.com/georepublic'
99
url 'https://github.com/gtt-project/redmine_gtt'
1010
description 'Adds location-based task management and maps'
11-
version '5.1.0'
11+
version '5.1.2'
1212

1313
requires_redmine :version_or_higher => '5.0.0'
1414

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@
2525
"dompurify": "^3.1.6",
2626
"fontfaceobserver": "^2.3.0",
2727
"geojson": "^0.5.0",
28-
"ol": "^9.1.0",
29-
"ol-ext": "4.0.18",
30-
"ol-mapbox-style": "^12.3.4"
28+
"ol": "^10.1.0",
29+
"ol-ext": "^4.0.23",
30+
"ol-mapbox-style": "^12.3.5"
3131
},
3232
"devDependencies": {
3333
"@types/dompurify": "^3.0.5",
3434
"@types/fontfaceobserver": "^2.1.3",
3535
"@types/geojson": "^7946.0.14",
36-
"@types/google.maps": "^3.55.11",
36+
"@types/google.maps": "^3.55.12",
3737
"@types/jquery": "^3.5.30",
3838
"@types/jqueryui": "^1.12.23",
3939
"@types/ol-ext": "npm:@siedlerchr/types-ol-ext",
4040
"css-loader": "^7.1.2",
4141
"sass": "^1.77.8",
42-
"sass-loader": "^14.2.1",
42+
"sass-loader": "^16.0.1",
4343
"style-loader": "^4.0.0",
4444
"ts-loader": "^9.5.1",
45-
"typescript": "^5.5.3",
46-
"webpack": "^5.93.0",
45+
"typescript": "^5.5.4",
46+
"webpack": "^5.94.0",
4747
"webpack-cli": "^5.1.4"
4848
}
4949
}

yarn.lock

Lines changed: 55 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -116,27 +116,6 @@
116116
dependencies:
117117
"@types/trusted-types" "*"
118118

119-
"@types/eslint-scope@^3.7.3":
120-
version "3.7.4"
121-
resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"
122-
integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
123-
dependencies:
124-
"@types/eslint" "*"
125-
"@types/estree" "*"
126-
127-
"@types/eslint@*":
128-
version "8.37.0"
129-
resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz"
130-
integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==
131-
dependencies:
132-
"@types/estree" "*"
133-
"@types/json-schema" "*"
134-
135-
"@types/estree@*":
136-
version "1.0.1"
137-
resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz"
138-
integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
139-
140119
"@types/estree@^1.0.5":
141120
version "1.0.5"
142121
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -152,10 +131,10 @@
152131
resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
153132
integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
154133

155-
"@types/google.maps@^3.55.11":
156-
version "3.55.11"
157-
resolved "https://registry.yarnpkg.com/@types/google.maps/-/google.maps-3.55.11.tgz#a8227bfc30df54973dc7046b01f8eff5bb9fc63e"
158-
integrity sha512-F3VuPtjKj4UGuyym75pqmgPBOHbT/i7I6/D+4DdtSzbeu2aWZG1ENwpbZOd46uO+PSAz9flJEhxxi+b4MVb4gQ==
134+
"@types/google.maps@^3.55.12":
135+
version "3.55.12"
136+
resolved "https://registry.yarnpkg.com/@types/google.maps/-/google.maps-3.55.12.tgz#66b50be48533d116dddb3d705d277d06457735b0"
137+
integrity sha512-Q8MsLE+YYIrE1H8wdN69YHHAF8h7ApvF5MiMXh/zeCpP9Ut745mV9M0F4X4eobZ2WJe9k8tW2ryYjLa87IO2Sg==
159138

160139
"@types/jquery@*":
161140
version "3.5.16"
@@ -178,7 +157,7 @@
178157
dependencies:
179158
"@types/jquery" "*"
180159

181-
"@types/json-schema@*", "@types/json-schema@^7.0.8":
160+
"@types/json-schema@^7.0.8":
182161
version "7.0.11"
183162
resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
184163
integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -193,6 +172,11 @@
193172
resolved "https://registry.yarnpkg.com/@siedlerchr/types-ol-ext/-/types-ol-ext-3.4.0.tgz#e57292b89fc6b00226a751479c41e78d266c283a"
194173
integrity sha512-LtS9YNitiQ2UZV+RHVOS0Pehlkpcsp6qX9Sa2I33l4ZNqFCRB0T8YefGj0Se4SP8cPr1jc9+q1UU86BjFpg8ww==
195174

175+
"@types/rbush@^3.0.3":
176+
version "3.0.4"
177+
resolved "https://registry.yarnpkg.com/@types/rbush/-/rbush-3.0.4.tgz#265d84ec76dc48e464e95ae4f58e085f28f0a227"
178+
integrity sha512-knSt9cCW8jj1ZSFcFeBZaX++OucmfPxxHiRwTahZfJlnQsek7O0bazTJHWD2RVj9LEoejUYF2de3/stf+QXcXw==
179+
196180
"@types/sizzle@*":
197181
version "2.3.3"
198182
resolved "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"
@@ -548,10 +532,10 @@ dompurify@^3.1.6:
548532
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.6.tgz#43c714a94c6a7b8801850f82e756685300a027e2"
549533
integrity sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==
550534

551-
earcut@^2.2.3:
552-
version "2.2.4"
553-
resolved "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz"
554-
integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==
535+
earcut@^3.0.0:
536+
version "3.0.0"
537+
resolved "https://registry.yarnpkg.com/earcut/-/earcut-3.0.0.tgz#a8d5bf891224eaea8287201b5e787c6c0318af89"
538+
integrity sha512-41Fs7Q/PLq1SDbqjsgcY7GA42T0jvaCNGXgGtsNdvg+Yv8eIu06bxv4/PoREkZ9nMDNwnUSG9OFB9+yv8eKhDg==
555539

556540
electron-to-chromium@^1.4.648:
557541
version "1.4.659"
@@ -566,10 +550,10 @@ enhanced-resolve@^5.0.0:
566550
graceful-fs "^4.2.4"
567551
tapable "^2.2.0"
568552

569-
enhanced-resolve@^5.17.0:
570-
version "5.17.0"
571-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5"
572-
integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==
553+
enhanced-resolve@^5.17.1:
554+
version "5.17.1"
555+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
556+
integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
573557
dependencies:
574558
graceful-fs "^4.2.4"
575559
tapable "^2.2.0"
@@ -716,11 +700,6 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
716700
resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
717701
integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
718702

719-
ieee754@^1.1.12:
720-
version "1.2.1"
721-
resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
722-
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
723-
724703
immutable@^4.0.0:
725704
version "4.3.0"
726705
resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"
@@ -895,30 +874,31 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
895874
resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
896875
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
897876

898-
899-
version "4.0.18"
900-
resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.18.tgz#87e68566bae1a7821e3a1af8b7019409ce922324"
901-
integrity sha512-zzeTAoCg9IocaM7LlXiLNnVCgVmfxxLzlDTWvYn3Y2gFxtICHSfRrIQl/8vumgBjftBksVl1Fds8P5uFReTmew==
877+
ol-ext@^4.0.23:
878+
version "4.0.23"
879+
resolved "https://registry.yarnpkg.com/ol-ext/-/ol-ext-4.0.23.tgz#13b405451f7696ce4d0a6bd466ce5b6b69786c1b"
880+
integrity sha512-g1TBIEC9je2SoPx0qz8w4emCIRcOhz87eYxeszoLSWm6HMAbCQcymjmEIqpOHxL+R9BVKs4ar5KJShobv6510g==
902881

903-
ol-mapbox-style@^12.3.4:
904-
version "12.3.4"
905-
resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-12.3.4.tgz#ecdc544f8f5c9a27b7b84710ba39145a27e22c08"
906-
integrity sha512-TxGJZw4hmvc6n5dHSyAE8ZpgALJ6hVG5Q9yl0j2Q1KmLS9iq4wMpb383TAitWiG86SvJV4oDkWMGkyyMLfVyew==
882+
ol-mapbox-style@^12.3.5:
883+
version "12.3.5"
884+
resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-12.3.5.tgz#8653890ce9f1ee2c0fc98cad6857bd0ca1e64628"
885+
integrity sha512-1tdq+jpzJ7BuqCeRpNV5u90X369MXDbHKpPPt0BNpbzi+4UEJ2dJIrd3eFQV9VbqvZeEIioEjyK7qOqXsUZs8w==
907886
dependencies:
908887
"@mapbox/mapbox-gl-style-spec" "^13.23.1"
909888
mapbox-to-css-font "^2.4.1"
910889

911-
ol@^9.1.0:
912-
version "9.1.0"
913-
resolved "https://registry.yarnpkg.com/ol/-/ol-9.1.0.tgz#738e9f17093f65dafe114b8a78c69f110f5d0220"
914-
integrity sha512-nDrkJ2tzZNpo/wzN/PpHV5zdxbnXZaFktoMaD2cFLEc6gCwlgLY21Yd8wnt/4FjaVYwLBnbN9USXSwIBGcyksQ==
890+
ol@^10.1.0:
891+
version "10.1.0"
892+
resolved "https://registry.yarnpkg.com/ol/-/ol-10.1.0.tgz#f163fc57585c454c149a87f201c207fe642d2f46"
893+
integrity sha512-/efepydpzhFoeczA9KAN5t7G0WpFhP46ZXEfSl6JbZ7ipQZ2axpkYB2qt0qcOUlPFYMt7/XQFApH652KB08tTg==
915894
dependencies:
895+
"@types/rbush" "^3.0.3"
916896
color-rgba "^3.0.0"
917897
color-space "^2.0.1"
918-
earcut "^2.2.3"
898+
earcut "^3.0.0"
919899
geotiff "^2.0.7"
920-
pbf "3.2.1"
921-
rbush "^3.0.1"
900+
pbf "4.0.1"
901+
rbush "^4.0.0"
922902

923903
p-limit@^2.2.0:
924904
version "2.3.0"
@@ -964,12 +944,11 @@ path-parse@^1.0.7:
964944
resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
965945
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
966946

967-
pbf@3.2.1:
968-
version "3.2.1"
969-
resolved "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz"
970-
integrity sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==
947+
pbf@4.0.1:
948+
version "4.0.1"
949+
resolved "https://registry.yarnpkg.com/pbf/-/pbf-4.0.1.tgz#ad9015e022b235dcdbe05fc468a9acadf483f0d4"
950+
integrity sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==
971951
dependencies:
972-
ieee754 "^1.1.12"
973952
resolve-protobuf-schema "^2.1.0"
974953

975954
picocolors@^1.0.0:
@@ -1066,10 +1045,10 @@ randombytes@^2.1.0:
10661045
dependencies:
10671046
safe-buffer "^5.1.0"
10681047

1069-
rbush@^3.0.1:
1070-
version "3.0.1"
1071-
resolved "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz"
1072-
integrity sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==
1048+
rbush@^4.0.0:
1049+
version "4.0.0"
1050+
resolved "https://registry.yarnpkg.com/rbush/-/rbush-4.0.0.tgz#0536f105aa9d6dc8c0f2be6363a09d474b41cad6"
1051+
integrity sha512-F5xw+166FYDZI6jEcz+sWEHL5/J+du3kQWkwqWrPKb6iVoLPZh+2KhTS4OoYqrw1v/RO1xQe6WsLwBvrUAlvXw==
10731052
dependencies:
10741053
quickselect "^2.0.0"
10751054

@@ -1125,10 +1104,10 @@ safe-buffer@^5.1.0:
11251104
resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
11261105
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
11271106

1128-
sass-loader@^14.2.1:
1129-
version "14.2.1"
1130-
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.1.tgz#db9ad96b56dc1c1ea546101e76375d5b008fec70"
1131-
integrity sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==
1107+
sass-loader@^16.0.1:
1108+
version "16.0.1"
1109+
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.1.tgz#57049c1787076e923b21a1dccc612546ecaf4295"
1110+
integrity sha512-xACl1ToTsKnL9Ce5yYpRxrLj9QUDCnwZNhzpC7tKiFyA8zXsd3Ap+HGVnbCgkdQcm43E+i6oKAWBsvGA6ZoiMw==
11321111
dependencies:
11331112
neo-async "^2.6.2"
11341113

@@ -1308,10 +1287,10 @@ ts-loader@^9.5.1:
13081287
semver "^7.3.4"
13091288
source-map "^0.7.4"
13101289

1311-
typescript@^5.5.3:
1312-
version "5.5.3"
1313-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.3.tgz#e1b0a3c394190838a0b168e771b0ad56a0af0faa"
1314-
integrity sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==
1290+
typescript@^5.5.4:
1291+
version "5.5.4"
1292+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
1293+
integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
13151294

13161295
update-browserslist-db@^1.0.13:
13171296
version "1.0.13"
@@ -1378,12 +1357,11 @@ webpack-sources@^3.2.3:
13781357
resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
13791358
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
13801359

1381-
webpack@^5.93.0:
1382-
version "5.93.0"
1383-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
1384-
integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
1360+
webpack@^5.94.0:
1361+
version "5.94.0"
1362+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
1363+
integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
13851364
dependencies:
1386-
"@types/eslint-scope" "^3.7.3"
13871365
"@types/estree" "^1.0.5"
13881366
"@webassemblyjs/ast" "^1.12.1"
13891367
"@webassemblyjs/wasm-edit" "^1.12.1"
@@ -1392,7 +1370,7 @@ webpack@^5.93.0:
13921370
acorn-import-attributes "^1.9.5"
13931371
browserslist "^4.21.10"
13941372
chrome-trace-event "^1.0.2"
1395-
enhanced-resolve "^5.17.0"
1373+
enhanced-resolve "^5.17.1"
13961374
es-module-lexer "^1.2.1"
13971375
eslint-scope "5.1.1"
13981376
events "^3.2.0"

0 commit comments

Comments
 (0)