Update/remove various npm dependencies to fix syntax highlighting (#47)

Signed-off-by: Julius Volz <[email protected]> Signed-off-by: Julius Volz <[email protected]>
prometheus · Nov 10, 2022 · 171530e · 171530e
1 parent 7023849
commit 171530e
Show file tree

Hide file tree

Showing 10 changed files with 10,989 additions and 12,194 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ assets-compress:
 
 .PHONY: ui-install
 ui-install:
-	cd $(REACT_APP_PATH) && npm install --legacy-peer-deps
+	cd $(REACT_APP_PATH) && npm install
 
 .PHONY: build-ui
 build-ui:

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -14,7 +14,6 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@lezer/highlight": "^1.1.1",
     "@prometheus-io/codemirror-promql": "^0.39.1",
-    "@reach/router": "^1.3.4",
     "bootstrap": "^4.5.3",
     "flot": "^4.2.1",
     "fuzzy": "^0.1.3",
@@ -68,10 +67,7 @@
   },
   "proxy": "http://localhost:8080",
   "devDependencies": {
-    "@bahmutov/add-typescript-to-cypress": "^2.1.2",
     "@testing-library/react-hooks": "^5.1.3",
-    "@types/enzyme": "^3.10.8",
-    "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/flot": "0.0.31",
     "@types/jest": "^26.0.23",
     "@types/jquery": "^3.5.5",
@@ -85,8 +81,6 @@
     "@types/react-resize-detector": "^5.0.0",
     "@typescript-eslint/eslint-plugin": "^4.25.0",
     "@typescript-eslint/parser": "^4.25.0",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.5",
     "eslint-config-prettier": "^7.1.0",
     "eslint-config-react-app": "^6.0.0",
     "eslint-plugin-flowtype": "^5.7.2",
@@ -96,7 +90,6 @@
     "eslint-plugin-react-hooks": "^4.2.0",
     "prettier": "^2.3.0",
     "react-test-renderer": "^17.0.2",
-    "redux-devtools": "^3.7.0",
     "typescript": "^4.2.4"
   }
 }
diff --git a/app/src/App.tsx b/app/src/App.tsx
@@ -1,5 +1,4 @@
 import React, { FC } from 'react';
-import { Router } from '@reach/router';
 
 import TopNav from './TopNav';
 import PromLens from './pages/PromLens';
@@ -13,9 +12,7 @@ const App: FC<PathPrefixProps> = ({ pathPrefix }) => {
       <TopNav pathPrefix={pathPrefix} />
       {/* Without primary={false}, the page doesn't scroll to the top upon page change.
         See https://github.com/reach/router/issues/242#issuecomment-467082358 */}
-      <Router primary={false} basepath={`${pathPrefix}/`}>
-        <PromLens path="/" pathPrefix={pathPrefix} />
-      </Router>
+      <PromLens pathPrefix={pathPrefix} />
     </DndProvider>
   );
 };

diff --git a/app/src/PromLens/NodeVisualizer/Graph/GraphHelpers.test.ts b/app/src/PromLens/NodeVisualizer/Graph/GraphHelpers.test.ts
@@ -82,7 +82,7 @@ describe('GraphHelpers', () => {
       try {
         formatValue(undefined as any);
       } catch (error) {
-        expect(error.message).toEqual("couldn't format a value, this is a bug");
+        expect((error as Error).message).toEqual("couldn't format a value, this is a bug");
       }
     });
   });

diff --git a/app/src/PromLens/PromLensUI.tsx b/app/src/PromLens/PromLensUI.tsx
@@ -2,7 +2,6 @@ import React, { FC, useState, useMemo } from 'react';
 
 import ASTNode from '../promql/ast';
 import QueryList from './QueryList/QueryList';
-import { RouteComponentProps } from '@reach/router';
 import NodeVisualizer from './NodeVisualizer/NodeVisualizer';
 import { denormalizeAST } from '../state/normalizeAST';
 import { connect } from 'react-redux';
@@ -27,7 +26,7 @@ interface PromLensUIOwnProps {
   initialTrigger: boolean;
 }
 
-const PromLens: FC<PromLensUIStateProps & PromLensUIOwnProps & RouteComponentProps & PathPrefixProps> = ({
+const PromLens: FC<PromLensUIStateProps & PromLensUIOwnProps & PathPrefixProps> = ({
   pathPrefix,
   serverSettings,
   datasources,

diff --git a/app/src/PromLens/QueryList/QueryView/NodeEditor/DurationEditor.tsx b/app/src/PromLens/QueryList/QueryView/NodeEditor/DurationEditor.tsx
@@ -24,7 +24,7 @@ const DurationEditor: FC<DurationEditorProps> = ({ duration: initialDuration, on
       onUpdate(parseDuration(duration));
       setDurationError('');
     } catch (error) {
-      setDurationError(error.message);
+      setDurationError((error as Error).message);
     }
   };
 

diff --git a/app/src/pages/PromLens.tsx b/app/src/pages/PromLens.tsx
@@ -1,6 +1,4 @@
 import React, { FC, useState, useEffect } from 'react';
-
-import { RouteComponentProps } from '@reach/router';
 import { Container, Alert } from 'react-bootstrap';
 import { createStore } from 'redux';
 import { importState, setServerSettings, setExpr } from '../state/actions';
@@ -105,7 +103,7 @@ const examplePageState = {
   version: 1,
 } as ExportedStateV1;
 
-const PromLens: FC<RouteComponentProps & PathPrefixProps> = ({ pathPrefix }) => {
+const PromLens: FC<PathPrefixProps> = ({ pathPrefix }) => {
   const [pageConfig, setPageConfig] = useState<PageConfig | null>(null);
   const [pageConfigLoading, setPageConfigLoading] = useState<boolean>(true);
   const [pageConfigError, setPageConfigError] = useState<string | null>(null);
@@ -169,7 +167,7 @@ const PromLens: FC<RouteComponentProps & PathPrefixProps> = ({ pathPrefix }) =>
             // TODO: Somewhat duplicated with access in PromLensUI.
             localStorage.setItem('promlens.show-example-page-link', 'false');
           } catch (error) {
-            setStateImportError(error);
+            setStateImportError((error as Error).message);
           }
         } else {
           // If no initial page state is provided and Grafana datasources contain a default server,

diff --git a/app/src/promAPI/promAPI.ts b/app/src/promAPI/promAPI.ts
@@ -92,7 +92,7 @@ export class PromAPI {
           setError(undefined);
           setData(apiRes.data!);
         } catch (error) {
-          setError(error);
+          setError(error as Error);
         } finally {
           setLoading(false);
         }

diff --git a/scripts/build_ui.sh b/scripts/build_ui.sh
@@ -22,5 +22,5 @@ then
 fi
 
 cd app
-npm i --legacy-peer-deps
+npm i
 npm run build