chore: remove webpack-merge

Nexters · Aug 4, 2023 · 80c43d4 · 80c43d4
1 parent 7e1cf0d
commit 80c43d4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git 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
diff --git 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 → webpack.config.js b/webpack.common.js → webpack.config.js
diff --git a/webpack.dev.js b/webpack.dev.js