Merge pull request #561 from Artsdatabanken/deploy-7wms-assistent

Upgrade dependencies

.github/workflows/deploy.sh

@@ -1,4 +1,5 @@
 mkdir build/static
 ls -la wms-assistent/build/
 cp -R wms-assistent/build/ build/static/
+cp -R wms-assistent/build/static/* build/static/
 tar czf $(basename $GITHUB_REPOSITORY).tar.gz -C build .

wms-assistent/package.json

@@ -9,7 +9,7 @@
     "@mui/icons-material": "^5.15.0",
     "@mui/lab": "^5.0.0-alpha.156",
     "@mui/material": "^5.15.0",
-    "eslint-config-prettier": "^7.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -19,17 +19,17 @@
     "proj4": "^2.9.2",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "react-error-boundary": "^4.0.11",
+    "react-error-boundary": "^4.0.12",
     "react-leaflet": "^4.2.1",
-    "react-router-dom": "^6.20.1",
+    "react-router-dom": "^6.21.0",
     "react-scripts": "^5.0.1"
   },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "deploy": "scp -r build/* grunnkart@hydra:~/okologiskegrunnkart/django/okologiskegrunnkart/static"
+    "deploy": "scp -r build/* grunnkart@hydra:~/forvaltningsportal/static"
   },
   "eslintConfig": {
     "extends": [
@@ -41,6 +41,5 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ],
-  "homepage": "/static/"
+  ]
 }

wms-assistent/src/App.js

@@ -1,5 +1,4 @@
 import React, {Suspense} from "react";
-import homepage from "../package.json";
 import TjenesteContainer from "./TjenesteContainer";
 import CssBaseline from "@mui/material/CssBaseline";
 import AuthenticationContextProvider from "./Kart/AuthenticationContextProvider";
@@ -8,8 +7,6 @@ import {
   BrowserRouter,
 } from "react-router-dom";
 
-const basename = process.env.NODE_ENV === "development" ? undefined : homepage;
-
 const logError = (error, info) => {
   console.log(error, info)
   // Do something with the error, e.g. log to an external API
@@ -24,7 +21,7 @@ function App() {
       <Suspense fallback={<Loading />}>
       <ErrorBoundary FallbackComponent={ErrorFallback} onError={logError}>
       <AuthenticationContextProvider>
-        <BrowserRouter  basename={basename}>
+        <BrowserRouter basename={"static"}>
           <CssBaseline />
             <div>
               <TjenesteContainer />