Merge branch '5.x'

Author: jasonvarga

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Release Notes
 
+## 5.46.0 (2025-01-22)
+
+### What's new
+- Add empty/not empty filters for replicator, bard and grid [#11354](https://github.com/statamic/cms/issues/11354) by @jacksleight
+- Page children as value for field conditions [#11368](https://github.com/statamic/cms/issues/11368) by @heidkaemper
+- Allow addons cache path to be set by an environment variable [#11365](https://github.com/statamic/cms/issues/11365) by @ryanmitchell
+
+### What's fixed
+- Fix error with disallowed words in Comb search driver [#11336](https://github.com/statamic/cms/issues/11336) by @duncanmcclean
+- Fixed ordering search results by origin value [#11334](https://github.com/statamic/cms/issues/11334) by @duncanmcclean
+- Fix case insensitive Comb search for UTF-8 characters [#11363](https://github.com/statamic/cms/issues/11363) by @heidkaemper
+- Translate name in user group fieldtype [#11343](https://github.com/statamic/cms/issues/11343) by @duncanmcclean
+- Fix UI bugs in Safari 18.2 [#11335](https://github.com/statamic/cms/issues/11335) by @marcorieser
+
+
+
+## 5.45.2 (2025-01-21)
+
+### What's fixed
+- Revert "Allow form fields view to be rendered with single tag" [#11374](https://github.com/statamic/cms/issues/11374) by @duncanmcclean
+- Remove `type` attribute in nocache replacer [#11373](https://github.com/statamic/cms/issues/11373) by @marcorieser
+- Fix deprecation warning from regex operator [#11337](https://github.com/statamic/cms/issues/11337) by @duncanmcclean
+- Fix bug report link in Contribution Guide [#11367](https://github.com/statamic/cms/issues/11367) by @duncanmcclean
+- Fix bard undefined href error [#11351](https://github.com/statamic/cms/issues/11351) by @jacksleight
+- Suppress “packing” git message [#11326](https://github.com/statamic/cms/issues/11326) by @edalzell
+
+
+
 ## 5.45.1 (2025-01-07)
 
 ### What's fixed

CONTRIBUTING.md

@@ -53,7 +53,7 @@ Next, please search through the [open issues](https://github.com/statamic/cms/is
 
 If you _do_ find a similar issue, upvote it by adding a :thumbsup: [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Only leave a comment if you have relevant information to add.
 
-If no one has filed the issue yet, feel free to [submit a new one](https://github.com/statamic/cms/issues/new). Please include a clear description of the issue, follow along with the issue template, and provide and as much relevant information as possible. Code examples demonstrating the issue are the best way to ensure a timely solution to the issue.
+If no one has filed the issue yet, feel free to [submit a new one](https://github.com/statamic/cms/issues/new?template=bug_report.yml). Please include a clear description of the issue, follow along with the issue template, and provide and as much relevant information as possible. Code examples demonstrating the issue are the best way to ensure a timely solution to the issue.
 
 ### Feature Requests
 

resources/css/elements/buttons.css

@@ -34,23 +34,27 @@ button {
 .btn, .btn-default {
     @apply text-gray-800 dark:text-dark-150 shadow-button;
     background: linear-gradient(180deg, #fff, #f9fafb);
+    background-clip: padding-box;
     border: 1px solid #D3DDE7;
     border-bottom: 1px solid #c4cdd6;
     box-shadow: inset 0 1px 0 0 #fff, 0 1px 0 0 rgba(0, 0, 0,.05), 0 2px 1px 0 theme(colors.gray.600 / .15), 0 0 0 0 transparent;
 
     .dark & {
         background: linear-gradient(180deg, theme(colors.dark.550), theme(colors.dark.600));
+        background-clip: padding-box;
         border-color: theme(colors.dark.700);
         box-shadow: inset 0 1px 0 0 theme(colors.dark.300), 0 1px 0 0 rgba(200, 200, 200,.05), 0 2px 1px 0 theme(colors.dark.900 / .15), 0 0 0 0 transparent;
     }
 
     &:hover:not(:disabled), &:active:not(:disabled) {
         @apply text-gray-800 dark:text-dark-150;
         background: linear-gradient(180deg, #f9fafb, #f4f6f8);
+        background-clip: padding-box;
         border-bottom: 1px solid #BFC7D0;
 
         .dark & {
             background: linear-gradient(180deg, theme(colors.dark.600), theme(colors.dark.700));
+            background-clip: padding-box;
             border-color: theme(colors.dark.800);
         }
     }
@@ -78,7 +82,7 @@ button {
 
 /*  Primary action button */
 .btn-primary {
-    @apply text-white bg-gradient-to-b from-blue-500 to-blue-600 dark:from-dark-blue-100 dark:to-dark-blue-150 border border-blue-700 dark:border-blue-900 border-b-blue-800 dark:border-b-dark-blue-200 !important;
+    @apply text-white bg-gradient-to-b from-blue-500 to-blue-600 dark:from-dark-blue-100 dark:to-dark-blue-150 bg-clip-padding border border-blue-700 dark:border-blue-900 border-b-blue-800 dark:border-b-dark-blue-200 !important;
     box-shadow: inset 0 1px 0 0 theme('colors.blue.400'), 0 1px 0 0 rgba(25,30,35,.05), 0 3px 2px -1px theme(colors.blue.900 / .15), 0 0 0 0 transparent;
 
     &:hover:not(:disabled), :active:not(:disabled) {
@@ -93,11 +97,11 @@ button {
 
 /*  Danger/delete button */
 .btn-danger {
-    @apply text-white bg-gradient-to-b from-red-500 to-red-600 border border-red-600 border-b-red-900;
+    @apply text-white bg-gradient-to-b from-red-500 to-red-600 bg-clip-padding border border-red-600 border-b-red-900;
     box-shadow: inset 0 1px 0 0 theme('colors.red.400'), 0 1px 0 0 rgba(0, 0, 0,.05), 0 3px 2px -1px theme(colors.red.900 / .15), 0 0 0 0 transparent;
 
     &:hover:not(:disabled), &:active:not(:disabled) {
-        @apply bg-gradient-to-b from-red-600 to-red-700 border border-red-700 border-b-red-900;
+        @apply bg-gradient-to-b from-red-600 to-red-700 bg-clip-padding border border-red-700 border-b-red-900;
     }
 
     &:disabled {
@@ -159,22 +163,26 @@ button {
 .btn-round {
     @apply rounded-full flex items-center text-center p-0;
     background: linear-gradient(180deg, #fff, #f9fafb);
+    background-clip: padding-box;
     border: 1px solid #c4cdd6;
     box-shadow: 0 1px 0 0 rgba(25,30,35,.05);
     height: 32px;
     width: 32px;
 
     .dark & {
         background: linear-gradient(180deg, theme(colors.dark.500), theme(colors.dark.550));
+        background-clip: padding-box;
         border-color: theme(colors.dark.400);
     }
 
     &:hover:not(:disabled), &:active:not(:disabled) {
         background: linear-gradient(180deg, #f9fafb, #f4f6f8);
+        background-clip: padding-box;
         border-color: #c4cdd5;
 
         .dark & {
             background: linear-gradient(180deg, theme(colors.dark.550), theme(colors.dark.600));
+            background-clip: padding-box;
             border-color: theme(colors.dark.500);
         }
     }

resources/css/elements/forms.css

@@ -93,13 +93,15 @@ input.input-text-minimal:read-only,
     .input-group-prepend, .input-group-append, .input-group-item {
         @apply rtl:rounded-r ltr:rounded-l px-2 border dark:border-dark-900 text-sm text-gray-800 dark:text-dark-150 select-none;
         background: linear-gradient(180deg, #fff, #f9fafb);
+        background-clip: padding-box;
         border: 1px solid #c4cdd6;
         box-shadow: 0 1px 0 0 rgba(25,30,35,.05);
         height: 2.375rem;
         line-height: 36px;
 
         .dark & {
             background: linear-gradient(180deg, theme(colors.dark.500), theme(colors.dark.600));
+            background-clip: padding-box;
             border-color: theme(colors.dark.900);
             box-shadow: 0 1px 0 0 rgba(0,0,0,.05);
         }
@@ -133,10 +135,12 @@ input.input-text-minimal:read-only,
     button.input-group-append:hover:not(:disabled),
     button.input-group-append:active:not(:disabled) {
         background: linear-gradient(180deg, #f9fafb, #f4f6f8);
+        background-clip: padding-box;
         border-color: #c4cdd5;
 
         .dark & {
             background: linear-gradient(180deg, theme(colors.dark.550), theme(colors.dark.600));
+            background-clip: padding-box;
             border-color: theme(colors.dark.900);
         }
     }
@@ -213,22 +217,26 @@ input.input-text-minimal:read-only,
         @apply select-none rounded leading-normal align-middle whitespace-nowrap appearance-none subpixel-antialiased;
 
         background: linear-gradient(180deg, #fff, #f9fafb);
+        background-clip: padding-box;
         border: 1px solid #c4cdd6;
         height: 2.375rem; /*  38px */
         letter-spacing: -0.01em;
         padding: .475rem 1.75rem .475rem .75rem ; [dir="rtl"] & { padding: .475rem .75rem .475rem 1.75rem ; }
 
         .dark & {
             background: linear-gradient(180deg, theme(colors.dark.500), theme(colors.dark.600));
+            background-clip: padding-box;
             border-color: theme(colors.dark.800);
         }
 
         &:hover:not(:disabled), &:active:not(:disabled) {
             background: linear-gradient(180deg, #f9fafb, #f4f6f8);
+            background-clip: padding-box;
             border-color: #c4cdd5;
 
             .dark & {
                 background: linear-gradient(180deg, theme(colors.dark.700), theme(colors.dark.750));
+                background-clip: padding-box;
                 border-color: theme(colors.dark.900);
             }
         }

resources/css/vendors/vue-select.css

@@ -104,7 +104,7 @@
 
 .vs__open-indicator {
 	@apply clickable;
-    @apply flex items-center rounded-e px-2 text-sm shrink-0 h-full border-e-0 dark:border-dark-800;
+    @apply flex items-center rounded-e px-2 text-sm shrink-0 h-full border-e-0 bg-clip-padding dark:border-dark-800;
 	/* height: 2.375rem; */
 }
 

resources/views/extend/forms/fields.antlers.html

@@ -6,11 +6,8 @@
                 <sup aria-label="{{ trans:Required }}">*</sup>
             {{ /if }}
         </label>
-        {{ if instructions && instructions_position == "above" }}
-            <p class="text-gray-500" id="{{ id }}-instructions">{{ instructions }}</p>
-        {{ /if }}
-        <div class="py-2">{{ field }}</div>
-        {{ if instructions && instructions_position == "below" }}
+        <div class="p-2">{{ field }}</div>
+        {{ if instructions }}
             <p class="text-gray-500" id="{{ id }}-instructions">{{ instructions }}</p>
         {{ /if }}
         {{ if error }}

src/Console/Processes/Git.php

@@ -89,6 +89,7 @@ protected function prepareErrorOutput($type, $buffer)
             'remote: Resolving deltas',
             'Permanently added the ECDSA host key for IP address',
             'remote: Processed',
+            'Auto packing the repository',
         ];
 
         if (Str::contains($buffer, $ignore)) {

src/Data/DataCollection.php

@@ -96,17 +96,19 @@ protected function getSortableValue($sort, $item)
             return $this->normalizeSortableValue($item[$sort] ?? null);
         }
 
-        $method = Str::camel($sort);
-
         if ($item instanceof Result && ! $item instanceof PlainResult) {
             $item = $item->getSearchable() ?? $item;
         }
 
-        $value = (method_exists($item, $method))
-            ? call_user_func([$item, $method])
-            : $item->get($sort);
+        if (method_exists($item, $method = Str::camel($sort))) {
+            return $this->normalizeSortableValue(call_user_func([$item, $method]));
+        }
+
+        if (method_exists($item, 'value')) {
+            return $this->normalizeSortableValue($item->value($sort));
+        }
 
-        return $this->normalizeSortableValue($value);
+        return $this->normalizeSortableValue($item->get($sort));
     }
 
     /**

src/Fieldtypes/Bard/LinkMark.php

@@ -25,13 +25,12 @@ public function addAttributes()
         return [
             'href' => [
                 'renderHTML' => function ($attributes) {
-                    $href = $attributes->href;
-                    if (! isset($href)) {
+                    if (! isset($attributes->href)) {
                         return null;
                     }
 
                     return [
-                        'href' => $this->convertHref($href) ?? '',
+                        'href' => $this->convertHref($attributes->href) ?? '',
                     ];
                 },
             ],

src/Fieldtypes/UserGroups.php

@@ -17,7 +17,7 @@ protected function toItemArray($id, $site = null)
     {
         if ($group = UserGroup::find($id)) {
             return [
-                'title' => $group->title(),
+                'title' => __($group->title()),
                 'id' => $group->handle(),
             ];
         }
@@ -30,7 +30,7 @@ public function getIndexItems($request)
         return UserGroup::all()->sortBy('title')->map(function ($group) {
             return [
                 'id' => $group->handle(),
-                'title' => $group->title(),
+                'title' => __($group->title()),
             ];
         })->values();
     }