Merge branch 'statamic:6.x' into 6.x

Author: Devsome

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Release Notes
 
+## 6.12.0 (2026-04-08)
+
+### What's new
+- Add support for filtering conditions in Assets Tag [#13936](https://github.com/statamic/cms/issues/13936) by @jackmcdade
+
+### What's fixed
+- Add padding around 2FA QR code for dark mode scanning [#14460](https://github.com/statamic/cms/issues/14460) by @duncanmcclean
+- Fix form submissions with non-UTF-8 data crashing the CP listing [#14461](https://github.com/statamic/cms/issues/14461) by @duncanmcclean
+- Remove deprecated function calls [#14457](https://github.com/statamic/cms/issues/14457) by @justindantzer
+- Upgrade to Vite 8 [#14459](https://github.com/statamic/cms/issues/14459) by @jasonvarga
+- Nested fields should respect read-only state [#14351](https://github.com/statamic/cms/issues/14351) by @duncanmcclean
+
+
+
 ## 6.11.0 (2026-04-07)
 
 ### What's new

package-lock.json

@@ -110,13 +110,12 @@
     "@vue/test-utils": "^2.4.6",
     "jsdom": "^26.0.0",
     "knip": "^5.43.6",
-    "laravel-vite-plugin": "^2.0.0",
-    "rollup-plugin-visualizer": "^5.14.0",
+    "laravel-vite-plugin": "^3.0.0",
+    "rollup-plugin-visualizer": "^7.0.0",
     "storybook": "^10.2.10",
     "tailwindcss": "^4.1.8",
     "typescript": "^5.9.2",
-    "vite": "^7.3.2",
-    "vite-tsconfig-paths": "^5.1.4",
+    "vite": "^8.0.0",
     "vitest": "^4.0.12",
     "vitest-browser-vue": "^2.0.1",
     "vue-component-debug": "^0.1.0",

package.json

@@ -40,7 +40,7 @@
 }
 
 .live-preview .publish-tabs {
-    @apply ltr:pl-4 @-4xl/live-preview:ltr:pl-6 rtl:pr-4 @-4xl/live-preview:rtl:pr-6;
+    @apply ltr:pl-4 @4xl/live-preview:ltr:pl-6 rtl:pr-4 @4xl/live-preview:rtl:pr-6;
 }
 
 .live-preview .publish-sections-section {

resources/css/components/preview.css

@@ -17,6 +17,7 @@
                         <FieldsProvider
                             :fields="fields"
                             :as-config="false"
+                            :read-only="isReadOnly"
                             :field-path-prefix="fieldPathPrefix ? `${fieldPathPrefix}.${handle}` : handle"
                             :meta-path-prefix="metaPathPrefix ? `${metaPathPrefix}.${handle}` : handle"
                         >

resources/js/components/fieldtypes/GroupFieldtype.vue

@@ -86,6 +86,7 @@
                 <FieldsProvider
                     :fields="fields"
                     :as-config="false"
+                    :read-only="isReadOnly"
                     :field-path-prefix="fieldPathPrefix"
                     :meta-path-prefix="metaPathPrefix"
                 >

resources/js/components/fieldtypes/bard/Set.vue

@@ -25,6 +25,7 @@
                         :can-add-rows="canAddRows"
                         :allow-fullscreen="config.fullscreen"
                         :hide-display="config.hide_display"
+                        :read-only="isReadOnly"
                         :errors="publishContainer.errors"
                         @updated="updated"
                         @meta-updated="updateRowMeta"

resources/js/components/fieldtypes/grid/Grid.vue

@@ -5,6 +5,7 @@
         <FieldsProvider
             :fields="fields"
             :as-config="false"
+            :read-only
             :field-path-prefix="`${fieldPathPrefix}.${index}`"
             :meta-path-prefix="`${metaPathPrefix}.existing.${values._id}`"
         >
@@ -74,6 +75,9 @@ export default {
             type: Boolean,
             default: false,
         },
+        readOnly: {
+            type: Boolean,
+        },
     },
 
     inject: ['grid', 'sortableItemClass', 'sortableHandleClass'],

resources/js/components/fieldtypes/grid/Row.vue

@@ -32,6 +32,7 @@
                     :meta-path-prefix="metaPathPrefix"
                     :can-delete="canDeleteRows"
                     :can-add-rows="canAddRows"
+                    :read-only
                     @updated="(row, value) => $emit('updated', row, value)"
                     @duplicate="(row) => $emit('duplicate', row)"
                     @meta-updated="$emit('meta-updated', row._id, $event)"

resources/js/components/fieldtypes/grid/Stacked.vue

@@ -31,6 +31,7 @@
             <FieldsProvider
                 :fields="fields"
                 :as-config="false"
+                :read-only
                 :field-path-prefix="`${fieldPathPrefix}.${index}`"
                 :meta-path-prefix="`${metaPathPrefix}.existing.${values._id}`"
             >