From 403b36066d7142a13078c5a00b8e8f088ceef0d6 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 00:04:57 -0400
Subject: [PATCH 01/11] refactor: Filter out empty attributes so they don't
 render on the `<script>` tags

---
 src/services/ViteService.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/services/ViteService.php b/src/services/ViteService.php
index 2ec42a2..7d746a5 100755
--- a/src/services/ViteService.php
+++ b/src/services/ViteService.php
@@ -143,6 +143,11 @@ public function init(): void
      */
     public function register(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = []): void
     {
+        // Filter out empty attributes, but preserve boolean values
+        $preserveBools = fn($value) => is_bool($value) || !empty($value);
+        $scriptTagAttrs = array_filter($scriptTagAttrs, $preserveBools);
+        $cssTagAttrs = array_filter($cssTagAttrs, $preserveBools);
+
         if ($this->devServerRunning()) {
             $this->devServerRegister($path, $scriptTagAttrs);
 
@@ -408,6 +413,11 @@ public function invalidateCaches(): void
      */
     public function script(string $path, bool $asyncCss = true, array $scriptTagAttrs = [], array $cssTagAttrs = []): string
     {
+        // Filter out empty attributes, but preserve boolean values
+        $preserveBools = fn($value) => is_bool($value) || !empty($value);
+        $scriptTagAttrs = array_filter($scriptTagAttrs, $preserveBools);
+        $cssTagAttrs = array_filter($cssTagAttrs, $preserveBools);
+
         if ($this->devServerRunning()) {
             return $this->devServerScript($path, $scriptTagAttrs);
         }

From 930809be9b0d1faf3641d3a3035235c5d87ef4bf Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 00:05:31 -0400
Subject: [PATCH 02/11] refactor: Version 4.0.12

---
 CHANGELOG.md  | 4 ++++
 composer.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22f8e0f..927d52b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Plugin Vite Changelog
 
+## 4.0.12 - UNRELEASED
+### Changed
+* Filter out empty attributes so they don't render on the `<script>` tags
+
 ## 4.0.11 - 2024.06.12
 ### Added
 * By default, only load the Vite AssetBundle if the request is a CP request or a preview request. This can be overridden via the `useForAllRequests` VitePluginService property ([#27](https://github.com/nystudio107/craft-plugin-vite/issues/27))
diff --git a/composer.json b/composer.json
index 939c55a..78b5a7f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "nystudio107/craft-plugin-vite",
   "description": "Plugin Vite is the conduit between Craft CMS plugins and Vite, with manifest.json & HMR support",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "keywords": [
     "craftcms",
     "plugin",

From 8ff1d346192d03040b0843348019bd3e4cbd4b82 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 00:13:56 -0400
Subject: [PATCH 03/11] feat: Add Makefile to the project root that does
 `release`, `dev`, & `docs`

---
 Makefile | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..467d758
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+MAJOR_VERSION?=4
+PLUGINDEV_PROJECT_DIR?=/Users/andrew/webdev/sites/plugindev/cms_v${MAJOR_VERSION}/
+VENDOR?=nystudio107
+PROJECT_PATH?=${VENDOR}/$(shell basename $(CURDIR))
+
+.PHONY: dev release
+
+# Start up the buildchain dev server
+dev:
+# Start up the docs dev server
+docs:
+	${MAKE} -C docs/ dev
+# Run code quality tools, tests, and build the buildchain & docs in preparation for a release
+release: --code-quality --code-tests --buildchain-clean-build --docs-clean-build
+# The internal targets used by the dev & release targets
+--buildchain-clean-build:
+--code-quality:
+	${MAKE} -C ${PLUGINDEV_PROJECT_DIR} -- ecs check vendor/${PROJECT_PATH}/src --fix
+	${MAKE} -C ${PLUGINDEV_PROJECT_DIR} -- phpstan analyze -c vendor/${PROJECT_PATH}/phpstan.neon
+--code-tests:
+--docs-clean-build:

From 0e0e11cb4b09441b356e5564ce72f846c08698c1 Mon Sep 17 00:00:00 2001
From: Florian Hofer <florianh0f3r@gmail.com>
Date: Tue, 13 Aug 2024 13:16:19 +0200
Subject: [PATCH 04/11] replace strpos with strrpos since file names could be
 kebap case

---
 src/helpers/ManifestHelper.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/helpers/ManifestHelper.php b/src/helpers/ManifestHelper.php
index d132267..2b09c90 100644
--- a/src/helpers/ManifestHelper.php
+++ b/src/helpers/ManifestHelper.php
@@ -320,14 +320,15 @@ protected static function filenameWithoutHash(string $path): string
         $pathInfo = pathinfo($path);
         $filename = $pathInfo['filename'];
         $extension = $pathInfo['extension'];
-        $hashPos = strpos($filename, '.') ?: strlen($filename);
+        $hashPos = strrpos($filename, '.') ?: strlen($filename);
         $hash = substr($filename, $hashPos);
         // Vite 5 now uses a `-` to separate the version hash, so account for that as well
         if (empty($hash) && str_contains($filename, '-')) {
-            $hash = substr($filename, strpos($filename, '-'));
+            $hash = substr($filename, strrpos($filename, '-'));
         }
         $filename = str_replace($hash, '', $filename);
 
         return implode('.', [$filename, $extension]);
     }
 }
+

From 0d936e5dc99a182ed0ea020a1e068fe10f46d4cd Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 11:24:09 -0400
Subject: [PATCH 05/11] chore: Version 4.0.12

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 927d52b..28e0c45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 ### Changed
 * Filter out empty attributes so they don't render on the `<script>` tags
 
+### Fixed
+* Use `strrpos` instead of `strpos` when attempting to extract a file name without the hash ([#28](https://github.com/nystudio107/craft-plugin-vite/pull/28))
+
 ## 4.0.11 - 2024.06.12
 ### Added
 * By default, only load the Vite AssetBundle if the request is a CP request or a preview request. This can be overridden via the `useForAllRequests` VitePluginService property ([#27](https://github.com/nystudio107/craft-plugin-vite/issues/27))

From b25a80630b17e2aa192468a9fe87bd88620df071 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 11:49:32 -0400
Subject: [PATCH 06/11] feat: Add a `craft.vite.integrity()` method that will
 extract the integrity hash (for building a Content Security Policy)

---
 src/helpers/ManifestHelper.php      | 18 ++++++++++++++++++
 src/services/ViteService.php        | 14 ++++++++++++++
 src/variables/ViteVariableTrait.php | 14 ++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/src/helpers/ManifestHelper.php b/src/helpers/ManifestHelper.php
index 2b09c90..a65b658 100644
--- a/src/helpers/ManifestHelper.php
+++ b/src/helpers/ManifestHelper.php
@@ -204,6 +204,7 @@ public static function legacyManifestTags(string $path, bool $asyncCss = true, a
     /**
      * Extract an entry file URL from all of the entries in the manifest
      *
+     * @param string $path
      * @return string
      */
     public static function extractEntry(string $path): string
@@ -233,6 +234,23 @@ public static function extractEntry(string $path): string
         return '';
     }
 
+    /**
+     * Extract an integrity hash for the given $path from the entries in the manifest
+     *
+     * @param string $path
+     * @return string
+     */
+    public static function extractIntegrity(string $path): string
+    {
+        foreach (self::$manifest as $entryKey => $entry) {
+            if (strpos($entryKey, $path) !== false) {
+                return $entry['integrity'] ?? '';
+            }
+        }
+
+        return '';
+    }
+
     /**
      * Extract any asset files from all of the entries in the manifest
      *
diff --git a/src/services/ViteService.php b/src/services/ViteService.php
index 7d746a5..05f108f 100755
--- a/src/services/ViteService.php
+++ b/src/services/ViteService.php
@@ -317,6 +317,20 @@ public function entry(string $path): string
         return FileHelper::createUrl($this->serverPublic, $entry);
     }
 
+    /**
+     * Return the integrity hash (or an empty string if not present) for the given entry
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    public function integrity(string $path): string
+    {
+        ManifestHelper::fetchManifest($this->manifestPath);
+
+        return ManifestHelper::extractIntegrity($path);
+    }
+
     /**
      * Return the URL for the given asset
      *
diff --git a/src/variables/ViteVariableTrait.php b/src/variables/ViteVariableTrait.php
index 9a59d2a..52344bd 100755
--- a/src/variables/ViteVariableTrait.php
+++ b/src/variables/ViteVariableTrait.php
@@ -84,6 +84,20 @@ public function entry(string $path): Markup
         );
     }
 
+    /**
+     * Return the integrity hash (or an empty string if not present) for the given entry
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    public function integrity(string $path): string
+    {
+        return Template::raw(
+            $this->viteService->integrity($path)
+        );
+    }
+
     /**
      * Return the URL for the given asset
      *

From 1d9c857519e243e48fe1ad9b243b3ab83ff57ba7 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 11:49:39 -0400
Subject: [PATCH 07/11] chore: Version 4.0.12

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28e0c45..488331a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Plugin Vite Changelog
 
 ## 4.0.12 - UNRELEASED
+### Added
+* Add a `craft.vite.integrity()` method that will extract the integrity hash (for building a Content Security Policy)
+
 ### Changed
 * Filter out empty attributes so they don't render on the `<script>` tags
 

From 637b2613624de7dcc8a27135b0ac252a8d30035d Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 15:09:25 -0400
Subject: [PATCH 08/11] feat: Added an `includeScriptOnloadHandler` config
 setting that allows you to disable the adding of an `onload` handler on the
 `<script>` tags (useful when implementing a Content Security Policy)

---
 src/services/ViteService.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/services/ViteService.php b/src/services/ViteService.php
index 05f108f..07a445a 100755
--- a/src/services/ViteService.php
+++ b/src/services/ViteService.php
@@ -91,6 +91,11 @@ class ViteService extends Component
      */
     public bool $includeModulePreloadShim = true;
 
+    /**
+     * @var bool Whether an onload handler should be added to <script> tags to fire a custom event when the script has loaded
+     */
+    public bool $includeScriptOnloadHandler = true;
+
     // Protected Properties
     // =========================================================================
 
@@ -538,6 +543,9 @@ protected function manifestRegisterTags(array $tags, array $legacyTags): void
                 $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
                 switch ($tag['type']) {
                     case 'file':
+                        if (!$this->includeScriptOnloadHandler) {
+                            unset($tag['options']['onload']);
+                        }
                         $view->registerJsFile(
                             $url,
                             $tag['options'],
@@ -619,6 +627,9 @@ protected function manifestScriptTags(array $tags, array $legacyTags): array
                 $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
                 switch ($tag['type']) {
                     case 'file':
+                        if (!$this->includeScriptOnloadHandler) {
+                            unset($tag['options']['onload']);
+                        }
                         $lines[] = HtmlHelper::jsFile($url, $tag['options']);
                         break;
                     case 'css':

From e357c01d0f9551011665026e7a629c091c09b0f6 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 15:09:52 -0400
Subject: [PATCH 09/11] chore: Version 4.0.12

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 488331a..d2fc290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 4.0.12 - UNRELEASED
 ### Added
 * Add a `craft.vite.integrity()` method that will extract the integrity hash (for building a Content Security Policy)
+* Added an `includeScriptOnloadHandler` config setting that allows you to disable the adding of an `onload` handler on the `<script>` tags (useful when implementing a Content Security Policy)
 
 ### Changed
 * Filter out empty attributes so they don't render on the `<script>` tags

From c71b86ecc3dc3c5d733a1af743c960434499afb9 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 19:36:19 -0400
Subject: [PATCH 10/11] refactor: ECS code cleanup

---
 src/helpers/ManifestHelper.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/helpers/ManifestHelper.php b/src/helpers/ManifestHelper.php
index a65b658..02a3115 100644
--- a/src/helpers/ManifestHelper.php
+++ b/src/helpers/ManifestHelper.php
@@ -349,4 +349,3 @@ protected static function filenameWithoutHash(string $path): string
         return implode('.', [$filename, $extension]);
     }
 }
-

From cc7bd8147bdb82790d697677d96771da0664d915 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 22:01:05 -0400
Subject: [PATCH 11/11] chore: Version 4.0.12

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2fc290..af229a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Plugin Vite Changelog
 
-## 4.0.12 - UNRELEASED
+## 4.0.12 - 2024.08.13
 ### Added
 * Add a `craft.vite.integrity()` method that will extract the integrity hash (for building a Content Security Policy)
 * Added an `includeScriptOnloadHandler` config setting that allows you to disable the adding of an `onload` handler on the `<script>` tags (useful when implementing a Content Security Policy)