Skip to content

Commit

Permalink
update react and dependant dependencies (#562)
Browse files Browse the repository at this point in the history
  • Loading branch information
runeanielsen authored Nov 25, 2024
1 parent 9c4faa5 commit 8fa5f17
Show file tree
Hide file tree
Showing 16 changed files with 249 additions and 215 deletions.
402 changes: 210 additions & 192 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@
"@turf/turf": "^6.4.0",
"@urql/exchange-auth": "^1.0.0",
"graphql": "^15.5.1",
"i18next": "^20.3.2",
"maplibre-gl": "^1.14.0",
"oidc-client-ts": "^3.0.1",
"pubsub-js": "^1.9.5",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-i18next": "^11.11.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-i18next": "^15.1.1",
"react-oidc-context": "^3.1.0",
"react-router-dom": "^5.2.0",
"react-toastify": "^7.0.4",
"react-toastify": "^10.0.6",
"sass": "^1.81.0",
"subscriptions-transport-ws": "^0.9.19",
"typescript": "^4.9.5",
Expand Down Expand Up @@ -52,9 +51,9 @@
"@types/geojson": "^7946.0.10",
"@types/node": "^22.9.3",
"@types/pubsub-js": "^1.8.6",
"@types/react": "^17.0.11",
"@types/react-dom": "^17.0.8",
"@types/react-router-dom": "^5.1.7",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/uuid": "^10.0.0",
"@types/websocket": "^1.0.10",
"react-scripts": "5.0.1"
Expand Down
4 changes: 4 additions & 0 deletions src/global-styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -243,3 +243,7 @@ strong {
background-color: colors.$background-color;
overflow-y: auto;
}

.mapboxgl-canvas {
position: initial;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TFunction } from "react-i18next";
import { TFunction } from "i18next";

export type EquipmentSelectorProps = {
rows: {
Expand Down
3 changes: 2 additions & 1 deletion src/groups/RouteNetworkDiagram/AddContainer/AddContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useContext, useLayoutEffect, useState, useMemo } from "react";
import { TFunction, useTranslation } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import { v4 as uuidv4 } from "uuid";
import SelectListView, { BodyItem } from "../../../components/SelectListView";
import SelectMenu, { SelectOption } from "../../../components/SelectMenu";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { useEffect, useReducer, useMemo } from "react";
import { useClient, useQuery } from "urql";
import { toast } from "react-toastify";
import { useTranslation, TFunction } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import SelectMenu, { SelectOption } from "../../../components/SelectMenu";
import TextBox from "../../../components/TextBox";
import DefaultButton from "../../../components/DefaultButton";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEffect, useMemo, useState } from "react";
import { useTranslation, TFunction } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import { useQuery, useClient } from "urql";
import {
MUTATION_UPDATE_NODE_CONTAINER,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import {
UnitAddress,
} from "./EditSpanEquipmentGql";
import { useQuery, useClient } from "urql";
import { TFunction, useTranslation } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import DefaultButton from "../../../components/DefaultButton";
import SelectMenu, { SelectOption } from "../../../components/SelectMenu";
import TextBox from "../../../components/TextBox";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useTranslation, TFunction } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import { v4 as uuidv4 } from "uuid";
import { useState, useMemo, useEffect, useContext } from "react";
import { useQuery, useClient } from "urql";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useState, useEffect, useContext } from "react";
import { useTranslation, TFunction } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import { useQuery } from "urql";
import FeatureDetailsContainer from "../FeatureDetailContainer";
import {
Expand Down
3 changes: 2 additions & 1 deletion src/groups/RouteNetworkDiagram/OutageView/OutageView.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useState, useMemo } from "react";
import { useClient } from "urql";
import { useTranslation, TFunction } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import {
getInformation,
getWorkTasks,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { useClient, Client } from "urql";
import useBridgeConnector from "../../../bridge/useBridgeConnector";
import { MapContext } from "../../../contexts/MapContext";
import { toast } from "react-toastify";
import { TFunction, useTranslation } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import {
QUERY_GET_ROUTESEGMENT_IDS,
GetRouteSegmentIdsParameter,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { useReducer, useMemo, useEffect } from "react";
import { useClient } from "urql";
import { toast } from "react-toastify";
import { useTranslation, TFunction } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import SelectMenu, { SelectOption } from "../../../components/SelectMenu";
import DefaultButton from "../../../components/DefaultButton";
import NumberPicker from "../../../components/NumberPicker";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { useReducer, useEffect, useMemo } from "react";
import { useClient } from "urql";
import { toast } from "react-toastify";
import { useTranslation, TFunction } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import SelectMenu, { SelectOption } from "../../../components/SelectMenu";
import TextBox from "../../../components/TextBox";
import DefaultButton from "../../../components/DefaultButton";
Expand Down
10 changes: 6 additions & 4 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import ReactDOM from "react-dom";
import { createRoot } from 'react-dom/client';
import { AuthProvider } from "react-oidc-context";
import App from "./App";
import Config from "./config";
Expand Down Expand Up @@ -29,7 +29,10 @@ const onSigninCallback = (_user: any | void): void => {
}
}

ReactDOM.render(
const container = document.getElementById('root');
const root = createRoot(container!);

root.render(
<React.StrictMode>
<AuthProvider {...oidcConfig} onSigninCallback={onSigninCallback}>
<AuthWrapperProvider>
Expand All @@ -42,6 +45,5 @@ ReactDOM.render(
</UserProvider>
</AuthWrapperProvider>
</AuthProvider>
</React.StrictMode>,
document.getElementById("root"),
</React.StrictMode>
);
3 changes: 2 additions & 1 deletion src/pages/PlaceSpanEquipmentPage/PlaceSpanEquipmentPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useContext, useLayoutEffect, useState, useMemo } from "react";
import { TFunction, useTranslation } from "react-i18next";
import { useTranslation } from "react-i18next";
import { TFunction } from "i18next";
import { v4 as uuidv4 } from "uuid";
import SelectListView, { BodyItem } from "../../components/SelectListView";
import SelectMenu, { SelectOption } from "../../components/SelectMenu";
Expand Down

0 comments on commit 8fa5f17

Please sign in to comment.