Skip to content

Commit

Permalink
Merge pull request #1272 from proddy/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
proddy authored Aug 30, 2023
2 parents d049572 + 9aa9cc4 commit d6ae552
Show file tree
Hide file tree
Showing 22 changed files with 693 additions and 1,902 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@
"**/*.min.*",
"**/*.map",
"**/ArduinoJson/**"
]
],
"cSpell.enableFiletypes": ["!cpp"]
}
2 changes: 1 addition & 1 deletion interface/.typesafe-i18n.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"adapter": "react",
"baseLocale": "pl",
"$schema": "https://unpkg.com/[email protected].1/schema/typesafe-i18n.json"
"$schema": "https://unpkg.com/[email protected].2/schema/typesafe-i18n.json"
}
29 changes: 14 additions & 15 deletions interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build-hosted": "vite build --mode hosted",
"preview": "vite preview",
"preview-standalone": "npm-run-all -p preview typesafe-i18n mock-api",
"mock-api": "nodemon --watch ../mock-api ../mock-api/server.js",
"mock-api": "node --watch ../mock-api ../mock-api/server.js",
"standalone": "npm-run-all -p dev typesafe-i18n mock-api",
"typesafe-i18n": "typesafe-i18n",
"format": "prettier --write '**/*.{ts,tsx,js,css,json,md}'",
Expand All @@ -22,17 +22,17 @@
"@alova/adapter-xhr": "^1.0.1",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.3",
"@mui/material": "^5.14.5",
"@mui/icons-material": "^5.14.7",
"@mui/material": "^5.14.7",
"@preact/compat": "^17.1.2",
"@prefresh/vite": "^2.4.1",
"@table-library/react-table-library": "4.1.7",
"@types/lodash-es": "^4.17.8",
"@types/node": "^20.5.1",
"@types/react": "^18.2.20",
"@types/node": "^20.5.7",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/react-router-dom": "^5.3.3",
"alova": "^2.11.0",
"alova": "^2.11.1",
"async-validator": "^4.2.5",
"history": "^5.3.0",
"jwt-decode": "^3.1.2",
Expand All @@ -46,16 +46,16 @@
"react-router-dom": "^6.15.0",
"react-toastify": "^9.1.3",
"sockette": "^2.0.6",
"typesafe-i18n": "^5.26.1",
"typescript": "^5.1.6"
"typesafe-i18n": "^5.26.2",
"typescript": "^5.2.2"
},
"devDependencies": {
"@babel/core": "^7.22.10",
"@babel/core": "^7.22.11",
"@preact/preset-vite": "^2.5.0",
"@types/babel__core": "^7",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.4.0",
"eslint": "^8.47.0",
"@typescript-eslint/eslint-plugin": "^6.5.0",
"@typescript-eslint/parser": "^6.5.0",
"eslint": "^8.48.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
Expand All @@ -66,11 +66,10 @@
"eslint-plugin-prettier": "alpha",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"nodemon": "^3.0.1",
"npm-run-all": "^4.1.5",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"rollup-plugin-visualizer": "^5.9.2",
"terser": "^5.19.2",
"terser": "^5.19.3",
"vite": "^4.4.9",
"vite-plugin-svgr": "^3.2.0",
"vite-tsconfig-paths": "^4.2.0"
Expand Down
6 changes: 3 additions & 3 deletions interface/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ export default defineConfig(({ command, mode }) => {
server: {
open: true,
port: 3000,
watch: {
usePolling: true
},
// watch: {
// usePolling: true
// },
proxy: {
'/rest': 'http://localhost:3080',
'/api': {
Expand Down
Loading

0 comments on commit d6ae552

Please sign in to comment.