Skip to content

Commit ebda438

Browse files
committed
Merge branch 'develop' into refactor/#182/textField
2 parents e34ce53 + ef5d781 commit ebda438

File tree

74 files changed

+1195
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1195
-732
lines changed

.nvmrc 2

Lines changed: 0 additions & 1 deletion
This file was deleted.

.storybook/main.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { StorybookConfig } from '@storybook/react-vite';
22
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
33
import svgr from 'vite-plugin-svgr';
4+
import path from 'node:path';
45

56
const config: StorybookConfig = {
67
stories: ['../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
@@ -22,6 +23,21 @@ const config: StorybookConfig = {
2223
...(config.optimizeDeps || {}),
2324
include: ['@vanilla-extract/css'],
2425
};
26+
config.resolve = {
27+
...(config.resolve || {}),
28+
alias: {
29+
...(config.resolve?.alias || {}),
30+
'@': path.resolve(__dirname, '../src'),
31+
'@api': path.resolve(__dirname, '../src/api'),
32+
'@assets': path.resolve(__dirname, '../src/assets'),
33+
'@common': path.resolve(__dirname, '../src/common'),
34+
'@page': path.resolve(__dirname, '../src/page'),
35+
'@route': path.resolve(__dirname, '../src/route'),
36+
'@shared': path.resolve(__dirname, '../src/shared'),
37+
'@style': path.resolve(__dirname, '../src/style'),
38+
'@type': path.resolve(__dirname, '../src/type'),
39+
},
40+
};
2541
return config;
2642
},
2743
};

.storybook/preview.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import type { Preview } from '@storybook/react';
2-
import '../src/style/reset.css';
3-
import '../src/style/global.css';
2+
import React from 'react';
3+
import { OverlayProvider } from 'overlay-kit';
4+
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
5+
import '../src/style/reset.css.ts';
6+
import '../src/style/global.css.ts';
7+
8+
const queryClient = new QueryClient();
49

510
const preview: Preview = {
611
parameters: {
@@ -31,6 +36,14 @@ const preview: Preview = {
3136
test: 'todo',
3237
},
3338
},
39+
decorators: [
40+
(Story) =>
41+
React.createElement(
42+
QueryClientProvider,
43+
{ client: queryClient },
44+
React.createElement(OverlayProvider, null, React.createElement(Story)),
45+
),
46+
],
3447
};
3548

3649
export default preview;

eslint.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default tseslint.config(
4040
...reactHooks.configs.recommended.rules,
4141
...jsxA11y.configs.recommended.rules,
4242
'react/react-in-jsx-scope': 'off',
43-
'no-console': 'warn',
43+
'no-console': 'off',
4444
'no-unused-vars': 'off',
4545
'@typescript-eslint/no-unused-vars': 'warn',
4646
curly: 'error',
@@ -52,7 +52,7 @@ export default tseslint.config(
5252
},
5353
],
5454
'react/self-closing-comp': 'warn',
55-
'@typescript-eslint/no-explicit-any': 'warn',
55+
'@typescript-eslint/no-explicit-any': 'off',
5656
'react/jsx-pascal-case': 'error',
5757
'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
5858
'prettier/prettier': [

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"clsx": "^2.1.1",
2727
"lottie-react": "^2.4.1",
2828
"openapi-typescript": "^7.8.0",
29+
"overlay-kit": "^1.8.5",
2930
"react": "^19.1.0",
3031
"react-dom": "^19.1.0",
3132
"react-redux": "^9.2.0",
@@ -43,6 +44,7 @@
4344
"@storybook/preview-api": "^8.6.14",
4445
"@storybook/react": "^9.0.15",
4546
"@storybook/react-vite": "^9.0.15",
47+
"@storybook/test": "8.6.14",
4648
"@storybook/types": "^8.6.14",
4749
"@tanstack/react-query-devtools": "^5.81.5",
4850
"@types/react": "^19.1.2",
@@ -75,4 +77,4 @@
7577
"vitest": "^3.2.4"
7678
},
7779
"packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184"
78-
}
80+
}

pnpm-lock.yaml

Lines changed: 130 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const GOOGLE_CLIENT_ID = import.meta.env.VITE_GOOGLE_CLIENT_ID;
2-
export const GOOGLE_REDIRECT_URI = import.meta.env.VITE_GOOGLE_REDIRECT_URI;
2+
export const GOOGLE_REDIRECT_URI = import.meta.env.VITE_GOOGLE_REDIRECT_URI_LOCAL;
33
export const GOOGLE_AUTH_BASE_URL = 'https://accounts.google.com/o/oauth2/v2/auth';
44
export const GOOGLE_SCOPE = 'openid email profile';
55
export const GOOGLE_RESPONSE_TYPE = 'code';

0 commit comments

Comments
 (0)