Skip to content

Commit

Permalink
Merge pull request #39 from themoment-team/develop
Browse files Browse the repository at this point in the history
Release v1.0.0
  • Loading branch information
hyeongrok7874 committed Nov 16, 2023
2 parents 6d215f1 + 92ef592 commit a80eb30
Show file tree
Hide file tree
Showing 139 changed files with 4,553 additions and 822 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
BASE_URL=running-url
API_BASE_URL=api-base-url
NEXT_PUBLIC_API_BASE_URL=api-base-url
3 changes: 2 additions & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ const config: StorybookConfig = {
autodocs: 'tag',
},
webpackFinal: async (config) => {
config.resolve.alias['@'] = path?.resolve(__dirname, '../src/');
if (config.resolve?.alias)
config.resolve.alias['@'] = path?.resolve(__dirname, '../src/');
return config;
},
};
Expand Down
6 changes: 3 additions & 3 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ const preview: Preview = {
},
],
},
nextjs: {
appDirectory: true,
},
},
nextjs: {
appDirectory: true,
},
layout: 'fullscreen',
viewport: {
Expand Down
9 changes: 9 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import nextJest from 'next/jest';

const createJestConfig = nextJest({ dir: './' });

const customJestConfig = {
setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
};

export default createJestConfig(customJestConfig);
9 changes: 9 additions & 0 deletions jest.setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const jestSetup = {
preset: 'ts-jest',
testEnvironment: 'node',
coverageDirectory: '<rootDir>/coverage',
testPathIgnorePatterns: ['<rootDir>/node_modules', '<rootDir>/**/index.ts'],
testMatch: ['<rootDir>/src/utils/__test__/*.test.ts'],
};

export default jestSetup;
9 changes: 5 additions & 4 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
compiler: {
styledComponents: {
ssr: true,
rewrites: async () => [
{
source: '/api/v1/:path*',
destination: `${process.env.NEXT_PUBLIC_API_BASE_URL}/api/v1/:path*`,
},
},
],
};

module.exports = nextConfig;
36 changes: 23 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,53 @@
"start": "next start",
"lint": "next lint",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
"build-storybook": "storybook build",
"test": "jest --watchAll --coverage"
},
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@hookform/resolvers": "^3.3.1",
"@tanstack/react-query": "^5.0.5",
"@tanstack/react-query-devtools": "^5.1.0",
"@types/node": "20.5.7",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
"axios": "^1.5.1",
"emotion-reset": "^3.0.1",
"eslint": "8.48.0",
"eslint-config-next": "^13.5.2",
"firebase": "^10.3.1",
"next": "^13.5.2",
"next": "^14.0.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "^7.46.1",
"react-toastify": "^9.1.3",
"typescript": "5.2.2"
"typescript": "5.2.2",
"zod": "^3.21.4"
},
"devDependencies": {
"@storybook/addon-essentials": "^7.4.0",
"@storybook/addon-interactions": "^7.4.0",
"@storybook/addon-links": "^7.4.0",
"@storybook/addon-essentials": "^7.5.2",
"@storybook/addon-interactions": "^7.5.2",
"@storybook/addon-links": "^7.5.2",
"@storybook/addon-onboarding": "^1.0.8",
"@storybook/addon-styling": "^1.3.7",
"@storybook/addon-viewport": "^7.4.0",
"@storybook/blocks": "^7.4.0",
"@storybook/nextjs": "^7.4.0",
"@storybook/react": "^7.4.0",
"@storybook/testing-library": "^0.2.0",
"@storybook/addon-viewport": "^7.5.2",
"@storybook/blocks": "^7.5.2",
"@storybook/nextjs": "^7.5.2",
"@storybook/react": "^7.5.2",
"@storybook/testing-library": "^0.2.2",
"@types/gtag.js": "^0.0.13",
"@types/jest": "^29.5.7",
"@typescript-eslint/eslint-plugin": "^6.5.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-sort-exports": "^0.8.0",
"eslint-plugin-storybook": "^0.6.13",
"eslint-plugin-storybook": "^0.6.15",
"eslint-plugin-unused-imports": "^3.0.0",
"jest": "^29.7.0",
"prettier": "^3.0.3",
"storybook": "^7.4.0"
"storybook": "^7.5.2",
"ts-node": "^10.9.1"
}
}
Loading

0 comments on commit a80eb30

Please sign in to comment.