Skip to content

1541 update node migrate cra to vite #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 17, 2024
Merged

1541 update node migrate cra to vite #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8f11540
1541: upgrade node from 14 to 20
Jun 4, 2024
d1d94c7
1541: move index.html to root
Jun 4, 2024
1122084
1541: add basic vite.config.js
Jun 4, 2024
d58425d
1541: change exports
Jun 4, 2024
7af1c6c
1541: add vite-env.d.ts
Jun 4, 2024
682dfc3
1541: rename from js to jsx
Jun 4, 2024
e5437d2
1541: import rrule in brackets
Jun 4, 2024
9474949
1541: add vite to packge, update config to solve error with winston
Jun 4, 2024
31e0a49
1541: yarn upgrade
Jun 4, 2024
204a945
1541: remove unused tsconfigPaths
Jun 4, 2024
f934244
1541: remove winston by commenting it out
Jun 4, 2024
4c03acb
1541: update changelog
Jun 4, 2024
1f3d7b3
1541: copy paste error in changelog
Jun 4, 2024
4cb1faf
1541: from winston to pino logger
Jun 7, 2024
fcf5c8b
1541: update changelog
Jun 7, 2024
a80ec33
1541: remove web vitals, leftover from CRA
Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.

## Unreleased

- [#126](https://github.com/aroskanalen/display-client/pull/3)
- Migrate from CRA to Vite
- Upgrade node from 14 -> 20
- Winston logging to Pino logging

## [2.0.3] - 2024-05-21

- [#125](https://github.com/os2display/display-client/pull/125)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
- "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"

node:
image: node:14
image: node:20
command: yarn start
networks:
- app
Expand Down
18 changes: 3 additions & 15 deletions public/index.html → index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,15 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="google" content="notranslate" />
<meta
name="description"
content="OS2Display client"
/>
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
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`.
-->
<link rel="manifest" href="/manifest.json" />
<title>OS2Display</title>
</head>
<body>
Expand All @@ -39,5 +26,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
<script type="module" src="/src/index.jsx"></script>
</body>
</html>
25 changes: 14 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,18 @@
"jwt-decode": "^3.1.2",
"lodash.clonedeep": "^4.5.0",
"lodash.last": "^3.0.0",
"os2display-grid-generator": "^1.0.8",
"os2display-grid-generator": "^1.0.10",
"pino": "^9.1.0",
"prop-types": "^15.7.2",
"react": "^18.2.0",
"react-app-rewired": "^2.1.8",
"react-dom": "^18.2.0",
"react-intl": "^5.20.2",
"react-transition-group": "^4.4.2",
"rrule": "^2.6.8",
"sass": "^1.37.5",
"styled-components": "^5.3.1",
"suncalc": "^1.9.0",
"ulid": "^2.3.0",
"web-vitals": "^1.0.1",
"winston": "^3.3.3"
"ulid": "^2.3.0"
},
"scripts": {
"lint:js": "eslint --ext .js --ext .jsx ./src",
Expand All @@ -34,9 +32,9 @@
"lint:scss:fix": "stylelint --fix \"./src/**/*.scss\"",
"check-coding-standards": "npm run lint:js && npm run lint:scss",
"apply-coding-standards": "npm run lint:js:fix && npm run lint:scss:fix",
"start": "react-app-rewired start",
"build": "react-app-rewired build",
"eject": "react-app-rewired eject"
"start": "vite --host 0.0.0.0",
"build": "vite build",
"serve": "vite preview"
},
"eslintConfig": {
"extends": [
Expand All @@ -57,17 +55,20 @@
]
},
"devDependencies": {
"react-scripts": "4.0.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@esbuild-plugins/node-modules-polyfill": "^0.2.2",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@vitejs/plugin-react": "^4.3.0",
"@vitejs/plugin-react-swc": "^3.7.0",
"babel-eslint": "^10.1.0",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-cypress": "^2.11.3",
"eslint-plugin-import": "^2.24.0",
"eslint-plugin-jsdoc": "^36.0.7",
"eslint-plugin-jsdoc": "^35.4.3",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-only-warn": "^1.0.3",
"eslint-plugin-prettier": "^3.4.0",
Expand All @@ -77,6 +78,8 @@
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-recommended-scss": "^4.3.0",
"stylelint-prettier": "^1.2.0",
"stylelint-scss": "^3.19.0"
"stylelint-scss": "^3.19.0",
"vite": "^5.2.12",
"vite-plugin-svgr": "^4.2.0"
}
}
Loading