From 80c43d4182c3c81aaf388ca08dcd393dd66e09de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A1=B0=EC=98=88=EC=A7=84?= <orobos654@gmail.com>
Date: Sat, 5 Aug 2023 00:36:46 +0900
Subject: [PATCH] chore: remove webpack-merge

---
 .github/workflows/deploy-main.yml      | 2 +-
 package-lock.json                      | 3 +--
 package.json                           | 5 ++---
 webpack.common.js => webpack.config.js | 0
 webpack.dev.js                         | 7 -------
 5 files changed, 4 insertions(+), 13 deletions(-)
 rename webpack.common.js => webpack.config.js (100%)
 delete mode 100644 webpack.dev.js

diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
index bd729d3..222c2a5 100644
--- a/.github/workflows/deploy-main.yml
+++ b/.github/workflows/deploy-main.yml
@@ -37,7 +37,7 @@ jobs:
                   value: ${{ secrets.STYLESHEET_URL }}
               ports: ${{ secrets.PORT }}
               install: npm ci
-              build: npx webpack --config webpack.common.js
+              build: npx webpack --config webpack.config.js
               start: node dist/bundle.js
               healthz: /health
             context:
diff --git a/package-lock.json b/package-lock.json
index 9ecc31d..a7c68b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,8 +48,7 @@
         "prettier": "^3.0.0",
         "typescript": "^5.1.6",
         "webpack": "^5.88.2",
-        "webpack-cli": "^5.1.4",
-        "webpack-merge": "^5.9.0"
+        "webpack-cli": "^5.1.4"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
diff --git a/package.json b/package.json
index 7547068..ba13c19 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "node server for ssr",
   "main": "dist/bundle.js",
   "scripts": {
-    "dev:watch": "webpack --config webpack.dev.js --watch",
+    "dev:watch": "webpack --config webpack.config.js --watch",
     "dev:serve": "node --watch dist/bundle.js",
     "dev": "NODE_ENV=development npm-run-all --parallel dev:*"
   },
@@ -37,8 +37,7 @@
     "prettier": "^3.0.0",
     "typescript": "^5.1.6",
     "webpack": "^5.88.2",
-    "webpack-cli": "^5.1.4",
-    "webpack-merge": "^5.9.0"
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {
     "@koa/router": "^12.0.0",
diff --git a/webpack.common.js b/webpack.config.js
similarity index 100%
rename from webpack.common.js
rename to webpack.config.js
diff --git a/webpack.dev.js b/webpack.dev.js
deleted file mode 100644
index 54f1987..0000000
--- a/webpack.dev.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const { merge } = require('webpack-merge');
-
-const common = require('./webpack.common.js');
-
-module.exports = merge(common, {
-  mode: 'development',
-});