weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update NPM dependencies.

Browse Source 
New versions of react and leaflet, along with a lot of other packages.
I'm hoping that the newest react-leaflet might let use solve the carrier
drag and drop issues in a less hacky way, since that's the cause of
https://github.com/dcs-liberation/dcs_liberation/issues/2388.
This commit is contained in:
Dan Albert 2022-09-27 22:01:19 -07:00
parent 6295f3fd71
commit c835cda5b6
3 changed files with 3607 additions and 2733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6276
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

50
client/package.json
View File

@ -6,28 +6,28 @@
"license": "LGPL-3.0-or-later", "license": "LGPL-3.0-or-later",
"homepage": ".", "homepage": ".",
"dependencies": { "dependencies": {
"@reduxjs/toolkit": "^1.7.2", "@reduxjs/toolkit": "^1.8.5",
"@testing-library/jest-dom": "^5.16.2", "@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.3", "@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^7.2.1", "@testing-library/user-event": "^14.4.3",
"@types/jest": "^27.4.1", "@types/jest": "^29.1.2",
"@types/node": "^12.20.46", "@types/node": "^18.8.3",
"@types/react": "^16.14.23", "@types/react": "^18.0.21",
"@types/react-dom": "^16.9.14", "@types/react-dom": "^18.0.6",
"@types/react-redux": "^7.1.22", "@types/react-redux": "^7.1.24",
"axios": "^0.26.0", "axios": "^1.1.2",
"electron-window-state": "^5.0.3", "electron-window-state": "^5.0.3",
"esri-leaflet": "^3.0.7", "esri-leaflet": "^3.0.8",
"leaflet": "^1.7.1", "leaflet": "^1.9.2",
"leaflet-ruler": "^1.0.0", "leaflet-ruler": "^1.0.0",
"milsymbol": "^2.0.0", "milsymbol": "^2.0.0",
"react": "^17.0.2", "react": "^18.2.0",
"react-dom": "^17.0.2", "react-dom": "^18.2.0",
"react-esri-leaflet": "^1.3.1", "react-esri-leaflet": "^2.0.1",
"react-leaflet": "^3.2.5", "react-leaflet": "^4.1.0",
"react-redux": "^7.2.6", "react-redux": "^8.0.4",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"typescript": "~4.1.5" "typescript": "~4.8.4"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
@ -61,17 +61,17 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"@rtk-query/codegen-openapi": "^1.0.0-alpha.1", "@rtk-query/codegen-openapi": "^1.0.0",
"@trivago/prettier-plugin-sort-imports": "^3.2.0", "@trivago/prettier-plugin-sort-imports": "^3.3.0",
"@types/leaflet": "^1.7.9", "@types/leaflet": "^1.8.0",
"@types/redux-logger": "^3.0.9", "@types/redux-logger": "^3.0.9",
"@types/websocket": "^1.0.5", "@types/websocket": "^1.0.5",
"electron": "^17.2.0", "electron": "^21.1.0",
"electron-is-dev": "^2.0.0", "electron-is-dev": "^2.0.0",
"generate-license-file": "^1.3.0", "generate-license-file": "^2.0.0",
"license-checker": "^25.0.1", "license-checker": "^25.0.1",
"react-scripts": "5.0.0", "react-scripts": "5.0.1",
"ts-node": "^10.7.0", "ts-node": "^10.9.1",
"wait-on": "^6.0.1" "wait-on": "^6.0.1"
} }
} }

14
client/src/components/liberationmap/LiberationMap.tsx
View File

@ -4,9 +4,12 @@ import AircraftLayer from "../aircraftlayer";
import AirDefenseRangeLayer from "../airdefenserangelayer"; import AirDefenseRangeLayer from "../airdefenserangelayer";
import CombatLayer from "../combatlayer"; import CombatLayer from "../combatlayer";
import ControlPointsLayer from "../controlpointslayer"; import ControlPointsLayer from "../controlpointslayer";
import CullingExclusionZones from "../cullingexclusionzones/CullingExclusionZones";
import FlightPlansLayer from "../flightplanslayer"; import FlightPlansLayer from "../flightplanslayer";
import FrontLinesLayer from "../frontlineslayer"; import FrontLinesLayer from "../frontlineslayer";
import Iadsnetworklayer from "../iadsnetworklayer";
import NavMeshLayer from "../navmesh/NavMeshLayer"; import NavMeshLayer from "../navmesh/NavMeshLayer";
import LeafletRuler from "../ruler/Ruler";
import SupplyRoutesLayer from "../supplyrouteslayer"; import SupplyRoutesLayer from "../supplyrouteslayer";
import TerrainZonesLayers from "../terrainzones/TerrainZonesLayers"; import TerrainZonesLayers from "../terrainzones/TerrainZonesLayers";
import TgosLayer from "../tgoslayer/TgosLayer"; import TgosLayer from "../tgoslayer/TgosLayer";
@ -17,22 +20,15 @@ import { Map } from "leaflet";
import { useEffect, useRef } from "react"; import { useEffect, useRef } from "react";
import { BasemapLayer } from "react-esri-leaflet"; import { BasemapLayer } from "react-esri-leaflet";
import { LayersControl, MapContainer, ScaleControl } from "react-leaflet"; import { LayersControl, MapContainer, ScaleControl } from "react-leaflet";
import Iadsnetworklayer from "../iadsnetworklayer";
import CullingExclusionZones from "../cullingexclusionzones/CullingExclusionZones"
import LeafletRuler from "../ruler/Ruler";
export default function LiberationMap() { export default function LiberationMap() {
const map = useRef<Map>(); const map = useRef<Map>(null);
const mapCenter = useAppSelector(selectMapCenter); const mapCenter = useAppSelector(selectMapCenter);
useEffect(() => { useEffect(() => {
map.current?.setView(mapCenter, 8, { animate: true, duration: 1 }); map.current?.setView(mapCenter, 8, { animate: true, duration: 1 });
}); });
return ( return (
<MapContainer <MapContainer zoom={8} zoomControl={false} ref={map}>
zoom={8}
zoomControl={false}
whenCreated={(mapInstance) => (map.current = mapInstance)}
>
<ScaleControl /> <ScaleControl />
<LeafletRuler /> <LeafletRuler />
<LayersControl collapsed={false}> <LayersControl collapsed={false}>