Merge branch 'release/4.0.21' into v4

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Retour Changelog
 
+## 4.0.21 - 2025.01.08
+### Changed
+* Fixed an issue where a GraphQL Retour query could return a URL with a `/` prefixed to it if the destination was a full URL ([#320](https://github.com/nystudio107/craft-retour/issues/320))
+
 ## 4.1.20 - 2024.12.14
 ### Changed
 * Retour now strips site path prefixes from incoming 404 URL paths, such that redirects will work as expected (any Site sub-path prefix is ignored) ([#288](https://github.com/nystudio107/craft-retour/issues/288))

buildchain/Dockerfile

@@ -1,7 +1,7 @@
 ARG TAG=20-alpine
 FROM node:$TAG
 
-RUN npm install -g npm@^10.0.0
+RUN npm install -g npm@^11.0.0
 
 WORKDIR /app/buildchain/
 

composer.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-retour",
   "description": "Retour allows you to intelligently redirect legacy URLs, so that you don't lose SEO value when rebuilding & restructuring a website",
   "type": "craft-plugin",
-  "version": "4.1.20",
+  "version": "4.1.21",
   "keywords": [
     "craftcms",
     "craft-plugin",

docs/Dockerfile

@@ -1,7 +1,7 @@
 ARG TAG=20-alpine
 FROM node:$TAG
 
-RUN npm install -g npm@^10.0.0
+RUN npm install -g npm@^11.0.0
 
 WORKDIR /app/
 

src/gql/resolvers/RetourResolver.php

@@ -81,7 +81,7 @@ public static function resolve(mixed $source, array $arguments, mixed $context,
             $path = $redirect['redirectDestUrl'];
             // Combine the URL and path together, merging them as appropriate
             try {
-                if (!UrlHelper::pathHasSitePrefix($path)) {
+                if (!UrlHelper::isFullUrl($dest) && !UrlHelper::pathHasSitePrefix($path)) {
                     $dest = UrlHelper::siteUrl('/', null, null, $siteId);
                     $dest = UrlHelper::mergeUrlWithPath($dest, $path);
                     $dest = parse_url($dest, PHP_URL_PATH);