Merge branch 'main' into wandi/absolute-url

lhapaipai · Oct 6, 2023 · fedfd28 · fedfd28
2 parents d02f853 + 1a7c800
commit fedfd28
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v4.2.0
+
+- add `vite_mode` twig function
+
 ## v4.0.1
 
 - fix conditional imports generate modulepreloads for everything

diff --git a/src/Asset/EntrypointRenderer.php b/src/Asset/EntrypointRenderer.php
@@ -13,6 +13,7 @@ class EntrypointRenderer
 
     private $returnedViteClients = [];
     private $returnedReactRefresh = [];
+    private $returnedPreloadedScripts = [];
 
     private $hasReturnedViteLegacyScripts = false;
 
@@ -142,23 +143,38 @@ public function renderLinks(string $entryName, array $options = [], $buildName =
 
         if ($this->entrypointsLookup->isProd($buildName)) {
             foreach ($this->entrypointsLookup->getJavascriptDependencies($entryName, $buildName) as $fileWithHash) {
-                $content[] = $this->tagRenderer->renderLinkPreload($this->completeURL($fileWithHash['path'], $useAbsoluteUrl), [
-                    'integrity' => $fileWithHash['hash'],
-                ], $buildName);
+                if (false === \in_array($fileWithHash['path'], $this->returnedPreloadedScripts, true)) {
+                    $content[] = $this->tagRenderer->renderLinkPreload($this->completeURL($fileWithHash['path'], $useAbsoluteUrl), [
+                        'integrity' => $fileWithHash['hash'],
+                    ], $buildName);
+                    $this->returnedPreloadedScripts[] = $fileWithHash['path'];
+                }
             }
         }
 
         if ($this->entrypointsLookup->isProd($buildName) && isset($options['preloadDynamicImports']) && true === $options['preloadDynamicImports']) {
             foreach ($this->entrypointsLookup->getJavascriptDynamicDependencies($entryName, $buildName) as $fileWithHash) {
-                $content[] = $this->tagRenderer->renderLinkPreload($this->completeURL($fileWithHash['path'], $useAbsoluteUrl), [
-                    'integrity' => $fileWithHash['hash'],
-                ], $buildName);
+                if (false === \in_array($fileWithHash['path'], $this->returnedPreloadedScripts, true)) {
+                    $content[] = $this->tagRenderer->renderLinkPreload($this->completeURL($fileWithHash['path'], $useAbsoluteUrl), [
+                        'integrity' => $fileWithHash['hash'],
+                    ], $buildName);
+                    $this->returnedPreloadedScripts[] = $fileWithHash['path'];
+                }
             }
         }
 
         return implode(PHP_EOL, $content);
     }
 
+    public function getMode(string $buildName = null): ?string
+    {
+        if (!$this->entrypointsLookup->hasFile($buildName)) {
+            return null;
+        }
+
+        return $this->entrypointsLookup->isProd() ? 'prod' : 'dev';
+    }
+
     public function reset()
     {
         // resets the state of this service

diff --git a/src/Asset/EntrypointsLookup.php b/src/Asset/EntrypointsLookup.php
@@ -118,7 +118,7 @@ public function getLegacyJSFile($entryName, $buildName = null): string
 
         $legacyEntryName = $entryInfos['entryPoints'][$entryName]['legacy'];
 
-        return $entryInfos['entryPoints'][$legacyEntryName]['js'][0];
+        return $entryInfos['entryPoints'][$legacyEntryName]['js'][0]['path'];
     }
 
     private function throwIfEntryIsMissing(string $entryName, string $buildName = null): void

diff --git a/src/Twig/EntryFilesTwigExtension.php b/src/Twig/EntryFilesTwigExtension.php
@@ -18,9 +18,15 @@ public function __construct(EntrypointRenderer $entrypointRenderer)
     public function getFunctions(): array
     {
         return [
-      new TwigFunction('vite_entry_script_tags', [$this, 'renderViteScriptTags'], ['is_safe' => ['html']]),
-      new TwigFunction('vite_entry_link_tags', [$this, 'renderViteLinkTags'], ['is_safe' => ['html']]),
-    ];
+            new TwigFunction('vite_entry_script_tags', [$this, 'renderViteScriptTags'], ['is_safe' => ['html']]),
+            new TwigFunction('vite_entry_link_tags', [$this, 'renderViteLinkTags'], ['is_safe' => ['html']]),
+            new TwigFunction('vite_mode', [$this, 'getViteMode']),
+        ];
+    }
+
+    public function getViteMode(string $buildName = null): ?string
+    {
+        return $this->entrypointRenderer->getMode($buildName);
     }
 
     public function renderViteScriptTags(string $entryName, array $options = [], $buildName = null): string