Merge branch 'master' of https://github.com/statamic/cms into starter…

…-kit-addons

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Release Notes
 
+## 5.37.0 (2024-11-06)
+
+### What's new
+- Improved fieldtype search using keywords [#11053](https://github.com/statamic/cms/issues/11053) by @jasonvarga
+- Offer to enable Pro during make user command [#11071](https://github.com/statamic/cms/issues/11071) by @jasonvarga
+- Add `--clear` option for `starter-kit:export` [#11079](https://github.com/statamic/cms/issues/11079) by @jesseleite
+- Extra values for entry field conditions, including depth [#11080](https://github.com/statamic/cms/issues/11080) by @jasonvarga
+- Add a config for specifying the default layout [#11025](https://github.com/statamic/cms/issues/11025) by @ryanmitchell
+
+### What's fixed
+- Integer fields should render with `type="number"` [#11065](https://github.com/statamic/cms/issues/11065) by @duncanmcclean
+- Update addon `.gitignore` stub [#11068](https://github.com/statamic/cms/issues/11068) by @duncanmcclean
+- Adjust legacy ignition classes [#11073](https://github.com/statamic/cms/issues/11073) by @jasonvarga
+- Fix Ignition Runnable Error Solutions [#11072](https://github.com/statamic/cms/issues/11072) by @jasonvarga
+- Fix typeahead relationship input corrupting data [#11059](https://github.com/statamic/cms/issues/11059) by @daun
+- Files Fieldtype: Don't truncate existing filename [#11055](https://github.com/statamic/cms/issues/11055) by @duncanmcclean
+- Fix addon events dispatched twice if registered manually [#11049](https://github.com/statamic/cms/issues/11049) by @morhi
+- Fix query parameters in external script URLs being wrongly encoded [#11052](https://github.com/statamic/cms/issues/11052) by @duncanmcclean
+- Fix inline Bard with leading line break [#11038](https://github.com/statamic/cms/issues/11038) by @jacksleight
+- Update Translations and fill in blanks with Google Translate [#11050](https://github.com/statamic/cms/issues/11050) by @jasonvarga
+
+
+
 ## 5.36.0 (2024-10-31)
 
 ### What's new

composer.json

@@ -26,7 +26,7 @@
         "rebing/graphql-laravel": "^9.5",
         "rhukster/dom-sanitizer": "^1.0.6",
         "spatie/blink": "^1.3",
-        "spatie/ignition": "^1.12",
+        "spatie/ignition": "^1.15",
         "statamic/stringy": "^3.1.2",
         "stillat/blade-parser": "^1.10.1",
         "symfony/lock": "^6.4",

resources/js/bootstrap/fieldtypes.js

@@ -25,6 +25,7 @@ import TitleFormats from '../components/collections/TitleFormats.vue';
 import ColorFieldtype from '../components/fieldtypes/ColorFieldtype.vue';
 import DateFieldtype from '../components/fieldtypes/DateFieldtype.vue';
 import DictionaryFieldtype from "../components/fieldtypes/DictionaryFieldtype.vue";
+import DictionaryIndexFieldtype from "../components/fieldtypes/DictionaryIndexFieldtype.vue";
 import DictionaryFields from "../components/fieldtypes/DictionaryFields.vue";
 import FieldDisplayFieldtype from '../components/fieldtypes/FieldDisplayFieldtype.vue';
 import FieldsFieldtype from '../components/fieldtypes/grid/FieldsFieldtype.vue';
@@ -89,6 +90,7 @@ Vue.component('collection_title_formats-fieldtype', TitleFormats);
 Vue.component('color-fieldtype', ColorFieldtype);
 Vue.component('date-fieldtype', DateFieldtype);
 Vue.component('dictionary-fieldtype', DictionaryFieldtype);
+Vue.component('dictionary-fieldtype-index', DictionaryIndexFieldtype);
 Vue.component('dictionary_fields-fieldtype', DictionaryFields);
 Vue.component('field_display-fieldtype', FieldDisplayFieldtype);
 Vue.component('fields-fieldtype', FieldsFieldtype);

resources/js/components/blueprints/Builder.vue

@@ -43,6 +43,7 @@
             :single-tab="!useTabs"
             :initial-tabs="tabs"
             :errors="errors.tabs"
+            :can-define-localizable="canDefineLocalizable"
             @updated="tabsUpdated"
         />
 
@@ -53,10 +54,11 @@
 <script>
 import SuggestsConditionalFields from './SuggestsConditionalFields';
 import Tabs from './Tabs.vue';
+import CanDefineLocalizable from "../fields/CanDefineLocalizable";
 
 export default {
 
-    mixins: [SuggestsConditionalFields],
+    mixins: [SuggestsConditionalFields, CanDefineLocalizable],
 
     components: {
         Tabs,

resources/js/components/blueprints/TabContent.vue

@@ -12,16 +12,20 @@
             :edit-section-text="editSectionText"
             :show-section-handle-field="showSectionHandleField"
             :show-section-hide-field="showSectionHideField"
+            :can-define-localizable="canDefineLocalizable"
             @updated="sectionsUpdated($event)"
         />
     </div>
 </template>
 
 <script>
 import Sections from './Sections.vue';
+import CanDefineLocalizable from "../fields/CanDefineLocalizable";
 
 export default {
 
+    mixins: [CanDefineLocalizable],
+
     components: {
         Sections,
     },

resources/js/components/blueprints/Tabs.vue

@@ -37,6 +37,7 @@
             :new-section-text="newSectionText"
             :edit-section-text="editSectionText"
             :add-section-text="addSectionText"
+            :can-define-localizable="canDefineLocalizable"
             @updated="updateTab(tab._id, $event)"
         />
     </div>
@@ -47,9 +48,12 @@ import {Sortable, Plugins} from '@shopify/draggable';
 import uniqid from 'uniqid';
 import Tab from './Tab.vue';
 import TabContent from './TabContent.vue';
+import CanDefineLocalizable from "../fields/CanDefineLocalizable";
 
 export default {
 
+    mixins: [CanDefineLocalizable],
+
     components: {
         Tab,
         TabContent,

resources/js/components/data-list/HasFilters.js

@@ -47,7 +47,7 @@ export default {
 
         searchPlaceholder() {
             if (this.activePreset) {
-                return __('Searching in: ') + this.activePresetPayload.display;
+                return `${__('Searching in:')} ${this.activePresetPayload.display}`;
             }
 
             return __('Search');

resources/js/components/entries/BaseCreateForm.vue

@@ -10,6 +10,7 @@
         :collection-has-routes="collectionHasRoutes"
         :initial-fieldset="fieldset"
         :initial-values="values"
+        :initial-extra-values="extraValues"
         :initial-meta="meta"
         :initial-localizations="localizations"
         :initial-has-origin="false"
@@ -37,6 +38,7 @@ export default {
         'collectionHasRoutes',
         'fieldset',
         'values',
+        'extraValues',
         'meta',
         'localizations',
         'revisions',

resources/js/components/entries/PublishForm.vue

@@ -68,6 +68,7 @@
             :name="publishContainer"
             :blueprint="fieldset"
             :values="values"
+            :extra-values="extraValues"
             :reference="initialReference"
             :meta="meta"
             :errors="errors"
@@ -335,6 +336,7 @@ export default {
         initialReference: String,
         initialFieldset: Object,
         initialValues: Object,
+        initialExtraValues: Object,
         initialMeta: Object,
         initialTitle: String,
         initialLocalizations: Array,
@@ -375,6 +377,7 @@ export default {
             title: this.initialTitle,
             values: _.clone(this.initialValues),
             meta: _.clone(this.initialMeta),
+            extraValues: _.clone(this.initialExtraValues),
             localizations: _.clone(this.initialLocalizations),
             localizedFields: this.initialLocalizedFields,
             hasOrigin: this.initialHasOrigin,
@@ -606,6 +609,7 @@ export default {
                         clearTimeout(this.trackDirtyStateTimeout)
                         this.trackDirtyState = false
                         this.values = this.resetValuesFromResponse(response.data.data.values);
+                        this.extraValues = response.data.data.extraValues;
                         this.trackDirtyStateTimeout = setTimeout(() => (this.trackDirtyState = true), 500)
                         this.$nextTick(() => this.$emit('saved', response));
                         return;
@@ -630,6 +634,7 @@ export default {
                         clearTimeout(this.trackDirtyStateTimeout);
                         this.trackDirtyState = false;
                         this.values = this.resetValuesFromResponse(response.data.data.values);
+                        this.extraValues = response.data.data.extraValues;
                         this.trackDirtyStateTimeout = setTimeout(() => (this.trackDirtyState = true), 500);
                         this.initialPublished = response.data.data.published;
                         this.activeLocalization.published = response.data.data.published;

resources/js/components/fieldtypes/AssetFolderFieldtype.vue

@@ -1,13 +1,11 @@
 <template>
     <div class="asset-folder-fieldtype-wrapper">
-        <small class="help-block text-gray-600" v-if="!container">{{ __('Select asset container') }}</small>
-
         <relationship-fieldtype
             v-if="container"
             :handle="handle"
             :value="value"
             :meta="relationshipMeta"
-            :config="{ type: 'asset_folder' }"
+            :config="{ type: 'asset_folder', max_items: this.config.max_items }"
             @input="update"
         />
     </div>
@@ -23,7 +21,7 @@ export default {
     computed: {
 
         container() {
-            return data_get(this.$store.state.publish[this.storeName].values.container, '0', null);
+            return data_get(this.$store.state.publish[this.storeName].values.container, '0', this.config.container);
         },
 
         relationshipMeta() {

resources/js/components/fieldtypes/DictionaryIndexFieldtype.vue

@@ -0,0 +1,19 @@
+<template>
+    <div class="text-ellipsis" v-html="formatted" />
+</template>
+
+<script>
+export default {
+
+    mixins: [IndexFieldtype],
+
+    computed: {
+        formatted() {
+            if (!this.value) {
+                return null;
+            }
+            return this.value.join(', ');
+        },
+    },
+};
+</script>

resources/js/components/publish/Container.vue

@@ -124,6 +124,9 @@ export default {
                     setValues(state, values) {
                         state.values = values;
                     },
+                    setExtraValues(state, values) {
+                        state.extraValues = values;
+                    },
                     setHiddenField(state, field) {
                         state.hiddenFields[field.dottedKey] = {
                             hidden: field.hidden,
@@ -211,6 +214,9 @@ export default {
                         context.commit('setValues', payload);
                         vm.emitUpdatedEvent(context.state.values);
                     },
+                    setExtraValues(context, payload) {
+                        context.commit('setExtraValues', payload);
+                    },
                     setMeta(context, payload) {
                         context.commit('setMeta', payload);
                     }
@@ -276,6 +282,14 @@ export default {
             }
         },
 
+        extraValues: {
+            deep: true,
+            handler(after, before) {
+                if (_.isEqual(before, after)) return;
+                this.$store.commit(`publish/${this.name}/setExtraValues`, after);
+            }
+        },
+
         meta: {
             deep: true,
             handler(after, before) {

resources/js/components/terms/BaseCreateForm.vue

@@ -5,7 +5,7 @@
         publish-container="base"
         :initial-actions="actions"
         method="post"
-        :initial-title="__('Create')"
+        :initial-title="taxonomyCreateLabel"
         :taxonomy-handle="taxonomyHandle"
         :breadcrumbs="breadcrumbs"
         :initial-fieldset="fieldset"
@@ -31,6 +31,7 @@ export default {
     props: [
         'actions',
         'taxonomyHandle',
+        'taxonomyCreateLabel',
         'breadcrumbs',
         'fieldset',
         'values',

resources/js/components/terms/CreateTermButton.vue

@@ -6,7 +6,7 @@
                 class="btn-primary flex items-center"
                 @click="create"
             >
-                <span v-text="__('Create Term')" />
+                <span v-text="text" />
                 <svg-icon name="micro/chevron-down-xs" class="rtl:mr-2 ltr:ml-2 -mr-2 w-2" v-if="blueprints.length > 1" />
             </button>
         </template>
@@ -25,7 +25,8 @@ export default {
 
     props: {
         url: String,
-        blueprints: Array
+        blueprints: Array,
+        text: { type: String, default: () => __('Create Term') },
     },
 
     methods: {

resources/lang/de.json

@@ -401,6 +401,7 @@
     "Enable Pro Mode": "Pro-Modus aktivieren",
     "Enable Publish Dates": "Erscheinungsdaten aktivieren",
     "Enable Revisions": "Revisionen aktivieren",
+    "Enable Statamic Pro?": "Statamic Pro aktivieren?",
     "Encryption": "Verschlüsselung",
     "Enter any internal or external URL.": "Beliebige interne oder externe URL eingeben.",
     "Enter URL": "URL eingeben",
@@ -422,7 +423,7 @@
     "Entry link": "Link zum Eintrag",
     "Entry published|Entries published": "Eintrag veröffentlicht|Einträge veröffentlicht",
     "Entry saved": "Eintrag gespeichert",
-    "Entry schedule reached": "Anmeldezeitplan erreicht",
+    "Entry schedule reached": "Zeitplan für Eintrag erreicht",
     "Entry unpublished|Entries unpublished": "Eintrag nicht veröffentlicht|Einträge nicht veröffentlicht",
     "equals": "ist gleich",
     "Equals": "Gleich",
@@ -844,7 +845,7 @@
     "Search...": "Suchen…",
     "Searchable": "Durchsuchbar",
     "Searchables": "Suchbares",
-    "Searching in:": "Suche in:",
+    "Searching in:": "Suchen in:",
     "Select": "Auswählen",
     "Select Across Sites": "Websiteübergreifend auswählen",
     "Select asset container": "Datei-Container auswählen",

resources/lang/de/fieldtypes.php

@@ -19,7 +19,7 @@
     'assets.config.restrict' => 'Verhindern, dass Benutzer:innen zu anderen Ordnern navigieren können.',
     'assets.config.show_filename' => 'Dateiname neben dem Vorschaubild anzeigen.',
     'assets.config.show_set_alt' => 'Einen Link zum Erfassen des Alt-Texts bei allen Bildern anzeigen.',
-    'assets.dynamic_folder_pending_field' => 'Dieser Upload-Ordner wird verfügbar sein, sobald :field festgelegt ist.',
+    'assets.dynamic_folder_pending_field' => 'Dieses Feld ist verfügbar, sobald :field festgelegt ist.',
     'assets.dynamic_folder_pending_save' => 'Dieses Feld ist nach dem Speichern verfügbar.',
     'assets.title' => 'Dateien',
     'bard.config.allow_source' => 'Ermöglicht beim Schreiben das Anzeigen des HTML-Quellcodes.',

resources/lang/de/messages.php

@@ -237,7 +237,7 @@
     'updater_require_version_command' => 'Führe den folgenden Befehl aus, um eine bestimmte Version anzufordern',
     'updater_update_to_latest_command' => 'Führe den folgenden Befehl aus, um die aktuelle Version zu installieren',
     'uploader_append_timestamp' => 'Zeitstempel anhängen',
-    'uploader_choose_new_filename' => 'Neuer Dateinamen wählen',
+    'uploader_choose_new_filename' => 'Neuer Dateiname wählen',
     'uploader_discard_use_existing' => 'Verwerfen und bestehende Datei verwenden',
     'uploader_overwrite_existing' => 'Bestehende Datei überschreiben',
     'user_activation_email_not_sent_error' => 'Die Aktivierungs-E-Mail konnte nicht gesendet werden. Bitte prüfe deine E-Mail-Konfiguration und versuche es erneut.',

resources/lang/de_CH.json

@@ -401,6 +401,7 @@
     "Enable Pro Mode": "Pro-Modus aktivieren",
     "Enable Publish Dates": "Erscheinungsdaten aktivieren",
     "Enable Revisions": "Revisionen aktivieren",
+    "Enable Statamic Pro?": "Statamic Pro aktivieren?",
     "Encryption": "Verschlüsselung",
     "Enter any internal or external URL.": "Beliebige interne oder externe URL eingeben.",
     "Enter URL": "URL eingeben",
@@ -422,7 +423,7 @@
     "Entry link": "Link zum Eintrag",
     "Entry published|Entries published": "Eintrag veröffentlicht|Einträge veröffentlicht",
     "Entry saved": "Eintrag gespeichert",
-    "Entry schedule reached": "Anmeldezeitplan erreicht",
+    "Entry schedule reached": "Zeitplan für Eintrag erreicht",
     "Entry unpublished|Entries unpublished": "Eintrag nicht veröffentlicht|Einträge nicht veröffentlicht",
     "equals": "ist gleich",
     "Equals": "Gleich",
@@ -844,7 +845,7 @@
     "Search...": "Suchen…",
     "Searchable": "Durchsuchbar",
     "Searchables": "Suchbares",
-    "Searching in:": "Suche in:",
+    "Searching in:": "Suchen in:",
     "Select": "Auswählen",
     "Select Across Sites": "Websiteübergreifend auswählen",
     "Select asset container": "Datei-Container auswählen",

resources/lang/de_CH/fieldtypes.php

@@ -19,7 +19,7 @@
     'assets.config.restrict' => 'Verhindern, dass Benutzer:innen zu anderen Ordnern navigieren können.',
     'assets.config.show_filename' => 'Dateiname neben dem Vorschaubild anzeigen.',
     'assets.config.show_set_alt' => 'Einen Link zum Erfassen des Alt-Texts bei allen Bildern anzeigen.',
-    'assets.dynamic_folder_pending_field' => 'Dieser Upload-Ordner wird verfügbar sein, sobald :field festgelegt ist.',
+    'assets.dynamic_folder_pending_field' => 'Dieses Feld ist verfügbar, sobald :field festgelegt ist.',
     'assets.dynamic_folder_pending_save' => 'Dieses Feld ist nach dem Speichern verfügbar.',
     'assets.title' => 'Dateien',
     'bard.config.allow_source' => 'Ermöglicht beim Schreiben das Anzeigen des HTML-Quellcodes.',

resources/lang/de_CH/messages.php

@@ -237,7 +237,7 @@
     'updater_require_version_command' => 'Führe den folgenden Befehl aus, um eine bestimmte Version anzufordern',
     'updater_update_to_latest_command' => 'Führe den folgenden Befehl aus, um die aktuelle Version zu installieren',
     'uploader_append_timestamp' => 'Zeitstempel anhängen',
-    'uploader_choose_new_filename' => 'Neuer Dateinamen wählen',
+    'uploader_choose_new_filename' => 'Neuer Dateiname wählen',
     'uploader_discard_use_existing' => 'Verwerfen und bestehende Datei verwenden',
     'uploader_overwrite_existing' => 'Bestehende Datei überschreiben',
     'user_activation_email_not_sent_error' => 'Das Aktivierungs-E-Mail konnte nicht gesendet werden. Bitte prüfe deine E-Mail-Konfiguration und versuche es erneut.',

resources/lang/en/fieldtypes.php

@@ -22,6 +22,7 @@
     'assets.dynamic_folder_pending_field' => 'This field will be available once :field is set.',
     'assets.dynamic_folder_pending_save' => 'This field will be available after saving.',
     'assets.title' => 'Assets',
+    'asset_folders.config.container' => 'Choose which asset container to use for this field.',
     'bard.config.allow_source' => 'Enable to view the HTML source code while writing.',
     'bard.config.always_show_set_button' => 'Enable to always show the "Add Set" button.',
     'bard.config.buttons' => 'Choose which buttons to show in the toolbar.',