Jlb/torchlight (laravel#205)

* Update Tailwind, Alpine, and colors * Upgrade to Laravel 8 * wip * Implement new home page design * updating text * formatting * Search improvements * compile * Fix search colors * compile * formatting * wip * Add Octane to the ecosystem * fixes * wip * Add Breeze to ecosystem * formatting * Update testimonials section * wip * add more testimonials * Update testimonials * Use Torchlight dark mode * Fix markdown issues * wip * wip * compile * Try using dark cod eblocks. * Dark code all the way * Add torchlight attribution * Add attribute commonmark extension * remove unneeded code Co-authored-by: Jason Beggs <[email protected]>
DigitalCloud · Feb 8, 2022 · ec0756e · ec0756e
1 parent 617110a
commit ec0756e
Show file tree

Hide file tree

Showing 72 changed files with 8,651 additions and 8,755 deletions.
diff --git a/.env.example b/.env.example
@@ -45,3 +45,7 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 ALGOLIA_ID=
 ALGOLIA_SEARCH_KEY=
+
+TORCHLIGHT_TOKEN=
+TORCHLIGHT_LIGHT_THEME=github-light
+TORCHLIGHT_DARK_THEME=github-dark
diff --git a/app/Documentation.php b/app/Documentation.php
@@ -2,7 +2,9 @@
 
 namespace App;
 
+use Illuminate\Support\Str;
 use Illuminate\Filesystem\Filesystem;
+use App\Markdown\GithubFlavoredMarkdownConverter;
 use Illuminate\Contracts\Cache\Repository as Cache;
 
 class Documentation
@@ -46,7 +48,7 @@ public function getIndex($version)
             $path = base_path('resources/docs/'.$version.'/documentation.md');
 
             if ($this->files->exists($path)) {
-                return $this->replaceLinks($version, (new Parsedown())->text($this->files->get($path)));
+                return $this->replaceLinks($version, (new GithubFlavoredMarkdownConverter())->convert($this->files->get($path)));
             }
 
             return null;
@@ -66,7 +68,11 @@ public function get($version, $page)
             $path = base_path('resources/docs/'.$version.'/'.$page.'.md');
 
             if ($this->files->exists($path)) {
-                return $this->replaceLinks($version, (new Parsedown)->text($this->files->get($path)));
+                $content = $this->files->get($path);
+
+                $content = (new GithubFlavoredMarkdownConverter())->convert($content);
+
+                return $this->replaceLinks($version, $content);
             }
 
             return null;
@@ -82,7 +88,7 @@ public function get($version, $page)
      */
     public static function replaceLinks($version, $content)
     {
-        return str_replace('{{version}}', $version, $content);
+        return str_replace('%7B%7Bversion%7D%7D', $version, $content);
     }
 
     /**

diff --git a/app/Markdown/GithubFlavoredMarkdownConverter.php b/app/Markdown/GithubFlavoredMarkdownConverter.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Markdown;
+
+use League\CommonMark\MarkdownConverter;
+use League\CommonMark\Environment\Environment;
+use App\Markdown\GithubFlavoredMarkdownExtension;
+use Torchlight\Commonmark\V2\TorchlightExtension;
+use League\CommonMark\Environment\EnvironmentInterface;
+use League\CommonMark\Extension\Attributes\AttributesExtension;
+use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
+
+/**
+ * Converts GitHub Flavored Markdown to HTML.
+ */
+class GithubFlavoredMarkdownConverter extends MarkdownConverter
+{
+    /**
+     * Create a new Markdown converter pre-configured for GFM
+     *
+     * @param array<string, mixed> $config
+     */
+    public function __construct(array $config = [])
+    {
+        $environment = new Environment($config);
+        $environment->addExtension(new CommonMarkCoreExtension());
+        $environment->addExtension(new GithubFlavoredMarkdownExtension());
+        $environment->addExtension(new AttributesExtension());
+        $environment->addExtension(new TorchlightExtension());
+
+        parent::__construct($environment);
+    }
+
+    public function getEnvironment(): EnvironmentInterface
+    {
+        \assert($this->environment instanceof EnvironmentInterface);
+
+        return $this->environment;
+    }
+}
diff --git a/app/Markdown/GithubFlavoredMarkdownExtension.php b/app/Markdown/GithubFlavoredMarkdownExtension.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Markdown;
+
+use League\CommonMark\Extension\ExtensionInterface;
+use League\CommonMark\Extension\Table\TableExtension;
+use League\CommonMark\Extension\Autolink\AutolinkExtension;
+use League\CommonMark\Extension\TaskList\TaskListExtension;
+use League\CommonMark\Environment\EnvironmentBuilderInterface;
+use League\CommonMark\Extension\Strikethrough\StrikethroughExtension;
+
+final class GithubFlavoredMarkdownExtension implements ExtensionInterface
+{
+    public function register(EnvironmentBuilderInterface $environment): void
+    {
+        $environment->addExtension(new AutolinkExtension());
+        $environment->addExtension(new StrikethroughExtension());
+        $environment->addExtension(new TableExtension());
+        $environment->addExtension(new TaskListExtension());
+    }
+}
diff --git a/app/Parsedown.php b/app/Parsedown.php
diff --git a/composer.json b/composer.json
@@ -13,7 +13,9 @@
         "fideloper/proxy": "^4.2",
         "laravel/framework": "^8.0",
         "laravel/tinker": "^2.2",
-        "symfony/browser-kit": "^5.0"
+        "symfony/browser-kit": "^5.0",
+        "torchlight/torchlight-commonmark": "^0.5.2",
+        "torchlight/torchlight-laravel": "^0.5.7"
     },
     "require-dev": {
         "facade/ignition": "^2.3.6",