Merge branch '5.x' into patch-1

jasonvarga · jasonvarga · commit 799bdc523f91 · 2025-04-22T15:37:17.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Release Notes
 
+## 5.53.1 (2025-04-17)
+
+### What's fixed
+- Fix validation of date field nested in a replicator  [#11692](https://github.com/statamic/cms/issues/11692) by @liucf
+- Fix collection index search when using a non-dedicated search index [#11711](https://github.com/statamic/cms/issues/11711) by @simonerd
+- Handle translation issues in collection widget [#11693](https://github.com/statamic/cms/issues/11693) by @daun
+- Remove `templates`/`themes` methods from `CpController` [#11706](https://github.com/statamic/cms/issues/11706) by @duncanmcclean
+- Ensure asset references are updated correctly [#11705](https://github.com/statamic/cms/issues/11705) by @duncanmcclean
+
+
+
+## 5.53.0 (2025-04-10)
+
+### What's new
+- Allow dynamic counter names in `increment` tag [#11671](https://github.com/statamic/cms/issues/11671) by @daun
+- Expose field conditions from GraphQL API [#11607](https://github.com/statamic/cms/issues/11607) by @duncanmcclean
+- Add Edit Blueprint links to create publish forms [#11625](https://github.com/statamic/cms/issues/11625) by @jacksleight
+
+### What's fixed
+- Fix icon selector in nav builder [#11656](https://github.com/statamic/cms/issues/11656) by @duncanmcclean
+- Fix docblock in AssetContainer facade [#11658](https://github.com/statamic/cms/issues/11658) by @duncanmcclean
+- Revert "Escape start_page Preference to avoid invalid Redirect" [#11651](https://github.com/statamic/cms/issues/11651) by @duncanmcclean
+- Restore error message on asset upload server errors [#11642](https://github.com/statamic/cms/issues/11642) by @daun
+- Fix dates in localizations when duplicating entries [#11361](https://github.com/statamic/cms/issues/11361) by @duncanmcclean
+- Use deep copy of objects in replicator set [#11621](https://github.com/statamic/cms/issues/11621) by @faltjo
+- French translations [#11622](https://github.com/statamic/cms/issues/11622) by @ebeauchamps
+- Dutch translations [#11686](https://github.com/statamic/cms/issues/11686) by @rogerthat-be
+
+
+
 ## 5.52.0 (2025-03-25)
 
 ### What's new
diff --git a/config/live_preview.php b/config/live_preview.php
@@ -33,4 +33,16 @@
         //
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Force Reload Javascript Modules
+    |--------------------------------------------------------------------------
+    |
+    | To force a reload, Live Preview appends a timestamp to the URL on
+    | script tags of type 'module'. You may disable this behavior here.
+    |
+    */
+
+    'force_reload_js_modules' => true,
+
 ];
diff --git a/config/static_caching.php b/config/static_caching.php
@@ -125,6 +125,8 @@
 
     'nocache' => 'cache',
 
+    'nocache_db_connection' => env('STATAMIC_NOCACHE_DB_CONNECTION'),
+
     'nocache_js_position' => 'body',
 
     /*
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/js/components/fieldtypes/LinkFieldtype.vue b/resources/js/components/fieldtypes/LinkFieldtype.vue
@@ -18,7 +18,7 @@
             </v-select>
         </div>
 
-        <div class="flex-1">
+        <div class="flex-1 truncate">
 
             <!-- URL text input -->
             <text-input v-if="option === 'url'" v-model="urlValue" />
diff --git a/resources/js/components/nav/ItemEditor.vue b/resources/js/components/nav/ItemEditor.vue
@@ -41,9 +41,9 @@
                                 <publish-field-meta
                                     :config="{ handle: 'icon', type: 'icon', folder: 'light' }"
                                     :initial-value="config.icon"
-                                    v-slot="{ meta, value, loading, config }"
+                                    v-slot="{ meta, value, loading, config: fieldtypeConfig }"
                                 >
-                                    <icon-fieldtype v-if="!loading" handle="icon" :config="config" :meta="meta" :value="value" @input="config.icon = $event" />
+                                    <icon-fieldtype v-if="!loading" handle="icon" :config="fieldtypeConfig" :meta="meta" :value="value" @input="config.icon = $event" />
                                 </publish-field-meta>
                             </div>
                         </div>
diff --git a/resources/js/components/preferences/EditForm.vue b/resources/js/components/preferences/EditForm.vue
@@ -108,7 +108,7 @@ export default {
                 .patch(url, this.currentValues)
                 .then(() => {
                     this.$refs.container.saved();
-                    location.reload();
+                    this.$nextTick(() => location.reload());
                 })
                 .catch(e => this.handleAxiosError(e));
         },
diff --git a/resources/lang/nl.json b/resources/lang/nl.json
@@ -74,7 +74,7 @@
     "Allow additions": "Toevoegingen toestaan",
     "Allow Antlers": "Antlers toestaan",
     "Allow Any Color": "Alle kleuren toestaan",
-    "Allow Creating": "Aanmaken toesten",
+    "Allow Creating": "Aanmaken toestaan",
     "Allow Downloading": "Downloaden toestaan",
     "Allow Fullscreen Mode": "Fullscreen-modus toestaan",
     "Allow Moving": "Verplaatsen toestaan",
diff --git a/resources/views/widgets/collection.blade.php b/resources/views/widgets/collection.blade.php
@@ -1,4 +1,5 @@
 @php use Statamic\Facades\Site; @endphp
+@php use function Statamic\trans as __; @endphp
 
 <div class="card p-0 overflow-hidden h-full flex flex-col">
     <div class="flex justify-between items-center p-4 border-b dark:bg-dark-650 dark:border-b dark:border-dark-900">
diff --git a/src/Console/Commands/stubs/statamic_nocache_tables.php.stub b/src/Console/Commands/stubs/statamic_nocache_tables.php.stub
@@ -8,7 +8,9 @@ class StatamicNocacheTables extends Migration
 {
     public function up()
     {
-        Schema::create('NOCACHE_TABLE', function (Blueprint $table) {
+        Schema::connection(
+            config('statamic.static_caching.nocache_db_connection')
+        )->create('NOCACHE_TABLE', function (Blueprint $table) {
             $table->string('key')->index()->primary();
             $table->string('url')->index();
             $table->longText('region');
@@ -18,6 +20,8 @@ class StatamicNocacheTables extends Migration
 
     public function down()
     {
-        Schema::dropIfExists('nocache_regions');
+        Schema::connection(
+            config('statamic.static_caching.nocache_db_connection')
+        )->dropIfExists('NOCACHE_TABLE');
     }
 }
diff --git a/src/Facades/AssetContainer.php b/src/Facades/AssetContainer.php
@@ -12,7 +12,7 @@
  * @method static \Statamic\Contracts\Assets\AssetContainer findOrFail($id)
  * @method static \Statamic\Contracts\Assets\AssetContainer make(string $handle = null)
  *
- * @see \Statamic\Assets\AssetRepository
+ * @see \Statamic\Stache\Repositories\AssetContainerRepository
  */
 class AssetContainer extends Facade
 {
diff --git a/src/Fieldtypes/Date.php b/src/Fieldtypes/Date.php
@@ -5,6 +5,7 @@
 use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 use InvalidArgumentException;
 use Statamic\Facades\GraphQL;
 use Statamic\Fields\Fieldtype;
@@ -371,10 +372,16 @@ public function secondsEnabled()
 
     public function preProcessValidatable($value)
     {
-        Validator::make(
-            [$this->field->handle() => $value],
-            [$this->field->handle() => [new ValidationRule($this)]],
-        )->validate();
+        try {
+            Validator::make(
+                ['field' => $value],
+                ['field' => [new ValidationRule($this)]],
+                [],
+                ['field' => $this->field->display()],
+            )->validate();
+        } catch (ValidationException $e) {
+            throw ValidationException::withMessages([$this->field->fieldPathPrefix() => $e->errors()['field']]);
+        }
 
         if ($value === null) {
             return null;
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -70,7 +70,11 @@ protected function indexQuery($collection)
 
         if ($search = request('search')) {
             if ($collection->hasSearchIndex()) {
-                return $collection->searchIndex()->ensureExists()->search($search);
+                return $collection
+                    ->searchIndex()
+                    ->ensureExists()
+                    ->search($search)
+                    ->where('collection', $collection->handle());
             }
 
             $query->where('title', 'like', '%'.$search.'%');
diff --git a/src/Http/Controllers/CP/CpController.php b/src/Http/Controllers/CP/CpController.php
@@ -5,13 +5,8 @@
 use Illuminate\Auth\Access\AuthorizationException as LaravelAuthException;
 use Illuminate\Http\Request;
 use Statamic\Exceptions\AuthorizationException;
-use Statamic\Facades\File;
-use Statamic\Facades\Folder;
-use Statamic\Facades\YAML;
 use Statamic\Http\Controllers\Controller;
 use Statamic\Statamic;
-use Statamic\Support\Arr;
-use Statamic\Support\Str;
 
 /**
  * The base control panel controller.
@@ -31,43 +26,6 @@ public function __construct(Request $request)
         $this->request = $request;
     }
 
-    /**
-     * Get all the template names from the current theme.
-     *
-     * @return array
-     */
-    public function templates()
-    {
-        $templates = [];
-
-        foreach (Folder::disk('resources')->getFilesByTypeRecursively('templates', 'html') as $path) {
-            $parts = explode('/', $path);
-            array_shift($parts);
-            $templates[] = Str::removeRight(implode('/', $parts), '.html');
-        }
-
-        return $templates;
-    }
-
-    public function themes()
-    {
-        $themes = [];
-
-        foreach (Folder::disk('themes')->getFolders('/') as $folder) {
-            $name = $folder;
-
-            // Get the name if one exists in a meta file
-            if (File::disk('themes')->exists($folder.'/meta.yaml')) {
-                $meta = YAML::parse(File::disk('themes')->get($folder.'/meta.yaml'));
-                $name = Arr::get($meta, 'name', $folder);
-            }
-
-            $themes[] = compact('folder', 'name');
-        }
-
-        return $themes;
-    }
-
     /**
      * 404.
      */
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -361,7 +361,7 @@ protected function editFormBlueprint($form)
         foreach (Form::extraConfigFor($form->handle()) as $handle => $config) {
             $merged = false;
             foreach ($fields as $sectionHandle => $section) {
-                if ($section['display'] == $config['display']) {
+                if ($section['display'] == __($config['display'])) {
                     $fields[$sectionHandle]['fields'] += $config['fields'];
                     $merged = true;
                 }
diff --git a/src/Http/Responses/DataResponse.php b/src/Http/Responses/DataResponse.php
@@ -149,7 +149,7 @@ protected function contents()
     {
         $contents = $this->view()->render();
 
-        if ($this->request->isLivePreview()) {
+        if ($this->request->isLivePreview() && config('statamic.live_preview.force_reload_js_modules', true)) {
             $contents = $this->versionJavascriptModules($contents);
         }
 
diff --git a/src/Listeners/UpdateAssetReferences.php b/src/Listeners/UpdateAssetReferences.php
@@ -85,16 +85,21 @@ protected function replaceReferences($asset, $originalPath, $newPath)
 
         $container = $asset->container()->handle();
 
-        $updatedItems = $this
+        $hasUpdatedItems = false;
+
+        $this
             ->getItemsContainingData()
-            ->map(function ($item) use ($container, $originalPath, $newPath) {
-                return AssetReferenceUpdater::item($item)
+            ->each(function ($item) use ($container, $originalPath, $newPath, &$hasUpdatedItems) {
+                $updated = AssetReferenceUpdater::item($item)
                     ->filterByContainer($container)
                     ->updateReferences($originalPath, $newPath);
-            })
-            ->filter();
 
-        if ($updatedItems->isNotEmpty()) {
+                if ($updated) {
+                    $hasUpdatedItems = true;
+                }
+            });
+
+        if ($hasUpdatedItems) {
             AssetReferencesUpdated::dispatch($asset);
         }
     }
diff --git a/src/StaticCaching/DefaultInvalidator.php b/src/StaticCaching/DefaultInvalidator.php
diff --git a/src/StaticCaching/Invalidate.php b/src/StaticCaching/Invalidate.php
diff --git a/src/StaticCaching/NoCache/DatabaseRegion.php b/src/StaticCaching/NoCache/DatabaseRegion.php
diff --git a/src/Tags/Increment.php b/src/Tags/Increment.php
diff --git a/src/Tags/ParentTags.php b/src/Tags/ParentTags.php
diff --git a/tests/StaticCaching/DefaultInvalidatorTest.php b/tests/StaticCaching/DefaultInvalidatorTest.php
diff --git a/tests/Tags/IncrementTest.php b/tests/Tags/IncrementTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@php use Statamic\Facades\Site; @endphp`
	`2`	`+@php use function Statamic\trans as __; @endphp`
`2`	`3`
`3`	`4`	`<div class="card p-0 overflow-hidden h-full flex flex-col">`
`4`	`5`	`<div class="flex justify-between items-center p-4 border-b dark:bg-dark-650 dark:border-b dark:border-dark-900">`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ class StatamicNocacheTables extends Migration`
`8`	`8`	`{`
`9`	`9`	`public function up()`
`10`	`10`	`{`
`11`		`- Schema::create('NOCACHE_TABLE', function (Blueprint $table) {`
	`11`	`+ Schema::connection(`
	`12`	`+ config('statamic.static_caching.nocache_db_connection')`
	`13`	`+ )->create('NOCACHE_TABLE', function (Blueprint $table) {`
`12`	`14`	`$table->string('key')->index()->primary();`
`13`	`15`	`$table->string('url')->index();`
`14`	`16`	`$table->longText('region');`
`@@ -18,6 +20,8 @@ class StatamicNocacheTables extends Migration`
`18`	`20`
`19`	`21`	`public function down()`
`20`	`22`	`{`
`21`		`- Schema::dropIfExists('nocache_regions');`
	`23`	`+ Schema::connection(`
	`24`	`+ config('statamic.static_caching.nocache_db_connection')`
	`25`	`+ )->dropIfExists('NOCACHE_TABLE');`
`22`	`26`	`}`
`23`	`27`	`}`