Skip to content

Commit dc289db

Browse files
authored
Merge pull request #74 from YAPP-Github/feature/PRODUCT-50
feat: Login 페이지 구현 및 TextButton / GNB 공통 컴포넌트 구현 (#37)
2 parents 38c77d5 + 81f5b35 commit dc289db

39 files changed

Lines changed: 4245 additions & 2067 deletions

.storybook/main.ts

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,39 @@
1-
import type { StorybookConfig } from "@storybook/nextjs-vite";
2-
import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin";
3-
import svgr from "vite-plugin-svgr";
4-
import tsconfigPaths from "vite-tsconfig-paths";
1+
/* eslint-disable @typescript-eslint/no-explicit-any */
2+
import type { StorybookConfig } from "@storybook/nextjs";
3+
import { VanillaExtractPlugin } from "@vanilla-extract/webpack-plugin";
54

65
const config: StorybookConfig = {
76
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
8-
addons: [
9-
"@chromatic-com/storybook",
10-
"@storybook/addon-docs",
11-
"@storybook/addon-a11y",
12-
"@storybook/addon-vitest",
13-
],
7+
addons: ["@storybook/addon-docs", "@storybook/addon-a11y"],
148
framework: {
15-
name: "@storybook/nextjs-vite",
9+
name: "@storybook/nextjs",
1610
options: {},
1711
},
1812
features: {
1913
experimentalRSC: true,
2014
},
2115
staticDirs: ["../public"],
22-
async viteFinal(config) {
23-
return {
24-
...config,
25-
plugins: [
26-
...(config.plugins ?? []),
27-
svgr(),
28-
vanillaExtractPlugin(),
29-
tsconfigPaths(),
30-
],
31-
};
16+
webpackFinal: async (config: any) => {
17+
const imageRule = config.module.rules.find(rule => {
18+
const test = (rule as { test: RegExp }).test;
19+
20+
if (!test) {
21+
return false;
22+
}
23+
24+
return test.test(".svg");
25+
}) as { [key: string]: any };
26+
27+
imageRule.exclude = /\.svg$/;
28+
29+
config.module.rules.push({
30+
test: /\.svg$/,
31+
use: ["@svgr/webpack"],
32+
});
33+
34+
config.plugins.push(new VanillaExtractPlugin());
35+
36+
return config;
3237
},
3338
};
3439
export default config;

.storybook/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import "@/styles/reset.css.ts";
22

3-
import type { Preview } from "@storybook/nextjs-vite";
3+
import type { Preview } from "@storybook/nextjs";
44

55
const preview: Preview = {
66
parameters: {

.storybook/vitest.setup.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

package.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@vanilla-extract/dynamic": "^2.1.5",
2424
"@vanilla-extract/recipes": "^0.5.7",
2525
"iron-session": "^8.0.4",
26-
"ky": "^1.8.1",
26+
"ky": "1.7.5",
2727
"next": "15.3.2",
2828
"react": "^19.0.0",
2929
"react-dom": "^19.0.0",
@@ -40,8 +40,11 @@
4040
"@playwright/test": "^1.52.0",
4141
"@storybook/addon-a11y": "^9.0.15",
4242
"@storybook/addon-docs": "^9.0.15",
43-
"@storybook/addon-vitest": "^9.0.15",
44-
"@storybook/nextjs-vite": "^9.0.15",
43+
"@storybook/nextjs": "^9.0.15",
44+
"@vitejs/plugin-react": "^4.5.0",
45+
"@vitest/browser": "^3.1.4",
46+
"@vitest/coverage-v8": "^3.1.4",
47+
"@vitest/eslint-plugin": "^1.2.1",
4548
"@svgr/webpack": "^8.1.0",
4649
"@testing-library/dom": "^10.4.0",
4750
"@testing-library/jest-dom": "^6.6.3",
@@ -50,12 +53,8 @@
5053
"@types/node": "^20",
5154
"@types/react": "^19",
5255
"@types/react-dom": "^19",
53-
"@vanilla-extract/next-plugin": "^2.4.11",
54-
"@vanilla-extract/vite-plugin": "^5.0.7",
55-
"@vitejs/plugin-react": "^4.5.0",
56-
"@vitest/browser": "^3.1.4",
57-
"@vitest/coverage-v8": "^3.1.4",
58-
"@vitest/eslint-plugin": "^1.2.1",
56+
"@vanilla-extract/next-plugin": "^2.4.14",
57+
"@vanilla-extract/webpack-plugin": "^2.3.22",
5958
"chromatic": "^13.0.1",
6059
"commitizen": "^4.3.1",
6160
"eslint": "^9",
@@ -75,10 +74,8 @@
7574
"prettier": "^3.5.3",
7675
"storybook": "^9.0.15",
7776
"typescript": "^5",
78-
"vite": "6.2.0",
79-
"vite-plugin-svgr": "^4.3.0",
80-
"vite-tsconfig-paths": "^5.1.4",
81-
"vitest": "^3.1.4"
77+
"vitest": "^3.1.4",
78+
"vite-tsconfig-paths": "^5.1.4"
8279
},
8380
"msw": {
8481
"workerDirectory": [

0 commit comments

Comments
 (0)