Skip to content

Commit

Permalink
Update Node to v20
Browse files Browse the repository at this point in the history
  • Loading branch information
ottaviano committed Jan 16, 2025
1 parent 5b37e2c commit 64c5fe1
Show file tree
Hide file tree
Showing 10 changed files with 556 additions and 341 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-node-yarn/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: 'yarn'

- shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
env:
APP_ENV: test
container:
image: cypress/browsers:node18.12.0-chrome107
image: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
options: --user 1001

steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_VERSION=18.18
ARG NODE_VERSION=20
ARG NGINX_VERSION=1

# Stage 1 - the build process
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Espace cadre</title>
<link rel="icon" href="/favicon.ico" />

<script src="//maps.googleapis.com/maps/api/js?key=<{ REACT_APP_GMAPS_API_KEY }>&libraries=places&callback=Function.prototype" async></script>
<script src="//maps.googleapis.com/maps/api/js?key=<{ REACT_APP_GMAPS_API_KEY }>&loading=async&libraries=places&callback=Function.prototype" async></script>

<!-- Intercom widget -->
<script vite-if="<{ REACT_APP_ENVIRONMENT }> === staging">
Expand Down
15 changes: 6 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"@ckeditor/ckeditor5-react": "^5.1.0",
"@emotion/is-prop-valid": "^1.3.1",
"@emotion/react": "^11.11.4",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.11.5",
"@hookform/resolvers": "^3.3.2",
"@iconify/react": "^5.0.2",
Expand Down Expand Up @@ -51,17 +51,14 @@
"react-router": "^6.3.0",
"react-router-dom": "^6.21.3",
"react-script-hook": "^1.7.2",
"react-select": "^5.8.0",
"react-transition-group": "^4.4.5",
"react-use": "^17.5.1",
"react-window": "^1.8.10",
"redux": "^4.2.1",
"redux-persist": "^6.0.0",
"sass": "^1.79.2",
"simplebar-react": "^3.2.6",
"slick-carousel": "^1.8.1",
"sprintf-js": "^1.1.3",
"stylis-plugin-rtl": "^2.1.1",
"uuid": "^10.0.0",
"yet-another-react-lightbox": "^3.21.6",
"yup": "^1.4.0",
Expand All @@ -88,21 +85,21 @@
"@babel/preset-env": "^7.24.3",
"@babel/preset-react": "^7.25.7",
"@faker-js/faker": "^9.3.0",
"@sentry/vite-plugin": "^2.19.0",
"@sentry/vite-plugin": "^3.0.0",
"@testing-library/cypress": "^10.0.2",
"@testing-library/react": "^14.2.2",
"@types/google.maps": "^3.58.1",
"@types/lodash": "^4.14.202",
"@types/mapbox-gl": "^3.1.0",
"@types/qs": "^6.9.16",
"@types/react": "^18.0",
"@types/sprintf-js": "^1.1.4",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react": "^4.3.4",
"@vitejs/plugin-react-swc": "^3.7.0",
"@vitejs/plugin-react-swc": "^3.7.2",
"@vitest/coverage-v8": "^1.2.2",
"cypress": "^13.16.1",
"cypress-vite": "^1.5.0",
"cypress-vite": "^1.6.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-react-app": "^7.0.1",
Expand All @@ -116,7 +113,7 @@
"lint-staged": "^15.2.10",
"prettier": "^3.4.2",
"typescript": "^5.3.3",
"vite": "^5.4.7",
"vite": "^6.0.7",
"vite-plugin-environment": "^1.1.3",
"vite-plugin-html": "^3.2.2",
"vite-plugin-html-env": "^1.2.8",
Expand Down
4 changes: 0 additions & 4 deletions src/style/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
/* map */
@import "mapbox-gl/dist/mapbox-gl.css";

/* carousel */
@import "slick-carousel/slick/slick.css";
@import "slick-carousel/slick/slick-theme.css";

/* lightbox */
@import "yet-another-react-lightbox/styles.css";
@import "yet-another-react-lightbox/plugins/captions.css";
Expand Down
7 changes: 2 additions & 5 deletions src/theme/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { palette } from './palette'
import { shadows } from './shadows'
import { typography } from './typography'
// options
import RTL from './options/right-to-left'
import { customShadows } from './custom-shadows'
import { componentsOverrides } from './overrides'
import { createPresets } from './options/presets'
Expand Down Expand Up @@ -61,10 +60,8 @@ export default function ThemeProvider({ children }: Props) {

return (
<MuiThemeProvider theme={themeWithLocale}>
<RTL themeDirection={settings.themeDirection}>
<CssBaseline />
{children}
</RTL>
<CssBaseline />
{children}
</MuiThemeProvider>
)
}
29 changes: 0 additions & 29 deletions src/theme/options/right-to-left.tsx

This file was deleted.

3 changes: 3 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ export const generateConfig: Parameters<typeof defineConfig>[0] = ({ mode }) =>
filesToDeleteAfterUpload: 'build/assets/*.js.map',
},
release: {
setCommits: {
auto: true,
},
deploy: {
env: process.env.APP_ENV || 'production',
},
Expand Down
Loading

0 comments on commit 64c5fe1

Please sign in to comment.