Merge branch 'release/4.0.5' into v4

.github/workflows/build-and-deploy-docs.yml

@@ -4,7 +4,7 @@ env:
 on:
   push:
     branches:
-      - v1
+      - v4
     paths:
       - 'docs/**'
   pull_request:
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node-version: [14.x]
+        node-version: [ 14.x ]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
@@ -35,7 +35,7 @@ jobs:
       - name: rsync deployments
         uses: burnett01/[email protected]
         with:
-          switches: -avzr --delete
+          switches: -avzr
           path: ./dist/
           remote_path: ${{ secrets.NYS_DOCS_ROOT }}${{ env.DOCS_DEST_DIR }}
           remote_host: ${{ secrets.NYS_DEPLOY_REMOTE_HOST }}

.github/workflows/create-release.yml

@@ -0,0 +1,21 @@
+name: Create Release
+run-name: Create release for ${{ github.event.client_payload.version }}
+
+on:
+  repository_dispatch:
+    types:
+      - craftcms/new-release
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: ncipollo/release-action@v1
+        with:
+          body: ${{ github.event.client_payload.notes }}
+          makeLatest: ${{ github.event.client_payload.latest }}
+          name: ${{ github.event.client_payload.version }}
+          prerelease: ${{ github.event.client_payload.prerelease }}
+          tag: ${{ github.event.client_payload.tag }}

CHANGELOG.md

@@ -1,5 +1,14 @@
 # ImageOptimize Changelog
 
+## 4.0.5 - 2023.05.19
+### Changed
+* Automate release generation via GitHub action
+* Add versioning to the docs
+
+### Fixed
+* Side-step an issue which caused Craft 4.4.x to do unwanted image transform work even when using an external service to do the transforms ([#373](https://github.com/nystudio107/craft-imageoptimize/issues/373)) ([#13018](https://github.com/craftcms/cms/issues/13018))
+* Remove the old Craft generated transform that's still sitting in the temp directory ([#380](https://github.com/nystudio107/craft-imageoptimize/pull/380))
+
 ## 4.0.4 - 2023.02.09
 ### Changed
 * Use dynamic docker container name & port for the `buildchain`

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": "4.0.4",
+  "version": "4.0.5",
   "keywords": [
     "craft",
     "cms",

docs/docs/.vitepress/config.ts

@@ -44,6 +44,12 @@ export default defineConfig({
       {text: 'Store', link: 'https://plugins.craftcms.com/image-optimize'},
       {text: 'Changelog', link: 'https://nystudio107.com/plugins/imageoptimize/changelog'},
       {text: 'Issues', link: 'https://github.com/nystudio107/craft-imageoptimize/issues'},
+      {
+        text: 'v4', items: [
+          {text: 'v4', link: '/'},
+          {text: 'v3', link: 'https://nystudio107.com/docs/image-optimize/v3/'},
+        ],
+      },
     ],
   },
 });

src/ImageOptimize.php

@@ -295,13 +295,23 @@ protected function installEventHandlers(): void
      */
     protected function installAssetEventHandlers(): void
     {
-        // Handler: Assets::EVENT_GET_ASSET_URL
+        // Use Asset::EVENT_BEFORE_DEFINE_URL if it's available
+        // ref: https://github.com/craftcms/cms/issues/13018
+        try {
+            $ref = new \ReflectionClassConstant(Asset::class, 'EVENT_BEFORE_DEFINE_URL');
+        } /** @noinspection PhpRedundantCatchClauseInspection */ catch (\ReflectionException) {
+            $ref = null;
+        }
+        $eventName = $ref?->getDeclaringClass()->name === Asset::class
+            ? Asset::EVENT_BEFORE_DEFINE_URL
+            : Asset::EVENT_DEFINE_URL;
+        // Handler: Assets::EVENT_DEFINE_URL
         Event::on(
             Asset::class,
-            Asset::EVENT_DEFINE_URL,
+            $eventName,
             static function (DefineAssetUrlEvent $event): void {
                 Craft::debug(
-                    'Asset::EVENT_GET_ASSET_URL',
+                    'Asset::EVENT_DEFINE_URL',
                     __METHOD__
                 );
                 // Return the URL to the asset URL or null to let Craft handle it
@@ -341,6 +351,8 @@ static function (ImageTransformerOperationEvent $event): void {
                     $event
                 );
                 if ($tempPath) {
+                    // Remove the old Craft generated transform that's still sitting in the temp directory.
+                    @unlink($event->tempPath);
                     $event->tempPath = $tempPath;
                 }
             }