Skip to content

Commit e65030e

Browse files
chyzwarchyzwar
committed
chore(): package updtes
1 parent 3bef24e commit e65030e

16 files changed

+651
-742
lines changed

‎.eslintrc.cjs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ module.exports = {
1010
project: [
1111
"./tsconfig.eslint.json",
1212
"./packages/*/tsconfig.json",
13-
"./packages/*/vite.config.ts",
1413
],
1514
tsconfigRootDir: __dirname,
1615
},

‎.husky/commit-msg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
yarn dlx commitlint --edit "$1"
4+
npx commitlint --edit "$1"

‎package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
"postinstall": "husky install"
2727
},
2828
"dependencies": {
29-
"@chyzwar/eslint-config": "^0.2.13",
30-
"@commitlint/cli": "^17.7.2",
31-
"@commitlint/config-conventional": "^17.7.0",
32-
"@typescript-eslint/eslint-plugin": "^6.7.4",
33-
"@typescript-eslint/parser": "^6.7.4",
34-
"eslint": "^8.51.0",
29+
"@chyzwar/eslint-config": "^0.2.14",
30+
"@commitlint/cli": "^18.0.0",
31+
"@commitlint/config-conventional": "^18.0.0",
32+
"@typescript-eslint/eslint-plugin": "^6.8.0",
33+
"@typescript-eslint/parser": "^6.8.0",
34+
"eslint": "^8.52.0",
3535
"husky": "^8.0.3",
3636
"jest": "^29.7.0",
37-
"lint-staged": "^14.0.1",
37+
"lint-staged": "^15.0.2",
3838
"typescript": "^5.2.2"
3939
},
4040
"lint-staged": {

‎packages/admin-ui/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@
99
"dependencies": {
1010
"@emotion/react": "^11.11.1",
1111
"@emotion/styled": "^11.11.0",
12-
"@mui/material": "^5.14.13",
12+
"@mui/material": "^5.14.14",
1313
"axios": "^1.5.1",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0",
1616
"react-refresh": "^0.14.0",
17-
"react-router-dom": "^6.16.0"
17+
"react-router-dom": "^6.17.0"
1818
},
1919
"devDependencies": {
20-
"@chyzwar/eslint-config": "^0.2.13",
21-
"@chyzwar/tsconfig": "^0.2.13",
20+
"@chyzwar/eslint-config": "^0.2.14",
21+
"@chyzwar/tsconfig": "^0.2.14",
2222
"@testing-library/dom": "^9.3.3",
23-
"@testing-library/jest-dom": "^6.1.3",
23+
"@testing-library/jest-dom": "^6.1.4",
2424
"@testing-library/react": "^14.0.0",
2525
"@testing-library/user-event": "^14.5.1",
26-
"@types/jest": "^29.5.5",
27-
"@types/node": "^20.8.3",
28-
"@types/react": "^18.2.25",
29-
"@types/react-dom": "^18.2.11",
26+
"@types/jest": "^29.5.6",
27+
"@types/node": "^20.8.7",
28+
"@types/react": "^18.2.31",
29+
"@types/react-dom": "^18.2.14",
3030
"@vitejs/plugin-react-swc": "^3.4.0",
31-
"eslint": "^8.51.0",
31+
"eslint": "^8.52.0",
3232
"jest": "^29.7.0",
3333
"jest-environment-jsdom": "^29.7.0",
3434
"typescript": "^5.2.2",
35-
"vite": "^4.4.11"
35+
"vite": "^4.5.0"
3636
},
3737
"scripts": {
3838
"start": "vite",

‎packages/admin-ui/src/App.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
import Login from "./views/Login";
77
import {ThemeProvider, createTheme} from "@mui/material";
88

9-
109
const defaultTheme = createTheme();
1110

1211
const App = (): JSX.Element => {

‎packages/api/.swcrc

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
},
99
"module": {
1010
"type": "es6",
11-
"strict": true,
12-
"strictMode": true
11+
"resolveFully": true
1312
}
1413
}

‎packages/api/jest.config.ts

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ const config: Config.InitialOptions = {
1212
extensionsToTreatAsEsm: [".ts", ".tsx"],
1313
setupFiles: ["../jest.setup.ts"],
1414
moduleNameMapper: {
15-
// https://github.com/nodejs/undici/issues/1878
16-
"^(\\.{1,2}/.*/llhttp\\.wasm\\.js)$": "$1",
1715
// https://kulshekhar.github.io/ts-jest/docs/guides/esm-support
1816
"^(\\.{1,2}/.*)\\.js$": "$1",
1917
},

‎packages/api/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@
2222
"@fastify/cookie": "^9.1.0",
2323
"@fastify/helmet": "^11.1.1",
2424
"@fastify/http-proxy": "^9.2.1",
25-
"@fastify/jwt": "^7.2.1",
25+
"@fastify/jwt": "^7.2.2",
2626
"@fastify/oauth2": "^7.5.0",
2727
"@fastify/static": "^6.11.2",
2828
"@project/common": "workspace:packages/common",
2929
"axios": "^1.5.1",
30-
"fastify": "^4.23.2",
30+
"fastify": "^4.24.3",
3131
"fastify-plugin": "^4.5.1",
3232
"pg": "^8.11.3",
33-
"pino": "^8.15.6",
33+
"pino": "^8.16.0",
3434
"pino-pretty": "^10.2.3",
3535
"sequelize": "^6.33.0"
3636
},
3737
"devDependencies": {
38-
"@chyzwar/eslint-config": "^0.2.13",
39-
"@chyzwar/tsconfig": "^0.2.13",
38+
"@chyzwar/eslint-config": "^0.2.14",
39+
"@chyzwar/tsconfig": "^0.2.14",
4040
"@jest/globals": "^29.7.0",
4141
"@swc/cli": "^0.1.62",
42-
"@swc/core": "^1.3.92",
42+
"@swc/core": "^1.3.94",
4343
"@swc/jest": "^0.2.29",
44-
"@types/jest": "^29.5.5",
45-
"@types/node": "^20.8.3",
46-
"@types/validator": "^13.11.2",
44+
"@types/jest": "^29.5.6",
45+
"@types/node": "^20.8.7",
46+
"@types/validator": "^13.11.5",
4747
"dotenv": "^16.3.1",
4848
"env-cmd": "^10.1.0",
49-
"eslint": "^8.51.0",
49+
"eslint": "^8.52.0",
5050
"nodemon": "^3.0.1",
5151
"sequelize-cli": "^6.6.1",
5252
"ts-node": "^10.9.1",

‎packages/common/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
},
1515
"license": "UNLICENSED",
1616
"devDependencies": {
17-
"@chyzwar/eslint-config": "^0.2.13",
18-
"@chyzwar/tsconfig": "^0.2.13",
19-
"@typescript-eslint/eslint-plugin": "^6.7.4",
20-
"@typescript-eslint/parser": "^6.7.4",
21-
"eslint": "^8.51.0",
17+
"@chyzwar/eslint-config": "^0.2.14",
18+
"@chyzwar/tsconfig": "^0.2.14",
19+
"@typescript-eslint/eslint-plugin": "^6.8.0",
20+
"@typescript-eslint/parser": "^6.8.0",
21+
"eslint": "^8.52.0",
2222
"jest": "^29.7.0",
2323
"typescript": "^5.2.2"
2424
}

‎packages/ui/jest.config.ts

-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ import type {Config} from "@jest/types";
44
* Use jest with ts-jest to transform
55
*
66
* @see https://facebook.github.io/jest/docs/en/configuration.html
7-
* @see https://kulshekhar.github.io/ts-jest/user/config/
87
*/
98
const config: Config.InitialOptions = {
109
testEnvironment: "jsdom",
1110
rootDir: "src",
1211
testMatch: ["**/__tests__/**/*.ts?(x)", "**/?(*.)+(spec|test).ts?(x)"],
1312
setupFilesAfterEnv: ["../jest.setup.ts"],
14-
extensionsToTreatAsEsm: [".ts", ".tsx"],
1513
transform: {
1614
"^.+\\.(t|j)sx?$": "@swc/jest",
1715
},

‎packages/ui/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,36 @@
1010
"dependencies": {
1111
"@emotion/react": "^11.11.1",
1212
"@emotion/styled": "^11.11.0",
13-
"@mui/icons-material": "^5.14.13",
14-
"@mui/material": "^5.14.13",
13+
"@mui/icons-material": "^5.14.14",
14+
"@mui/material": "^5.14.14",
1515
"@project/common": "workspace:packages/common",
1616
"axios": "^1.5.1",
1717
"axios-hooks": "^5.0.1",
1818
"react": "^18.2.0",
1919
"react-dom": "^18.2.0",
2020
"react-refresh": "^0.14.0",
21-
"react-router-dom": "^6.16.0"
21+
"react-router-dom": "^6.17.0"
2222
},
2323
"devDependencies": {
24-
"@chyzwar/eslint-config": "^0.2.13",
25-
"@chyzwar/tsconfig": "^0.2.13",
26-
"@swc/core": "^1.3.92",
24+
"@chyzwar/eslint-config": "^0.2.14",
25+
"@chyzwar/tsconfig": "^0.2.14",
26+
"@swc/core": "^1.3.94",
2727
"@swc/jest": "^0.2.29",
2828
"@testing-library/dom": "^9.3.3",
29-
"@testing-library/jest-dom": "^6.1.3",
29+
"@testing-library/jest-dom": "^6.1.4",
3030
"@testing-library/react": "^14.0.0",
3131
"@testing-library/user-event": "^14.5.1",
32-
"@types/jest": "^29.5.5",
33-
"@types/node": "^20.8.3",
34-
"@types/react": "^18.2.25",
35-
"@types/react-dom": "^18.2.11",
32+
"@types/jest": "^29.5.6",
33+
"@types/node": "^20.8.7",
34+
"@types/react": "^18.2.31",
35+
"@types/react-dom": "^18.2.14",
3636
"@vitejs/plugin-react-swc": "^3.4.0",
3737
"dotenv": "16.3.1",
38-
"eslint": "^8.51.0",
38+
"eslint": "^8.52.0",
3939
"jest": "^29.7.0",
4040
"jest-environment-jsdom": "^29.7.0",
4141
"typescript": "^5.2.2",
42-
"vite": "^4.4.11"
42+
"vite": "^4.5.0"
4343
},
4444
"scripts": {
4545
"start": "vite",

‎packages/ui/src/App.tsx

+21-16
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,30 @@ import Login from "./views/Login";
99
import Home from "./views/Home";
1010
import ProtectedRoute from "./components/ProtectedRoute";
1111
import {ThemeProvider, createTheme} from "@mui/material";
12+
import CssBaseline from "@mui/material/CssBaseline";
1213

1314
const defaultTheme = createTheme();
1415

15-
const App = (): JSX.Element =>
16-
<ThemeProvider theme={defaultTheme}>
17-
<BrowserRouter>
18-
<Routes>
19-
<Route path="/login" element={<Login />} />
20-
<Route
21-
path="/"
22-
element={(
23-
<ProtectedRoute>
24-
<Home />
25-
</ProtectedRoute>
26-
)}
27-
/>
28-
</Routes>
29-
</BrowserRouter>
30-
</ThemeProvider>
16+
const App = (): JSX.Element => {
17+
return (
18+
<ThemeProvider theme={defaultTheme}>
19+
<CssBaseline/>
20+
<BrowserRouter>
21+
<Routes>
22+
<Route path="/login" element={<Login />} />
23+
<Route
24+
path="/"
25+
element={(
26+
<ProtectedRoute>
27+
<Home />
28+
</ProtectedRoute>
29+
)}
30+
/>
31+
</Routes>
32+
</BrowserRouter>
33+
</ThemeProvider>
34+
);
35+
}
3136

3237

3338
;

‎packages/ui/src/__tests__/App.test.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from "react";
21
import {render} from "@testing-library/react";
32
import App from "../App";
43

0 commit comments

Comments
 (0)