[3.x] Remove legacy code block badge style

HYDEPHP_V3_PLANNING.md

@@ -34,7 +34,7 @@ Having this document in code lets us know the devlopment state at any given poin
 ### Feature Changes
 
 - Fenced code blocks are now rendered through a publishable Blade view, `components/markdown/code-block.blade.php`, in the same way terminal blocks are. The view receives the rendered code block markup as `$contents`, along with `$language` and `$label`, and decides what goes around it, so changing what surrounds a code block is a view change instead of a framework change. Highlighting itself is unaffected: the fence stays in the syntax tree as the wrapper's child, and is rendered by whichever renderer the environment already had for it, be it Torchlight, a third-party extension, or CommonMark's own.
-- Code block labels are now set with a `title="…"` modifier on the fence, using the same attribute syntax as terminal block titles, such as ` ```php title="app/Model.php" `. The language is optional, so ` ``` title=".env" ` labels a block that declares none, which is then treated as `plaintext`. The label is no longer tied to file paths, so a block can be titled with anything. Labels use a responsive header by default instead of the v2 top-right badge; set `markdown.code_block_label_style` to `badge` to retain the previous presentation. The v2 `// filepath:` comment syntax is removed.
+- Code block labels are now set with a `title="…"` modifier on the fence, using the same attribute syntax as terminal block titles, such as ` ```php title="app/Model.php" `. The language is optional, so ` ``` title=".env" ` labels a block that declares none, which is then treated as `plaintext`. The label is no longer tied to file paths, so a block can be titled with anything. Labels use a responsive header instead of the v2 top-right badge. The v2 `// filepath:` comment syntax is removed.
 - Blade in Markdown is now enabled by default. The `markdown.enable_blade` option controls both `[Blade]:` directives and executable Blade Blocks. Hyde sites generally treat project content as trusted and reviewed; sites that compile untrusted or unreviewed Markdown can disable both forms with this option.
 - Raw HTML in Markdown is now enabled by default. Hyde sites generally treat project content as trusted and reviewed; sites that compile untrusted or unreviewed Markdown can set `markdown.allow_html` to `false` to strip potentially unsafe HTML tags.
 - `InMemoryPage` contents now accept lazy closures in addition to literal strings. Closures are invoked each time contents are requested with the current page as their first argument, without being rebound.
@@ -81,7 +81,6 @@ Please fill in UPGRADE.md as you make changes.
 - Rename `$fileExtension` to `$sourceExtension` in custom page classes, and update any calls to `fileExtension()` or `setFileExtension()` to `sourceExtension()` and `setSourceExtension()`.
 - If you referenced the removed `GenerateSitemap` or `GenerateRssFeed` build task classes (for example to override one with a same-basename user-land task), customize the output by binding a replacement `SitemapGenerator` or `RssFeedGenerator` in the `register()` method of a service provider.
 - Replace `// filepath:` code block comments with the `title="…"` fence modifier, including the `#`, `/* */`, and `<!-- -->` comment variants.
-- Set `markdown.code_block_label_style` to `badge` to retain the v2 top-right code block label presentation.
 - Compare a few pages against your old site if you have custom CSS for code blocks or their labels, since the generated markup changed. The `hyde-code-block` and `hyde-code-block-label` classes are stable hooks to target instead of the markup structure.
 - Port any customizations from a published `filepath-label.blade.php` to `markdown/code-block.blade.php`. The old file is ignored after upgrading, so the site renders with the shipped label until they are moved.
 

UPGRADE.md

@@ -395,12 +395,7 @@ Search your source files for `filepath` to find the blocks to convert. All the d
 so also check for `#`, `/* */`, and `<!-- -->` comments. A blank line left between the old comment and the code can be
 removed with it.
 
-HydePHP v3 displays code block labels in a responsive header instead of the v2 top-right badge. To retain the previous
-appearance, add this option to `config/markdown.php`:
-
-```php
-'code_block_label_style' => 'badge',
-```
+HydePHP v3 displays code block labels in a responsive header instead of the v2 top-right badge.
 
 ## Step 10: Move Your Filepath Label Customizations
 
@@ -449,7 +444,6 @@ Use this checklist to track your upgrade progress:
 - [ ] Replaced any references to the removed `GenerateSitemap` and `GenerateRssFeed` build tasks with generator implementations bound in a service provider
 - [ ] Renamed `$fileExtension`, `fileExtension()`, and `setFileExtension()` to `$sourceExtension`, `sourceExtension()`, and `setSourceExtension()` in custom page classes and call sites
 - [ ] Replaced `// filepath:` code block comments with the `title="…"` fence modifier
-- [ ] Set `markdown.code_block_label_style` to `badge` if retaining the v2 code block label presentation
 - [ ] Ported any `filepath-label.blade.php` customizations to `markdown/code-block.blade.php`, and deleted the old file
 - [ ] Compared pages against your old site if you have custom CSS for code blocks or their labels
 - [ ] Checked `_posts` for drafts and blog posts dated in the future, and set up recurring builds if scheduling posts

config/markdown.php

@@ -83,18 +83,6 @@
 
     'enable_blade' => true,
 
