Merge branch 'release/2.4.45' into craft-webpack

nystudio107 · Jul 20, 2021 · a01c9a7 · a01c9a7
2 parents fc2d5be + 9b7c1dd
commit a01c9a7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.4.45 - 2021.07.20
+### Fixed
+* Add `publicPath` back in, and fix `allowedHosts` location in the config
+
 ## 2.4.44 - 2021.07.20
 ### Fixed
 * Fix breaking changes due to `webpack-dev-server` `^4.0.0-rc.0`

diff --git a/buildchain/webpack-configs/dev-server.config.js b/buildchain/webpack-configs/dev-server.config.js
@@ -12,8 +12,8 @@ module.exports = (type = 'modern', settings) => {
     // common config
     const common = () => ({
         devServer: {
+            allowedHosts: "all",
             client: {
-                allowedHosts: "all",
                 overlay: true,
                 progress: false,
                 webSocketURL: {

diff --git a/buildchain/webpack-settings/dev-server.settings.js b/buildchain/webpack-settings/dev-server.settings.js
@@ -10,4 +10,5 @@ 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
@@ -48,6 +48,7 @@ DEVSERVER_HOST=0.0.0.0
 DEVSERVER_POLL=0
 DEVSERVER_PORT=8080
 DEVSERVER_HTTPS=0
+DEVSERVER_PUBLIC=http://localhost:8080
 
 # Twigpack settings
 TWIGPACK_DEV_SERVER_MANIFEST_PATH=http://webpack:8080/