diff --git a/moped-editor/package-lock.json b/moped-editor/package-lock.json index 8cb9c5046a..54ed9c25d5 100644 --- a/moped-editor/package-lock.json +++ b/moped-editor/package-lock.json @@ -1,12 +1,12 @@ { "name": "atd-moped-editor", - "version": "2.6.0", + "version": "2.6.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "atd-moped-editor", - "version": "2.6.0", + "version": "2.6.1", "license": "CC0-1.0", "dependencies": { "@apollo/client": "^3.8.9", @@ -65,7 +65,6 @@ "react-scripts": "^5.0.1", "styled-components": "^5.3.11", "uuid": "^8.3.2", - "worker-loader": "^3.0.8", "yup": "^0.29.3" }, "devDependencies": { @@ -34386,25 +34385,6 @@ "workbox-core": "6.6.0" } }, - "node_modules/worker-loader": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz", - "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==", - "dependencies": { - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^4.0.0 || ^5.0.0" - } - }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/moped-editor/package.json b/moped-editor/package.json index 870fbbe827..8b02112abd 100644 --- a/moped-editor/package.json +++ b/moped-editor/package.json @@ -27,16 +27,18 @@ }, "browserslist": { "production": [ - ">0.3%", - "not ie 11", + ">0.2%", "not dead", - "not op_mini all" + "not op_mini all", + "not safari < 10", + "not chrome < 51", + "not android < 5", + "not ie < 12" ], "development": [ - ">0.3%", - "not ie 11", - "not dead", - "not op_mini all" + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" ] }, "dependencies": { @@ -96,7 +98,6 @@ "react-scripts": "^5.0.1", "styled-components": "^5.3.11", "uuid": "^8.3.2", - "worker-loader": "^3.0.8", "yup": "^0.29.3" }, "engines": { diff --git a/moped-editor/src/views/projects/projectView/ProjectComponents/TheMap.js b/moped-editor/src/views/projects/projectView/ProjectComponents/TheMap.js index 04ec8f7925..b4c4d14c0e 100644 --- a/moped-editor/src/views/projects/projectView/ProjectComponents/TheMap.js +++ b/moped-editor/src/views/projects/projectView/ProjectComponents/TheMap.js @@ -38,12 +38,6 @@ import { import { getClickedFeatureFromMap } from "./utils/onMapClick"; import { useHasMapLoaded } from "./utils/useHasMapLoaded"; -// See https://github.com/visgl/react-map-gl/issues/1266#issuecomment-753686953 -import mapboxgl from "mapbox-gl"; -mapboxgl.workerClass = - // eslint-disable-next-line import/no-webpack-loader-syntax - require("worker-loader!mapbox-gl/dist/mapbox-gl-csp-worker").default; - export default function TheMap({ projectComponents, allRelatedComponents, diff --git a/moped-editor/src/views/projects/projectView/ProjectSummary/ProjectSummaryMap.js b/moped-editor/src/views/projects/projectView/ProjectSummary/ProjectSummaryMap.js index c1a291720f..5079c5f026 100644 --- a/moped-editor/src/views/projects/projectView/ProjectSummary/ProjectSummaryMap.js +++ b/moped-editor/src/views/projects/projectView/ProjectSummary/ProjectSummaryMap.js @@ -53,7 +53,7 @@ const ProjectSummaryMap = ({ data }) => { ref={mapRef} initialViewState={initialViewState} style={{ width: "100%", height: "60vh" }} - mapStyle={basemaps.streets.mapStyle} + mapStyle={basemaps[basemapKey].mapStyle} {...mapParameters} cooperativeGestures={true} onLoad={onMapLoad}