-    /*
-    |--------------------------------------------------------------------------
-    | Code Block Label Style
-    |--------------------------------------------------------------------------
-    |
-    | Titled code blocks display their label in a responsive header by default.
-    | Set this to "badge" to use the top-right badge presentation.
-    |
-    */
-
-    'code_block_label_style' => 'header',
-
     /*
     |--------------------------------------------------------------------------
     | Tailwind Typography Prose Classes

docs/digging-deeper/advanced-markdown.md

@@ -283,13 +283,6 @@ Which becomes:
 echo 'Hello World!';
 ```
 
-Code block titles use a responsive header by default. To use the compact badge presentation, set the label style in
-`config/markdown.php`:
-
-```php title="config/markdown.php"
-'code_block_label_style' => 'badge',
-```
-
 ### Advanced usage
 
 Since HTML in Markdown is enabled by default, anything within the title will be rendered as HTML. This means you

packages/framework/config/markdown.php

@@ -83,18 +83,6 @@
 
     'enable_blade' => true,
 
-    /*
-    |--------------------------------------------------------------------------
-    | Code Block Label Style
-    |--------------------------------------------------------------------------
-    |
-    | Titled code blocks display their label in a responsive header by default.
-    | Set this to "badge" to use the top-right badge presentation.
-    |
-    */
-
-    'code_block_label_style' => 'header',
-
     /*
     |--------------------------------------------------------------------------
     | Tailwind Typography Prose Classes

packages/framework/resources/views/components/markdown/code-block.blade.php

@@ -1,20 +1,11 @@
 @php($hasLabel = isset($label) && (string) $label !== '')
-@php($labelStyle = $hasLabel ? \Hyde\Facades\Config::getString('markdown.code_block_label_style', 'header') : 'header')
 @if ($hasLabel)
-<figure @class([
-    'hyde-code-block my-4 [&>pre]:my-0',
-    'overflow-hidden rounded-lg [&>pre]:rounded-none' => $labelStyle === 'header',
-    'relative' => $labelStyle === 'badge',
-])>
-@if ($labelStyle === 'header')
+<figure class="hyde-code-block my-4 [&>pre]:my-0 overflow-hidden rounded-lg [&>pre]:rounded-none">
 <figcaption class="hyde-code-block-label not-prose bg-[#212529] px-4 py-2.5 font-sans text-xs leading-none text-[#A6ACCD] [overflow-wrap:anywhere]">{{ $label }}</figcaption>
-@else
-<figcaption class="hyde-code-block-label not-prose absolute right-4 top-3 z-10 hidden font-mono text-xs text-[color:var(--tw-prose-pre-code)] opacity-50 transition-opacity duration-250 hover:opacity-100 md:block">{{ $label }}</figcaption>
-@endif
 {!! $contents !!}
 </figure>
 @else
-<div class="hyde-code-block relative my-4 [&>pre]:my-0">
+<div class="hyde-code-block my-4 [&>pre]:my-0">
 {!! $contents !!}
 </div>
 @endif

packages/framework/src/Markdown/Extensions/CodeBlockViewModel.php

@@ -4,11 +4,8 @@
 
 namespace Hyde\Markdown\Extensions;
 
-use Hyde\Facades\Config;
-use Hyde\Framework\Exceptions\InvalidConfigurationException;
 use Illuminate\Support\HtmlString;
 
-use function in_array;
 use function view;
 
 /** @internal */
@@ -24,10 +21,6 @@ public function __construct(
 
     public function render(): string
     {
-        if ($this->label !== null) {
-            $this->validateLabelStyle();
-        }
-
         return view('hyde::components.markdown.code-block', $this->viewData())->render();
     }
 
@@ -40,17 +33,4 @@ protected function viewData(): array
             'label' => $this->label,
         ];
     }
-
-    protected function validateLabelStyle(): void
-    {
-        $style = Config::getString('markdown.code_block_label_style', 'header');
-
-        if (! in_array($style, ['header', 'badge'], true)) {
-            throw new InvalidConfigurationException(
-                "Invalid code block label style [$style]. Supported styles are [header] and [badge].",
-                'markdown',
-                'code_block_label_style',
-            );
-        }
-    }
 }

packages/framework/tests/Feature/CodeBlocksTest.php

@@ -98,28 +98,6 @@ public function testTitleModifierBecomesALabel(): void
         $this->assertStringContainsString('>app/Model.php</figcaption>', $html);
     }
 
-    public function testLegacyBadgeLabelStyleCanBeConfigured(): void
-    {
-        config(['markdown.code_block_label_style' => 'badge']);
-
-        $html = Markdown::render("```php title=\"app/Model.php\"\necho 'Hi';\n```");
-
-        $this->assertStringContainsString('<figure class="hyde-code-block ', $html);
-        $this->assertStringContainsString('<figcaption class="hyde-code-block-label ', $html);
-        $this->assertStringContainsString('>app/Model.php</figcaption>', $html);
-        $this->assertStringContainsString('absolute right-4 top-3', $html);
-    }
-
-    public function testUnsupportedLabelStyleThrows(): void
-    {
-        config(['markdown.code_block_label_style' => 'unsupported']);
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid code block label style [unsupported]. Supported styles are [header] and [badge].');
-
-        Markdown::render("```php title=\"app/Model.php\"\necho 'Hi';\n```");
-    }
-
     public function testTitleModifierAcceptsSingleQuotes(): void
     {
         $html = Markdown::render("```php title='app/Model.php'\necho 'Hi';\n```");

packages/framework/tests/Unit/CodeBlockViewModelUnitTest.php

@@ -21,7 +21,6 @@ class CodeBlockViewModelUnitTest extends UnitTestCase
 
     protected function setUp(): void
     {
-        self::mockConfig(['markdown.code_block_label_style' => 'header']);
         $this->createRealBladeCompilerEnvironment();
     }