From 7d2a10b66e7754360ae15d5d5a5c67e1b8dc682e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=95=B4=EB=A6=AC=28=EC=B5=9C=ED=98=84=EC=9B=85=29?= Date: Fri, 23 Aug 2024 17:47:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"[FE]=20build:dev=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=EC=97=90=EC=84=9C=20=EB=85=B8?= =?UTF-8?q?=EB=93=9C=20=ED=99=98=EA=B2=BD=EC=9D=84=20production=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95=20(#324)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9bbd94efffe61a0367038df7d3d2d210d1378884. --- frontend/package.json | 2 +- frontend/src/index.tsx | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 8428e1b0f..c3d9164a8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,7 +7,7 @@ "prod": "webpack server --open --config webpack.prod.js", "dev": "webpack server --open --config webpack.dev.js", "build:prod": "cross-env REACT_APP_ENABLE_MSW=false NODE_ENV=production webpack --config webpack.prod.js && npm run sentry:sourcemaps", - "build:dev": "cross-env REACT_APP_ENABLE_MSW=false NODE_ENV=production webpack --config webpack.dev.js", + "build:dev": "cross-env REACT_APP_ENABLE_MSW=false NODE_ENV=development webpack --config webpack.dev.js", "sentry:sourcemaps": "sentry-cli sourcemaps inject ./dist && sentry-cli sourcemaps upload -o momo2024 -p momo-harry-test /dist", "lint:css": "stylelint '**/*.styles.ts' --fix", "test": "jest", diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index 10d6dd626..5e83bdfd0 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -11,6 +11,8 @@ import theme from '@styles/theme'; import App from './App'; const enableMocking = async () => { + if (process.env.REACT_APP_ENABLE_MSW && process.env.REACT_APP_ENABLE_MSW === 'false') return; + if (process.env.NODE_ENV !== 'development') { return; } From 9e9dfad5dc4742d0b1a3ce21cbdf97515f606513 Mon Sep 17 00:00:00 2001 From: hwinkr Date: Fri, 23 Aug 2024 17:50:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20cross-env=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index c3d9164a8..f1d85990f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,8 +6,8 @@ "scripts": { "prod": "webpack server --open --config webpack.prod.js", "dev": "webpack server --open --config webpack.dev.js", - "build:prod": "cross-env REACT_APP_ENABLE_MSW=false NODE_ENV=production webpack --config webpack.prod.js && npm run sentry:sourcemaps", - "build:dev": "cross-env REACT_APP_ENABLE_MSW=false NODE_ENV=development webpack --config webpack.dev.js", + "build:prod": "NODE_ENV=production webpack --config webpack.prod.js && npm run sentry:sourcemaps", + "build:dev": "NODE_ENV=development webpack --config webpack.dev.js", "sentry:sourcemaps": "sentry-cli sourcemaps inject ./dist && sentry-cli sourcemaps upload -o momo2024 -p momo-harry-test /dist", "lint:css": "stylelint '**/*.styles.ts' --fix", "test": "jest",