From c29a9669391474d228527a232d3673b2733e9e25 Mon Sep 17 00:00:00 2001 From: Danny Koppenhagen Date: Sat, 3 Aug 2024 20:02:29 +0200 Subject: [PATCH] feat: support OpenLayers@10 BREAKING CHANGE: A minimum version of OpenLayers 10 is now required. --- README.md | 4 ++-- docs/get-started.md | 4 ++-- package-lock.json | 44 ++++++++++++++++++++++---------------------- package.json | 17 +++++++++++------ 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 0853ef9..99cf3ca 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ It can display maps with tiled, raster or vector layers loaded from different so -- **[ol](https://openlayers.org/)**: `^9.1.0` +- **[ol](https://openlayers.org/)**: `^10.0.0` - **[ol-contextmenu](https://github.com/jonataswalker/ol-contextmenu)**: `^5.4.0` -- **[ol-ext](https://github.com/Viglino/ol-ext#,)**: `^4.0.15` +- **[ol-ext](https://github.com/Viglino/ol-ext#,)**: `^4.0.21` - **[vue](https://github.com/vuejs/core/tree/main/packages/vue#readme)**: `^3.4.0` diff --git a/docs/get-started.md b/docs/get-started.md index fd8a585..3ae0fcc 100644 --- a/docs/get-started.md +++ b/docs/get-started.md @@ -4,9 +4,9 @@ vue3-openlayers works with the following versions which must be installed as pee -- **[ol](https://openlayers.org/)**: `^9.1.0` +- **[ol](https://openlayers.org/)**: `^10.0.0` - **[ol-contextmenu](https://github.com/jonataswalker/ol-contextmenu)**: `^5.4.0` -- **[ol-ext](https://github.com/Viglino/ol-ext#,)**: `^4.0.15` +- **[ol-ext](https://github.com/Viglino/ol-ext#,)**: `^4.0.21` - **[vue](https://github.com/vuejs/core/tree/main/packages/vue#readme)**: `^3.4.0` diff --git a/package-lock.json b/package-lock.json index 30846b6..b404d6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,14 +11,14 @@ "dependencies": { "@turf/buffer": "^6.5.0", "@turf/helpers": "^6.5.0", - "dom-to-image-more": "^3.3.0", + "dom-to-image-more": "^3.3.1", "file-saver": "^2.0.5", "jspdf": "^2.5.1", - "ol": "^9.1.0", + "ol": "^10.0.0", "ol-contextmenu": "^5.4.0", - "ol-ext": "^4.0.15", + "ol-ext": "^4.0.21", "proj4": "^2.11.0", - "vue": "^3.4.0" + "vue": "^3.4.35" }, "devDependencies": { "@babel/eslint-parser": "^7.24.1", @@ -54,9 +54,9 @@ "node": ">=18.0.0" }, "peerDependencies": { - "ol": "^9.1.0", + "ol": "^10.0.0", "ol-contextmenu": "^5.4.0", - "ol-ext": "^4.0.15", + "ol-ext": "^4.0.21", "vue": "^3.4.0" } }, @@ -4556,9 +4556,9 @@ } }, "node_modules/earcut": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", - "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.0.tgz", + "integrity": "sha512-41Fs7Q/PLq1SDbqjsgcY7GA42T0jvaCNGXgGtsNdvg+Yv8eIu06bxv4/PoREkZ9nMDNwnUSG9OFB9+yv8eKhDg==" }, "node_modules/eastasianwidth": { "version": "0.2.0", @@ -5900,6 +5900,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -7377,16 +7378,16 @@ "dev": true }, "node_modules/ol": { - "version": "9.2.4", - "resolved": "https://registry.npmjs.org/ol/-/ol-9.2.4.tgz", - "integrity": "sha512-bsbu4ObaAlbELMIZWnYEvX4Z9jO+OyCBshtODhDKmqYTPEfnKOX3RieCr97tpJkqWTZvyV4tS9UQDvHoCdxS+A==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/ol/-/ol-10.0.0.tgz", + "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" }, "funding": { "type": "opencollective", @@ -7922,11 +7923,10 @@ } }, "node_modules/pbf": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", - "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz", + "integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==", "dependencies": { - "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" }, "bin": { @@ -8257,9 +8257,9 @@ } }, "node_modules/rbush": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz", - "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/rbush/-/rbush-4.0.0.tgz", + "integrity": "sha512-F5xw+166FYDZI6jEcz+sWEHL5/J+du3kQWkwqWrPKb6iVoLPZh+2KhTS4OoYqrw1v/RO1xQe6WsLwBvrUAlvXw==", "dependencies": { "quickselect": "^2.0.0" } diff --git a/package.json b/package.json index 3459606..276f78c 100644 --- a/package.json +++ b/package.json @@ -78,21 +78,26 @@ "dependencies": { "@turf/buffer": "^6.5.0", "@turf/helpers": "^6.5.0", - "dom-to-image-more": "^3.3.0", + "dom-to-image-more": "^3.3.1", "file-saver": "^2.0.5", "jspdf": "^2.5.1", - "ol": "^9.1.0", + "ol": "^10.0.0", "ol-contextmenu": "^5.4.0", - "ol-ext": "^4.0.15", + "ol-ext": "^4.0.21", "proj4": "^2.11.0", - "vue": "^3.4.0" + "vue": "^3.4.35" }, "peerDependencies": { - "ol": "^9.1.0", + "ol": "^10.0.0", "ol-contextmenu": "^5.4.0", - "ol-ext": "^4.0.15", + "ol-ext": "^4.0.21", "vue": "^3.4.0" }, + "overrides": { + "ol-contextmenu": { + "ol": "> 7.x <= 10.x" + } + }, "browserslist": [ "> 1%", "last 2 versions",