Merge branch 'release/2.4.28' into craft-webpack

nystudio107 · Mar 24, 2021 · 80e597b · 80e597b
2 parents 664dd8a + 8cba704
commit 80e597b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.4.28 - 2021.03.22
+### Fixed
+* Fixed an issue with the `webpack-dev-server` version `^4.0.0-beta.1` by moving the `overlay` config setting to `client` (https://github.com/nystudio107/craft/issues/54)
+
 ## 2.4.27 - 2021.03.22
 ### Added
 * Added `make` command aliases

diff --git a/buildchain/package.json b/buildchain/package.json
@@ -112,7 +112,7 @@
     "webpack": "^5.13.0",
     "webpack-bundle-analyzer": "^4.3.0",
     "webpack-cli": "^4.3.0",
-    "webpack-dev-server": "^4.0.0-beta.0",
+    "webpack-dev-server": "^4.0.0-beta.1",
     "webpack-manifest-plugin": "^3.0.0",
     "webpack-merge": "^5.7.0",
     "workbox-webpack-plugin": "^6.0.0"

diff --git a/buildchain/webpack-configs/dev-server.config.js b/buildchain/webpack-configs/dev-server.config.js
@@ -13,6 +13,7 @@ module.exports = (type = 'modern', settings) => {
     const common = () => ({
         devServer: {
             client: {
+                overlay: true,
                 progress: false,
             },
             dev: {
@@ -25,7 +26,6 @@ module.exports = (type = 'modern', settings) => {
             host: settings.host(),
             hot: true,
             https: !!parseInt(settings.https()),
-            overlay: true,
             port: settings.port(),
             public: settings.public(),
             static: {