Skip to content

Commit

Permalink
fix: 웹팩 빌드 오류를 해결한다 (#138)
Browse files Browse the repository at this point in the history
* chore: 웹팩 빌드 오류 수정

- styled-components의 createGlobalStyle 내부에 @import 삭제

[#135]

* refactor: 개발 환경에서만 msw가 동작하도록 분기처리한 부분 삭제

- 백엔드와 연결 성공 시 다시 분기 처리할 것

[#135]
  • Loading branch information
kyw0716 authored Jul 19, 2023
1 parent af9832b commit 083b098
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
14 changes: 6 additions & 8 deletions frontend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ import { GlobalStyle } from 'style/GlobalStyle';
const queryClient = new QueryClient();

const main = async () => {
if (process.env.NODE_ENV === 'development') {
await worker.start({
serviceWorker: {
url: '/mockServiceWorker.js',
},
onUnhandledRequest: 'bypass',
});
}
await worker.start({
serviceWorker: {
url: '/mockServiceWorker.js',
},
onUnhandledRequest: 'bypass',
});

const domNode = document.getElementById('root');
const root = createRoot(domNode);
Expand Down
6 changes: 0 additions & 6 deletions frontend/src/style/GlobalStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ import { createGlobalStyle } from 'styled-components';
import { reset } from './reset';

export const GlobalStyle = createGlobalStyle`
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap");
${reset}
* {
font-family: "Noto Sans KR", sans-serif !important;
}
/********** hidden scroll **********/
html,
Expand Down

0 comments on commit 083b098

Please sign in to comment.