diff --git a/CHANGELOG.md b/CHANGELOG.md index cd001da1..b36c5b7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # ImageOptimize Changelog +## 1.6.47 - 2022.07.08 +### Fixed +* If there's no transform requested, return `null` so other plugins have a crack at it ([#349](https://github.com/nystudio107/craft-imageoptimize/issues/349)) + ## 1.6.46 - 2022.06.29 ### Fixed * Fixed an issue that could throw an exception when double-clicking on an asset, due to an incorrect asset bundle path diff --git a/composer.json b/composer.json index cf0ca082..91eabc62 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "nystudio107/craft-imageoptimize", "description": "Automatically create & optimize responsive image transforms, using either native Craft transforms or a service like imgix, with zero template changes.", "type": "craft-plugin", - "version": "1.6.46", + "version": "1.6.47", "keywords": [ "craft", "cms", diff --git a/src/services/Optimize.php b/src/services/Optimize.php index f35a1a08..281347b4 100644 --- a/src/services/Optimize.php +++ b/src/services/Optimize.php @@ -152,6 +152,10 @@ public function handleGetAssetUrlEvent(GetAssetUrlEvent $event) if (empty($transform)) { $transform = null; } + // If there's no transform requested, return `null` so other plugins have a crack at it + if ($transform === null) { + return null; + } // If we're passed in null, make a dummy AssetTransform model for Thumbor // For backwards compatibility if ($transform === null && ImageOptimize::$plugin->transformMethod instanceof ThumborImageTransform) { diff --git a/src/web/assets/src/js/ImageOptimize.js b/src/web/assets/src/js/ImageOptimize.js index b94fd348..47361354 100644 --- a/src/web/assets/src/js/ImageOptimize.js +++ b/src/web/assets/src/js/ImageOptimize.js @@ -1,2 +1,9 @@ // Import our CSS import '@/css/app.css'; + +// Accept HMR as per: https://vitejs.dev/guide/api-hmr.html +if (import.meta.hot) { + import.meta.hot.accept(() => { + console.log("HMR") + }); +} diff --git a/src/web/assets/src/js/Welcome.js b/src/web/assets/src/js/Welcome.js index 9d8fa829..e4d3e4e2 100644 --- a/src/web/assets/src/js/Welcome.js +++ b/src/web/assets/src/js/Welcome.js @@ -2,12 +2,17 @@ import Vue from 'vue'; import ConfettiParty from '@/vue/ConfettiParty.vue'; new Vue({ - el: "#cp-nav-content", - components: { - ConfettiParty, - }, - data: { - }, - methods: { - }, + el: "#cp-nav-content", + components: { + ConfettiParty, + }, + data: {}, + methods: {}, }); + +// Accept HMR as per: https://vitejs.dev/guide/api-hmr.html +if (import.meta.hot) { + import.meta.hot.accept(() => { + console.log("HMR") + }); +}