Merge branch 'release/4.1.20' into v4

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Retour Changelog
 
+## 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))
+* Don't create automatic redirects for elements that are not enabled
+
+### Fixed
+* Fixed an issue where `410 Gone` redirects returned a generic browser error rather than a custom-defined Craft template ([#11](https://github.com/nystudio107/craft-retour/issues/311))
+* Fixed an issue where an exception could be thrown if a Site had no `baseUrl` defined
+* Normalize the incoming `url` and `path` so that `mergUrlWithPath()` handles edge-cases properly ([#1512](https://github.com/nystudio107/craft-seomatic/issues/1512))
+* Fixed an issue where deprecation errors would occur when an element does not have a `uri` ([#317](https://github.com/nystudio107/craft-retour/issues/317))
+
 ## 4.1.19 - 2024.08.19
 ### Fixed
 * Fixed an issue where the "File Not Found URL" link could be wrong when clicked on in some multi-site setups ([#310](https://github.com/nystudio107/craft-retour/issues/310))

Makefile

@@ -3,7 +3,7 @@ PLUGINDEV_PROJECT_DIR?=/Users/andrew/webdev/sites/plugindev/cms_v${MAJOR_VERSION
 VENDOR?=nystudio107
 PROJECT_PATH?=${VENDOR}/$(shell basename $(CURDIR))
 
-.PHONY: dev release
+.PHONY: dev docs release
 
 # Start up the buildchain dev server
 dev:

buildchain/package.json

@@ -17,11 +17,11 @@
   ],
   "version": "1.0.0",
   "dependencies": {
-    "apexcharts": "^3.8.0",
+    "apexcharts": "^4.0.0",
     "axios": "^1.6.2",
     "dompurify": "^2.3.1",
     "vue": "^2.6.0",
-    "vue-apexcharts": "^1.3.6",
+    "vue-apexcharts": "^1.7.0",
     "vue-confetti": "^0.4.2",
     "vue-events": "^3.1.0",
     "vue-save-state": "^1.2.0",

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.19",
+  "version": "4.1.20",
   "keywords": [
     "craftcms",
     "craft-plugin",

docs/docs/configuring.md

@@ -42,6 +42,18 @@ If you’re using Craft to host [multiple sites](https://docs.craftcms.com/v3/si
 * **Pattern Match Type** - What type of matching should be done with the Legacy URL Pattern. Details on regular expression matching can be found at [regexr.com](http://regexr.com). If a plugin provides a custom matching function, you can select it here.
 * **Redirect Type** - Select whether the redirect should be permanent or temporary.
 
+### Sites & Redirect Resolution
+
+For **Path Only** redirects, Retour will automatically take Craft Sites into account.
+
+Example: if a redirect from `/foo` to `/bar` happens on a site with the current Site URL of `http://example.com/en/`, the resulting redirect URL will be `http://example.com/en/bar`.
+
+This is normally what you’d want, but if you do not want Craft Sites to be taken into account, set the **Destination URL** to a fully qualified URL.
+
+Example: if a redirect from `/foo` to `http://example.com/bar` happens on a site with the current Site URL of `http://example.com/en/`, the resulting redirect URL will be `http://example.com/bar`.
+
+This is useful if you do not want Craft Sites taken into account, such as a situation where Craft is installed as a part of a larger site that has non-Craft handled URLs in it.
+
 ### Automatic Slug Redirects
 
 If you rename an Entry’s `slug` (or any other Element with URLs), Retour will automatically create a static redirect for you to keep traffic going to the right place.  It will also automatically create a static redirect if you move an entry around in a Structure.