diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6003ebc..2ed274f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: ci-checks: runs-on: ubuntu-latest container: - image: node:10.13 + image: node:12.18 steps: - uses: actions/checkout@v1 diff --git a/Dockerfile b/Dockerfile index 85e4829..132dfa1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10.13 +FROM node:12.18 WORKDIR /app COPY . /app diff --git a/package.json b/package.json index a79526f..a045ec1 100644 --- a/package.json +++ b/package.json @@ -4,17 +4,17 @@ "private": true, "homepage": "/admin", "dependencies": { - "@material-ui/core": "^3.1.1", - "@material-ui/icons": "^3.0.1", - "material-ui": "^0.20.2", + "@emotion/react": "^11.6.0", + "@emotion/styled": "^11.6.0", + "@mui/icons-material": "^5.1.0", + "@mui/material": "^5.1.0", "prop-types": "^15.6.2", - "ra-data-json-server": "^2.3.2", - "ra-input-rich-text": "^2.3.2", - "react": "^16.5.2", - "react-admin": "^2.3.2", - "react-bootstrap": "^0.32.4", - "react-dom": "^16.5.2", - "react-scripts": "1.1.5" + "ra-compact-ui": "^1.1.1", + "react": "17.0.0", + "react-ace": "^9.5.0", + "react-admin": "^3.19.0", + "react-dom": "17.0.0", + "react-scripts": "4.0.0" }, "scripts": { "start": "react-scripts start", @@ -23,5 +23,17 @@ "eject": "react-scripts eject", "prod": "react-scripts build && mv build ../MYR-backend && rm -r ../MYR-backend/public/admin && mv ../MYR-backend/build ../MYR-backend/public/admin" }, - "proxy": "http://localhost:1337/" + "proxy": "http://localhost:1337/", + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 5 chrome version", + "last 5 firefox version", + "last 5 safari version" + ] + } } diff --git a/public/favicon.ico b/public/favicon.ico index a11777c..00068bc 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index ed0ebaf..53e926e 100644 --- a/public/index.html +++ b/public/index.html @@ -19,22 +19,12 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> -