🧑‍💻 Change default editorStyles implementation from URL to local th…

…eme path (#367) --------- Co-authored-by: QWp6t <hi@qwp6t.me>
roots · Mar 29, 2024 · cacfc23 · cacfc23
1 parent 308e5a0
commit cacfc23
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/src/Roots/Acorn/Assets/Concerns/Enqueuable.php b/src/Roots/Acorn/Assets/Concerns/Enqueuable.php
@@ -2,6 +2,9 @@
 
 namespace Roots\Acorn\Assets\Concerns;
 
+use Illuminate\Support\Str;
+use Roots\Acorn\Filesystem\Filesystem;
+
 trait Enqueuable
 {
     /**
@@ -85,7 +88,24 @@ public function enqueue()
      */
     public function editorStyles()
     {
-        $this->css(fn ($handle, $src) => add_editor_style($src));
+        $relativePath = (new Filesystem)->getRelativePath(
+            Str::finish(get_theme_file_path(), '/'),
+            $this->path
+        );
+
+        $this->css(function ($handle, $src) use ($relativePath) {
+            if (! Str::startsWith($src, $this->uri)) {
+                return add_editor_style($src);
+            }
+
+            $style = Str::of($src)
+                ->after($this->uri)
+                ->ltrim('/')
+                ->start("{$relativePath}/")
+                ->toString();
+
+            add_editor_style($style);
+        });
 
         return $this;
     }

diff --git a/tests/Assets/BundleTest.php b/tests/Assets/BundleTest.php
@@ -26,11 +26,9 @@
     $manifest = json_decode(file_get_contents($this->fixture('bud_single_runtime/public/entrypoints.json')), JSON_OBJECT_AS_ARRAY);
     $app = new Bundle('app', $manifest['app'], $this->fixture('bud_single_runtime'), 'https://k.jo');
 
-    $app->js(fn ($handle, $src, $dependencies) => assertMatchesSnapshot(compact('handle', 'src', 'dependencies'))
-    );
+    $app->js(fn ($handle, $src, $dependencies) => assertMatchesSnapshot(compact('handle', 'src', 'dependencies')));
 
-    $app->css(fn ($handle, $src) => assertMatchesSnapshot(compact('handle', 'src'))
-    );
+    $app->css(fn ($handle, $src) => assertMatchesSnapshot(compact('handle', 'src')));
 });
 
 it('can enqueue css', function () {
@@ -46,6 +44,7 @@
     $manifest = json_decode(file_get_contents($this->fixture('bud_single_runtime/public/entrypoints.json')), JSON_OBJECT_AS_ARRAY);
     $app = new Bundle('app', $manifest['app'], $this->fixture('bud_single_runtime'), 'https://k.jo');
 
+    $this->stub('get_theme_file_path', fn ($path = '') => $this->fixture('bud_v6_single_runtime/public/'.$path));
     $this->stub('add_editor_style', fn (...$args) => assertMatchesSnapshot($args));
 
     $app->editorStyles();

diff --git a/tests/__snapshots__/BundleTest__it_can_add_editor_styles__1.yml b/tests/__snapshots__/BundleTest__it_can_add_editor_styles__1.yml
@@ -1 +1 @@
-- 'https://k.jo/public/app.2.4476c5f869ee7584ba3c.css'
+- ../../bud_single_runtime/public/app.2.4476c5f869ee7584ba3c.css