diff --git a/package.json b/package.json index d1d601f18..e842de5c9 100644 --- a/package.json +++ b/package.json @@ -3,64 +3,67 @@ "repository": "https://github.com/liqd/euth_wagtail.git", "dependencies": { "@fortawesome/fontawesome-free": "5.15.4", + "@maplibre/maplibre-gl-leaflet": "0.0.19", "adhocracy4": "github:liqd/adhocracy4#opin-v2302", - "bootstrap": "5.1.3", - "css-loader": "6.7.1", + "bootstrap": "5.2.3", + "css-loader": "6.7.3", "datepicker": "git+https://github.com/liqd/datePicker.git", "flatpickr": "4.6.13", "immutability-helper": "3.1.1", - "jquery": "3.6.1", + "jquery": "3.6.3", "js-cookie": "3.0.1", "leaflet": "1.9.3", "leaflet-draw": "1.0.4", "leaflet.markercluster": "github:liqd/Leaflet.markercluster#5ed89b26922c51083fc9632a2c01425b9261a0f5", - "mapbox-gl": "1.13.2", - "mapbox-gl-leaflet": "0.0.15", - "mini-css-extract-plugin": "2.6.1", - "node-sass": "^7.0.3", + "maplibre-gl": "2.4.0", + "maplibregl-mapbox-request-transformer": "0.0.2", + "mini-css-extract-plugin": "2.7.2", "path-browserify": "1.0.1", - "popper": "^1.0.1", "postcss-loader": "7.0.2", "prop-types": "15.8.1", - "react-flip-move": "3.0.4", - "react-popper": "^2.3.0", - "react-slick": "^0.29.0", - "sass-loader": "12.6.0", + "react": "18.2.0", + "react-dom": "^18.2.0", + "react-flip-move": "3.0.5", + "react-markdown": "8.0.4", + "react-router-dom": "6.8.1", + "react-slick": "0.29.0", + "sass": "1.58.0", + "sass-loader": "13.2.0", "slick-carousel": "git+https://github.com/liqd/slick#pm-2019-07-overwrites", "terser-webpack-plugin": "5.3.3", "typeahead.js": "0.11.1" }, "devDependencies": { "@babel/compat-data": "7.17.10", - "@babel/core": "7.18.2", - "@babel/eslint-parser": "7.18.2", - "@babel/plugin-transform-modules-commonjs": "7.18.2", - "@babel/plugin-transform-runtime": "7.18.2", - "@babel/preset-env": "7.18.2", - "@babel/preset-react": "7.17.12", + "@babel/core": "7.20.12", + "@babel/eslint-parser": "7.19.1", + "@babel/plugin-transform-modules-commonjs": "7.20.11", + "@babel/plugin-transform-runtime": "7.19.6", + "@babel/preset-env": "7.20.2", + "@babel/preset-react": "7.18.6", "@babel/runtime": "7.18.3", "autoprefixer": "10.4.13", - "babel-loader": "8.2.5", + "babel-loader": "9.1.2", "copy-webpack-plugin": "11.0.0", - "eslint": "8.16.0", + "eslint": "8.34.0", "eslint-config-standard": "17.0.0", "eslint-config-standard-jsx": "11.0.0", - "eslint-plugin-import": "2.26.0", - "eslint-plugin-jsx-a11y": "6.5.1", + "eslint-plugin-import": "2.27.5", + "eslint-plugin-jsx-a11y": "6.7.1", "eslint-plugin-n": "15.6.1", "eslint-plugin-node": "11.1.0", - "eslint-plugin-promise": "6.0.0", - "eslint-plugin-react": "7.30.0", + "eslint-plugin-promise": "6.1.1", + "eslint-plugin-react": "7.32.2", "eslint-plugin-standard": "4.1.0", - "husky": "7.0.4", + "husky": "8.0.3", "lint-staged": "12.5.0", "markdownlint-cli": "0.31.1", "postcss": "8.4.21", - "stylelint": "14.8.5", - "stylelint-config-standard-scss": "3.0.0", - "stylelint-declaration-strict-value": "1.8.0", - "webpack": "5.72.1", - "webpack-cli": "4.9.2", + "stylelint": "14.16.1", + "stylelint-config-standard-scss": "6.1.0", + "stylelint-declaration-strict-value": "1.9.1", + "webpack": "5.75.0", + "webpack-cli": "5.0.1", "webpack-merge": "5.8.0" }, "license": "AGPL-3.0+", diff --git a/renovate.json b/renovate.json index b5deb6111..844e3a3c3 100644 --- a/renovate.json +++ b/renovate.json @@ -25,10 +25,6 @@ "packagePatterns": ["^eslint"], "groupName": "eslint packages" }, - { - "matchPackageNames": ["mapbox-gl"], - "enabled": false - }, { "matchPackageNames": ["Django"], "allowedVersions": "=3.2" diff --git a/webpack.common.js b/webpack.common.js index 4167541d5..2e913cb1e 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -72,7 +72,7 @@ module.exports = { a4maps_display_point: { import: [ 'leaflet/dist/leaflet.css', - 'mapbox-gl/dist/mapbox-gl.css', + 'maplibre-gl/dist/maplibre-gl.css', 'adhocracy4/adhocracy4/maps/static/a4maps/a4maps_display_point.js' ], dependOn: 'adhocracy4' @@ -80,7 +80,7 @@ module.exports = { a4maps_display_points: { import: [ 'leaflet/dist/leaflet.css', - 'mapbox-gl/dist/mapbox-gl.css', + 'maplibre-gl/dist/maplibre-gl.css', 'leaflet.markercluster/dist/MarkerCluster.css', 'adhocracy4/adhocracy4/maps/static/a4maps/a4maps_display_points.js' ], @@ -89,7 +89,7 @@ module.exports = { a4maps_choose_point: { import: [ 'leaflet/dist/leaflet.css', - 'mapbox-gl/dist/mapbox-gl.css', + 'maplibre-gl/dist/maplibre-gl.css', 'adhocracy4/adhocracy4/maps/static/a4maps/a4maps_choose_point.js' ], dependOn: 'adhocracy4' @@ -97,7 +97,7 @@ module.exports = { a4maps_choose_polygon: { import: [ 'leaflet/dist/leaflet.css', - 'mapbox-gl/dist/mapbox-gl.css', + 'maplibre-gl/dist/maplibre-gl.css', 'leaflet-draw/dist/leaflet.draw.css', 'adhocracy4/adhocracy4/maps/static/a4maps/a4maps_choose_polygon.js' ],