Merge branch 'release/4.2.1.1' into main

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes for Craft CMS 4
 
+## 4.2.1.1 - 2022-08-10
+
+### Fixed
+- Fixed a bug where saving an element with invalid field values could result in some field values being forgotten. ([#11756](https://github.com/craftcms/cms/issues/11756))
+- Fixed a bug where it wasn’t always possible to serve asset bundles via `webpack-dev-server` over SSL. ([#11758](https://github.com/craftcms/cms/pull/11758))
+
 ## 4.2.1 - 2022-08-09
 
 ### Added

src/config/app.php

@@ -3,7 +3,7 @@
 return [
     'id' => 'CraftCMS',
     'name' => 'Craft CMS',
-    'version' => '4.2.1',
+    'version' => '4.2.1.1',
     'schemaVersion' => '4.0.0.9',
     'minVersionRequired' => '3.7.11',
     'basePath' => dirname(__DIR__), // Defines the @app alias

src/fieldlayoutelements/CustomField.php

@@ -208,8 +208,7 @@ public function formHtml(?ElementInterface $element = null, bool $static = false
         $view->setIsDeltaRegistrationActive(
             $isDeltaRegistrationActive &&
             ($element->id ?? false) &&
-            !$static &&
-            !$element?->hasErrors(sprintf('%s.*', $this->attribute()))
+            !$static
         );
         $html = $view->namespaceInputs(function() use ($element, $static) {
             return (string)parent::formHtml($element, $static);

src/helpers/Db.php

@@ -767,7 +767,7 @@ public static function parseMoneyParam(
      * @param string|bool $value The param value
      * @param bool|null $defaultValue How `null` values should be treated
      * @return array
-     * @since 3.4.15
+     * @since 3.4.14
      */
     public static function parseBooleanParam(string $column, mixed $value, ?bool $defaultValue = null): array
     {

src/services/Webpack.php

@@ -199,11 +199,9 @@ public function getDevServer(string $class): string
      * Returns the running status of the webpack dev server.
      *
      * @param string $class
-     * @phpstan-param class-string<AssetBundle> $class
      * @param string $loopback
      * @return bool
      * @throws GuzzleException
-     * @throws ReflectionException
      */
     private function _isDevServerRunning(string $class, string $loopback): bool
     {
@@ -216,7 +214,8 @@ private function _isDevServerRunning(string $class, string $loopback): bool
             return $this->_isDevServerRunning[$class] = $this->_matchAsset($this->_serverResponse[$loopback], $class);
         }
 
-        $client = Craft::createGuzzleClient();
+        // Make sure the request isn't too strict for people running the dev server using https and outside the container
+        $client = Craft::createGuzzleClient(['verify' => false]);
         try {
             $res = $client->get(StringHelper::ensureRight($loopback, '/') . 'which-asset');
             if ($res->getStatusCode() !== 200) {

src/web/assets/cp/src/js/ElementEditor.js

@@ -1535,7 +1535,8 @@ Craft.ElementEditor = Garnish.Base.extend(
         data,
         this.$container.data('delta-names'),
         deltaCallback,
-        this.$container.data('initial-delta-values')
+        this.$container.data('initial-delta-values'),
+        this.$container.data('modified-delta-names')
       );
 
       // Swap out element IDs with their duplicated ones