Merge branch 'release/2.4.22' into craft-webpack

nystudio107 · Feb 3, 2021 · a42dc3e · a42dc3e
2 parents e43154b + 493b08a
commit a42dc3e
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.22 - 2021.02.02
+### Fixed
+* Fix setting that’d cause HMR to fail to work unless a production build existed
+
 ## 2.4.21 - 2021.02.02
 ### Changed
 * Changed `return 0` to `exit 0` in the `composer.json` scripts

diff --git a/cms/config/twigpack.php b/cms/config/twigpack.php
@@ -46,7 +46,7 @@
         'publicPath' => App::env('TWIGPACK_DEV_SERVER_PUBLIC_PATH'),
     ],
     // Bundle to use with the webpack-dev-server
-    'devServerBuildType' => 'combined',
+    'devServerBuildType' => 'modern',
     // Whether to include a Content Security Policy "nonce" for inline
     // CSS or JavaScript. Valid values are 'header' or 'tag' for how the CSP
     // should be included. c.f.:

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.4.21",
+  "version": "2.4.22",
   "keywords": [
     "craft",
     "cms",