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

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

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

From 80e4058f0d7880c2388748ccadb16be375c3905b Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 00:05:17 -0400
Subject: [PATCH 02/10] chore: Version 1.0.36

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bda78f..99b1073 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Plugin Vite Changelog
 
+## 1.0.36 - UNRELEASED
+### Changed
+* Filter out empty attributes so they don't render on the `<script>` tags
+
 ## 1.0.35 - 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 9c6824a..35d0117 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": "1.0.35",
+  "version": "1.0.36",
   "keywords": [
     "craftcms",
     "plugin",

From b106b5599164b6ff35ec48588a1fcad284ecad0c Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 00:13:48 -0400
Subject: [PATCH 03/10] 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..ea94f7b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+MAJOR_VERSION?=3
+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 7c1a473ba72b4e78c676c3dfafb96f75ca26f35b Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 11:23:53 -0400
Subject: [PATCH 04/10] fix: 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))

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

diff --git a/src/helpers/ManifestHelper.php b/src/helpers/ManifestHelper.php
index 9c731d2..0495535 100644
--- a/src/helpers/ManifestHelper.php
+++ b/src/helpers/ManifestHelper.php
@@ -320,11 +320,11 @@ 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);
 

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

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99b1073..bfea7c1 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))
+
 ## 1.0.35 - 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 6c0ecf3e0e07847759a2506b275373bf1a6741c0 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 11:49:47 -0400
Subject: [PATCH 06/10] feat: Add a `craft.vite.integrity()` method that will
 extract the integrity hash (for building a Content Security Policy)

---
 src/helpers/ManifestHelper.php      | 19 +++++++++++++++++++
 src/services/ViteService.php        | 14 ++++++++++++++
 src/variables/ViteVariableTrait.php | 17 ++++++++++++++---
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/helpers/ManifestHelper.php b/src/helpers/ManifestHelper.php
index 0495535..779a1d2 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,24 @@ 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 b7a6f50..5535791 100755
--- a/src/services/ViteService.php
+++ b/src/services/ViteService.php
@@ -319,6 +319,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 a055aee..6d2767b 100755
--- a/src/variables/ViteVariableTrait.php
+++ b/src/variables/ViteVariableTrait.php
@@ -11,11 +11,8 @@
 namespace nystudio107\pluginvite\variables;
 
 use craft\helpers\Template;
-
 use nystudio107\pluginvite\services\ViteService;
-
 use Twig\Markup;
-
 use yii\base\InvalidConfigException;
 
 /**
@@ -87,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 8139a0124b600106664a94933abefe1bf2f0700e Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 11:49:55 -0400
Subject: [PATCH 07/10] chore: Version 1.0.36

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfea7c1..47d729f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Plugin Vite Changelog
 
 ## 1.0.36 - 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 06c8385d1469ef9adc34008ee21b6dc73f36e101 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 15:09:32 -0400
Subject: [PATCH 08/10] 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 5535791..a7158a3 100755
--- a/src/services/ViteService.php
+++ b/src/services/ViteService.php
@@ -91,6 +91,11 @@ class ViteService extends Component
      */
     public $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 $includeScriptOnloadHandler = true;
+
     // Protected Properties
     // =========================================================================
 
@@ -542,6 +547,9 @@ protected function manifestRegisterTags(array $tags, array $legacyTags)
                 $url = FileHelper::createUrl($this->serverPublic, $tag['url']);
                 switch ($tag['type']) {
                     case 'file':
+                        if (!$this->includeScriptOnloadHandler) {
+                            unset($tag['options']['onload']);
+                        }
                         $view->registerJsFile(
                             $url,
                             $tag['options'],
@@ -623,6 +631,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 aa2907236626810df69ee1d2a2928f0149c07548 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 15:09:41 -0400
Subject: [PATCH 09/10] chore: Version 1.0.36

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47d729f..bc9eeef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.0.36 - 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 7e5220373013568ee8baee898fb5868eb6ae62c8 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Tue, 13 Aug 2024 22:00:17 -0400
Subject: [PATCH 10/10] chore: Version 1.0.36

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc9eeef..ba1f23a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Plugin Vite Changelog
 
-## 1.0.36 - UNRELEASED
+## 1.0.36 - 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)