Skip to content

Commit

Permalink
Merge pull request #24 from daithihearn/update-deps
Browse files Browse the repository at this point in the history
Update deps
  • Loading branch information
daithihearn authored Sep 11, 2024
2 parents c0a31fa + 9f36e7a commit 4eb1251
Show file tree
Hide file tree
Showing 7 changed files with 2,142 additions and 2,054 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "16.19.x"
node-version: "20.17.x"

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.11.0
v20.17.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build
FROM node:20.11 AS builder
FROM node:20.17-alpine3.20 AS builder

WORKDIR /app

Expand All @@ -20,7 +20,7 @@ ENV REACT_APP_API_URL=${REACT_APP_API_URL}
RUN yarn build

# deployment
FROM nginx:1.19-alpine AS deployment
FROM node:20.17-alpine3.20 AS deployment

COPY --from=builder /app/build /usr/share/nginx/html
COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf.template
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
{
"name": "daithi-dashboard",
"version": "2.10.1",
"version": "2.10.2",
"private": true,
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.4",
"@mui/material": "^5.15.4",
"@mui/x-date-pickers": "^6.18.7",
"@tanstack/react-query": "^5.18.1",
"@testing-library/jest-dom": "^6.2.0",
"@testing-library/react": "^14.1.2",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^6.1.0",
"@mui/material": "^6.1.0",
"@mui/x-date-pickers": "^7.16.0",
"@tanstack/react-query": "^5.55.4",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.11",
"@types/luxon": "^3.4.0",
"@types/node": "^20.10.8",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"axios": "^1.6.5",
"chart.js": "^4.4.1",
"@types/node": "^22.5.4",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"axios": "^1.7.7",
"chart.js": "^4.4.4",
"chartjs-adapter-moment": "^1.0.1",
"chartjs-plugin-annotation": "^3.0.1",
"luxon": "^3.4.4",
"mixpanel-browser": "^2.48.1",
"prettier": "^3.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"luxon": "^3.5.0",
"mixpanel-browser": "^2.55.1",
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-scripts": "5.0.1",
"typesafe-i18n": "^5.26.2",
"typescript": "^5.3.3",
"web-vitals": "^3.5.1"
"typescript": "^5.6.2",
"web-vitals": "^4.2.3"
},
"scripts": {
"start": "react-scripts start",
Expand Down Expand Up @@ -65,10 +65,10 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/preset-env": "^7.23.8",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@types/mixpanel-browser": "^2.48.1",
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@types/mixpanel-browser": "^2.50.0",
"babel-jest": "^29.7.0"
}
}
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"sizes": "512x512"
}
],
"version": "2.10.1",
"version": "2.10.2",
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
Expand Down
24 changes: 11 additions & 13 deletions src/reportWebVitals.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import { ReportHandler } from 'web-vitals';
import { onCLS, onFCP, onLCP, onTTFB, onINP, Metric } from "web-vitals"

const reportWebVitals = (onPerfEntry?: ReportHandler) => {
if (onPerfEntry && onPerfEntry instanceof Function) {
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
getCLS(onPerfEntry);
getFID(onPerfEntry);
getFCP(onPerfEntry);
getLCP(onPerfEntry);
getTTFB(onPerfEntry);
});
}
};
const reportWebVitals = (onPerfEntry?: (metric: Metric) => void) => {
if (onPerfEntry && onPerfEntry instanceof Function) {
onCLS(onPerfEntry)
onFCP(onPerfEntry)
onLCP(onPerfEntry)
onTTFB(onPerfEntry)
onINP(onPerfEntry)
}
}

export default reportWebVitals;
export default reportWebVitals
Loading

0 comments on commit 4eb1251

Please sign in to comment.