Merge branch 'dev' of https://github.com/GDSC-PKNU-21-22/pknu-notice …

…into feat/#9 테스트 통과를 위해 dev 브랜치 pull
GDSC-PKNU-Official · Apr 2, 2023 · b8cfc7f · b8cfc7f
2 parents b258019 + 3c97939
commit b8cfc7f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -3,6 +3,13 @@ export default {
   testEnvironment: 'jsdom',
   testMatch: ['**/src/**/*.{spec,test}.{js,jsx,ts,tsx}'],
   moduleNameMapper: {
-    '^@/(.*)': '<rootDir>/src/$1',
+    '^@type/(.*)$': '<rootDir>/src/@types/$1',
+    '^@components/(.*)$': '<rootDir>/src/components/$1',
+    '^@constants/(.*)$': '<rootDir>/src/constants/$1',
+    '^@styles/(.*)$': '<rootDir>/src/styles/$1',
+    '^@utils/(.*)$': '<rootDir>/src/utils/$1',
+    '^@hooks/(.*)$': '<rootDir>/src/hooks/$1',
+    '^@pages/(.*)$': '<rootDir>/src/pages/$1',
+    '^@assets/(.*)$': '<rootDir>/public/assets/$1',
   },
 };
diff --git a/src/App.tsx b/src/App.tsx
@@ -10,7 +10,7 @@ const App = () => {
       <Route path="/" element={<Home />} />
       <Route path="/announcement" element={<Announcement />} />
       <Route path="/my" element={<My />} />
-      <Route path="major-decision" element={<MajorDecision />} />
+      <Route path="/major-decision" element={<MajorDecision />} />
     </Routes>
   );
 };

diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
+import { Size, SizeOption } from '@type/styles/size';
 import { setSize } from '@utils/styles/size';
-import React, { CSSProperties } from 'react';
-import { Size, SizeOption } from 'src/@types/styles/size';
+import { CSSProperties } from 'react';
 
 type ImageSize = {
   [key in SizeOption]: Size;

diff --git a/src/utils/styles/size.ts b/src/utils/styles/size.ts
@@ -1,4 +1,4 @@
-import { Size } from 'src/@types/styles/size';
+import { Size } from '@type/styles/size';
 
 export function setSize(heigth: number): Size;
 export function setSize(height: number, width?: number): Size;

diff --git a/tsconfig.path.json b/tsconfig.path.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
+      "@type/*": ["./src/@types/*"],
       "@components/*": ["./src/components/*"],
       "@constants/*": ["./src/constants/*"],
       "@styles/*": ["./src/styles/*"],

diff --git a/vite.config.ts b/vite.config.ts
@@ -9,6 +9,10 @@ export default defineConfig({
   plugins: [react(), tsconfigPaths()],
   resolve: {
     alias: [
+      {
+        find: '@type',
+        replacement: resolve(__dirname, './src/@types'),
+      },
       {
         find: '@components',
         replacement: resolve(__dirname, './src/components'),