diff --git a/src/JitSafeScanner.php b/src/JitSafeScanner.php index a53f253..3458456 100644 --- a/src/JitSafeScanner.php +++ b/src/JitSafeScanner.php @@ -13,6 +13,7 @@ use Statamic\Facades\YAML; use Statamic\Fields\Blueprint; use Statamic\Fields\Fieldset; +use Statamic\Support\Arr; class JitSafeScanner { @@ -78,11 +79,17 @@ protected function findConfigs($data) \RecursiveIteratorIterator::SELF_FIRST ); foreach ($iterator as $value) { - if (! is_array($value)) { + if (! is_array($value) || ! Arr::exists($value, 'handle') || ! Arr::exists($value, 'field')) { continue; } - if (($value['type'] ?? null) === 'miniset_classes' && is_array($value['fields'] ?? null)) { - $configs[] = $value; + if (is_string($value['field'] ?? null)) { + if ($imports = FieldFacade::find($value['field'])) { + $value['field'] = array_merge($imports->toArray(), $value['config'] ?? []); + } + } + $config = $value['field']; + if (($config['type'] ?? null) === 'miniset_classes' && is_array($config['fields'] ?? null)) { + $configs[] = $config; } }