fix: use relative paths when importing components

Author: jon-ht

src/CacheWarmer/StorybookCacheWarmer.php

@@ -17,7 +17,6 @@ public function __construct(
         private readonly ?string $cacheDir,
         private readonly bool $debug,
         private readonly string $projectDir,
-        private readonly array $storybookConfig,
         private readonly array $twigConfig,
         private readonly array $twigComponentConfig,
     ) {
@@ -54,11 +53,38 @@ private function getConfigCacheFactory(): ConfigCacheFactoryInterface
     private function generateSymfonyParameters(ConfigCacheInterface $cache): void
     {
         $parameters = [
-            'storybook_bundle_config' => $this->storybookConfig,
-            'twig_config' => $this->twigConfig,
-            'twig_component_config' => $this->twigComponentConfig,
+            'twig_config' => [
+                'default_path' => $this->twigConfig['default_path'],
+                'paths' => $this->twigConfig['paths'],
+            ],
+            'twig_component_config' => [
+                'anonymous_template_directory' => $this->twigComponentConfig['anonymous_template_directory'],
+                'defaults' => $this->twigComponentConfig['defaults'],
+            ],
         ];
 
-        $cache->write(json_encode($parameters, JSON_PRETTY_PRINT));
+        $cache->write(json_encode($this->stripProjectDirectory($parameters), JSON_PRETTY_PRINT));
+    }
+
+    private function stripProjectDirectory(array $array): array
+    {
+        $sanitizedArray = [];
+        foreach ($array as $key => $value) {
+            if (is_string($value) && str_starts_with($value, $this->projectDir)) {
+                $value = str_replace($this->projectDir, '', $value);
+            }
+
+            if (is_string($key) && str_starts_with($key, $this->projectDir)) {
+                $key = str_replace($this->projectDir, '', $key);
+                $sanitizedArray[$key] = $value;
+            } elseif (is_array($value)) {
+                $sanitizedArray[$key] = $this->stripProjectDirectory($value);
+            } else {
+                $sanitizedArray[$key] = $value;
+            }
+
+        }
+
+        return $sanitizedArray;
     }
 }

storybook/dist/builders/webpack-builder.js

@@ -34,10 +34,6 @@ type FrameworkName = '@sensiolabs/storybook-symfony-webpack5';
 type BuilderName = '@storybook/builder-webpack5';
 type ProxyPaths = string[] | string;
 type SymfonyOptions = {
-    /**
-     * Symfony project directory.
-     */
-    projectDir: string;
     /**
      * Storybook cache directory.
      */
@@ -54,15 +50,6 @@ type SymfonyOptions = {
      * Additional paths to watch during compilation.
      */
     additionalWatchPaths?: string[];
-    /**
-     * When Storybook and Symfony are not on the same host (e.g. Symfony is Dockerized), mounted paths may differ.
-     * This option allows to map paths from Storybook host to Symfony host.
-     *
-     * Example: { __dirname: '/var/www' }
-     */
-    projectPathAliases?: {
-        [p: string]: string;
-    };
 };
 type FrameworkOptions = {
     builder?: BuilderOptions;

storybook/dist/builders/webpack-builder.js.map

@@ -34,10 +34,6 @@ type FrameworkName = '@sensiolabs/storybook-symfony-webpack5';
 type BuilderName = '@storybook/builder-webpack5';
 type ProxyPaths = string[] | string;
 type SymfonyOptions = {
-    /**
-     * Symfony project directory.
-     */
-    projectDir: string;
     /**
      * Storybook cache directory.
      */
@@ -54,15 +50,6 @@ type SymfonyOptions = {
      * Additional paths to watch during compilation.
      */
     additionalWatchPaths?: string[];
-    /**
-     * When Storybook and Symfony are not on the same host (e.g. Symfony is Dockerized), mounted paths may differ.
-     * This option allows to map paths from Storybook host to Symfony host.
-     *
-     * Example: { __dirname: '/var/www' }
-     */
-    projectPathAliases?: {
-        [p: string]: string;
-    };
 };
 type FrameworkOptions = {
     builder?: BuilderOptions;