Merge branch 'release/2.4.44' into craft-webpack

nystudio107 · Jul 20, 2021 · fc2d5be · fc2d5be
2 parents 612effb + 452383a
commit fc2d5be
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.4.44 - 2021.07.20
+### Fixed
+* Fix breaking changes due to `webpack-dev-server` `^4.0.0-rc.0`
+
 ## 2.4.43 - 2021.07.19
 ### Changed
 * Remove `storage/` dir

diff --git a/buildchain/package.json b/buildchain/package.json
@@ -111,7 +111,7 @@
     "webpack": "^5.13.0",
     "webpack-bundle-analyzer": "^4.3.0",
     "webpack-cli": "^4.3.0",
-    "webpack-dev-server": "^4.0.0-beta.3",
+    "webpack-dev-server": "^4.0.0-rc.0",
     "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,21 +13,24 @@ module.exports = (type = 'modern', settings) => {
     const common = () => ({
         devServer: {
             client: {
+                allowedHosts: "all",
                 overlay: true,
                 progress: false,
+                webSocketURL: {
+                    hostname: settings.host(),
+                    port: settings.port(),
+                },
             },
             devMiddleware: {
                 publicPath: '/',
             },
-            firewall: false,
             headers: {
                 'Access-Control-Allow-Origin': '*'
             },
             host: settings.host(),
             hot: true,
             https: !!parseInt(settings.https()),
             port: settings.port(),
-            public: settings.public(),
             static: {
                 directory: path.resolve(__dirname, settings.contentBase()),
                 publicPath: '/',

diff --git a/buildchain/webpack-settings/dev-server.settings.js b/buildchain/webpack-settings/dev-server.settings.js
@@ -10,5 +10,4 @@ module.exports = {
     https: () => process.env.DEVSERVER_HTTPS || false,
     poll: () => process.env.DEVSERVER_POLL || false,
     port: () => process.env.DEVSERVER_PORT || 8080,
-    public: () => process.env.DEVSERVER_PUBLIC || 'http://localhost:8080',
 };
diff --git a/cms/example.env b/cms/example.env
@@ -44,7 +44,6 @@ REDIS_CRAFT_DB=1
 
 # webpack settings
 PUBLIC_PATH=/dist/
-DEVSERVER_PUBLIC=http://localhost:8080
 DEVSERVER_HOST=0.0.0.0
 DEVSERVER_POLL=0
 DEVSERVER_PORT=8080