Skip to content

Commit 3ac99ef

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/add-shop-api-component
2 parents 856a3ee + 637a72b commit 3ac99ef

File tree

29 files changed

+1081
-51
lines changed

29 files changed

+1081
-51
lines changed

emotion.d.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import "@emotion/react";
2+
import { Theme as MuiTheme } from "@mui/material/styles";
3+
4+
declare module "@mui/material/styles" {
5+
interface PaletteColor {
6+
nonFocus?: string;
7+
}
8+
interface SimplePaletteColorOptions {
9+
nonFocus?: string;
10+
}
11+
}
12+
13+
declare module "@emotion/react" {
14+
export interface Theme extends MuiTheme {}
15+
}

package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,18 @@
2929
"axios": "^1.8.4",
3030
"eslint-plugin-import": "^2.31.0",
3131
"eslint-plugin-jsx-a11y": "^6.10.2",
32+
"globals": "^15.15.0",
3233
"notistack": "^3.0.2",
3334
"react": "^19.0.0",
3435
"react-dom": "^19.0.0",
36+
"react-router-dom": "^7.5.3",
3537
"remeda": "^2.21.3"
3638
},
39+
3740
"devDependencies": {
3841
"@eslint/js": "^9.21.0",
42+
"@types/node": "^22.15.3",
3943
"@tanstack/react-query-devtools": "^5.74.4",
40-
"@types/node": "^22.14.1",
4144
"@types/react": "^19.0.10",
4245
"@types/react-dom": "^19.0.4",
4346
"@typescript-eslint/parser": "^8.29.1",
@@ -49,14 +52,15 @@
4952
"eslint-plugin-react-hooks": "^5.1.0",
5053
"eslint-plugin-react-refresh": "^0.4.19",
5154
"gh-pages": "^6.3.0",
52-
"globals": "^15.15.0",
5355
"iamport-typings": "^1.4.0",
5456
"prettier": "^3.5.3",
5557
"typescript": "~5.7.2",
5658
"typescript-eslint": "^8.24.1",
5759
"vite": "^6.2.0",
5860
"vite-plugin-mdx": "^3.6.1",
59-
"vite-plugin-mkcert": "^1.17.8"
61+
"vite-plugin-mkcert": "^1.17.8",
62+
"vite-plugin-svgr": "^4.3.0"
63+
6064
},
6165
"packageManager": "[email protected]+sha512.2d92c86b7928dc8284f53494fb4201f983da65f0fb4f0d40baafa5cf628fa31dae3e5968f12466f17df7e97310e30f343a648baea1b9b350685dafafffdf5808"
6266
}

0 commit comments

Comments
 (0)