Merge branch 'release/1.6.9' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,12 @@
 # ImageOptimize Changelog
 
+## 1.6.9 - 2020.02.06
+### Changed
+* Properly documented how the data in the `imageTransformTypeSettings` config is stored
+
+### Fixed
+* Fixed an issue where an SVG sent in to an image transform handler as a thumbnail request without specifying another format to convert to
+
 ## 1.6.8 - 2020.01.27
 ### Fixed
 * Fixed an issue where an SVG sent in to image transform handler without specifying another format to convert to

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.8",
+    "version": "1.6.9",
     "keywords": [
         "craft",
         "cms",

docs/docs/.vuepress/config.js

@@ -2,7 +2,7 @@ module.exports = {
     title: 'Image Optimize Documentation',
     description: 'Documentation for the Image Optimize plugin',
     base: '/docs/image-optimize/',
-    dest: '../../../../sites/nystudio107/web/docs/image-optimize',
+    dest: '~/webdev/sites/nystudio107/web/docs/image-optimize',
     themeConfig: {
         displayAllHeaders: true,
         sidebar: [

src/config.php

@@ -32,6 +32,17 @@
 
     /**
      * @var array Settings for the image transform components
+     *
+     * The data is stored in the following format, with the key being the class
+     * of the image transform method:
+     *
+     * 'imageTransformTypeSettings' => [
+     *    ImgixImageTransform::class => [
+     *        'domain' => 'XXXXX',
+     *        'apiKey' => 'XXXXX',
+     *        'securityToken' => 'XXXXX',
+     *    ]
+     * ],
      */
     'imageTransformTypeSettings' => [],
 

src/services/Optimize.php

@@ -210,6 +210,11 @@ public function handleGetAssetThumbUrlEvent(GetAssetThumbUrlEvent $event)
                 ]);
                 /** @var ImageTransform $transformMethod */
                 $transformMethod = ImageOptimize::$plugin->transformMethod;
+                // If the final format is an SVG, don't attempt to transform it
+                $finalFormat = empty($transform['format']) ? $asset->getExtension() : $transform['format'];
+                if ($finalFormat === 'svg') {
+                    return null;
+                }
                 // Generate an image transform url
                 if ($transformMethod->hasProperty('generateTransformsBeforePageLoad')) {
                     $transformMethod->generateTransformsBeforePageLoad = $event->generate;