Merge branch 'release/2.2.3' into craft-webpack

nystudio107 · Mar 21, 2020 · 7c98ca1 · 7c98ca1
2 parents e93acbb + 47fc7e5
commit 7c98ca1
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # nystudio107/craft Change Log
 
+## 2.2.3 - 2020.03.21
+### Changed
+* Added `SERVERLESS_SHARP_CLOUDFRONT_URL` to the `example.env`
+* Added plugin licenses environment variables to `project.yaml`
+* Added `SERVERLESS_SHARP_CLOUDFRONT_URL` to the ImageOptimized default settings in `project.yaml`
+
 ## 2.2.2 - 2020.03.18
 ### Added
 * Added `seed_db.sql` to seed the initial database

diff --git a/cms/config/project.yaml b/cms/config/project.yaml
@@ -83,14 +83,60 @@ plugins:
   image-optimize:
     edition: standard
     enabled: true
+    licenseKey: $PLUGIN_IMAGEOPTIMIZE_LICENSE
     schemaVersion: 1.0.0
+    settings:
+      allowUpScaledImageVariants: false
+      assetVolumeSubFolders: true
+      autoSharpenScaledImages: true
+      createColorPalette: true
+      createPlaceholderSilhouettes: false
+      imageTransformTypeSettings:
+        __assoc__:
+          -
+            - nystudio107\imageoptimizeimgix\imagetransforms\ImgixImageTransform
+            -
+              __assoc__:
+                -
+                  - domain
+                  - ''
+                -
+                  - apiKey
+                  - ''
+                -
+                  - securityToken
+                  - ''
+          -
+            - nystudio107\imageoptimizesharp\imagetransforms\SharpImageTransform
+            -
+              __assoc__:
+                -
+                  - baseUrl
+                  - $SERVERLESS_SHARP_CLOUDFRONT_URL
+          -
+            - nystudio107\imageoptimizethumbor\imagetransforms\ThumborImageTransform
+            -
+              __assoc__:
+                -
+                  - baseUrl
+                  - ''
+                -
+                  - securityKey
+                  - ''
+                -
+                  - includeBucketPrefix
+                  - ''
+      lowerQualityRetinaImageVariants: false
+      transformClass: nystudio107\imageoptimizesharp\imagetransforms\SharpImageTransform
   retour:
     edition: standard
     enabled: true
+    licenseKey: $PLUGIN_RETOUR_LICENSE
     schemaVersion: 3.0.7
   seomatic:
     edition: standard
     enabled: true
+    licenseKey: $PLUGIN_SEOMATIC_LICENSE
     schemaVersion: 3.0.8
   twigpack:
     edition: standard
@@ -103,6 +149,7 @@ plugins:
   webperf:
     edition: standard
     enabled: true
+    licenseKey: $PLUGIN_WEBPERF_LICENSE
     schemaVersion: 1.0.1
 sections:
   54e60257-f31a-44aa-960e-bbd364197e28:

diff --git a/cms/example.env b/cms/example.env
@@ -43,6 +43,7 @@ S3_SUBFOLDER=
 CLOUDFRONT_URL=
 CLOUDFRONT_DISTRIBUTION_ID=
 CLOUDFRONT_PATH_PREFIX=
+SERVERLESS_SHARP_CLOUDFRONT_URL=
 
 # Redis settings
 REDIS_HOSTNAME=redis