Merge branch 'release/4.1.24' into v4

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Retour Changelog
 
+## 4.1.24 - 2025.03.05
+### Fixed
+* Fixed an issue where redirects with a path site prefix were processed in the wrong order, and might not work as expected
+* Fixed a logic error where query parameters with duplicate values could be removed from the resulting destination URL
+* Destination URLs are no longer URL decoded _unless_ a malicious payload was stripped from them ([#330](https://github.com/nystudio107/craft-retour/issues/330))
+
 ## 4.1.23 - 2025.02.12
 ### Changed
 * Update buildchain to Vite 6 & Tailwind CSS 4

buildchain/package-lock.json

@@ -6,42 +6,41 @@
  */
 
 .retour-import-list-group-item {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-  margin-bottom: -1px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  cursor: move;
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+    margin-bottom: -1px;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    cursor: move;
 }
 
 .retour-import-field-group-item {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-  margin-bottom: -1px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  cursor: arrow;
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+    margin-bottom: -1px;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    cursor: default;
 }
 
 .retour-import-arrow-item {
-  position: relative;
-  display: block;
-  padding: 11px 15px;
+    position: relative;
+    display: block;
+    padding: 11px 15px;
 }
 
 .retour-import-drag-area {
-  min-height: 100px;
+    min-height: 100px;
 }
 
 .retour-empty-item {
-  background:
-    repeating-linear-gradient(
-      -55deg,
-      #ddd,
-      #ddd 10px,
-      #eee 10px,
-      #eee 20px
+    background: repeating-linear-gradient(
+            -55deg,
+            #ddd,
+            #ddd 10px,
+            #eee 10px,
+            #eee 20px
     );
 }

buildchain/src/css/pages/import.css

@@ -13,7 +13,6 @@
  */
 @import "tailwindcss/theme.css";
 @import "tailwindcss/utilities.css";
-
 @config "../../tailwind.config.ts";
 @source "../../../src/templates";
 @source "../.././node_modules/vuetable-2/src/components/";

buildchain/src/css/tailwind-config.css

@@ -5,27 +5,61 @@ export default {
     "stylelint-config-standard-scss"
   ],
   "rules": {
+    // For TailwindCSS @apply directive
+    "at-rule-no-deprecated": [
+      true,
+      {
+        "ignoreAtRules": [
+          "apply"
+        ],
+      }
+    ],
+    // For TailwindCSS theme() function properties
+    "declaration-property-value-no-unknown": [
+      true,
+      {
+        "ignoreProperties": {
+          "/.+/": "/^.*?theme/"
+        }
+      },
+    ],
+    // For TailwindCSS theme() function
+    "function-no-unknown": [
+      true,
+      {
+        "ignoreFunctions": [
+          "screen",
+          "theme"
+        ]
+      },
+    ],
     "scss/at-rule-no-unknown": [
       true,
       {
+        // For TailwindCSS custom @ directives
         "ignoreAtRules": [
           "theme",
           "source",
           "utility",
           "variant",
           "custom-variant",
+          "plugin",
+          "tailwind",
           "apply",
-          "reference",
+          "layer",
           "config",
-          "plugin",
+          "variants",
+          "responsive",
+          "screen"
         ]
       }
     ],
+    "no-descending-specificity": null,
     "no-invalid-position-at-import-rule": null,
+    "import-notation": null,
     "block-no-empty": null,
     "selector-id-pattern": null,
     "selector-class-pattern": null,
-    "no-descending-specificity": null,
     "font-family-no-missing-generic-family-keyword": null
   }
 }

buildchain/stylelint.config.js

@@ -57,12 +57,10 @@ export default defineConfig(({command}) => ({
         }
       },
       stylelint: {
-        lintCommand: 'stylelint ./src/**/*.{css} --allow-empty-input --fix',
+        lintCommand: 'stylelint ./src/**/*.{css,scss,sass,pcss} --fix',
         dev: {
           overrideConfig: {
-            allowEmptyInput: true,
             cache: true,
-            fix: false
           }
         }
       },
@@ -84,7 +82,7 @@ export default defineConfig(({command}) => ({
     // Allow cross-origin requests -- https://github.com/vitejs/vite/security/advisories/GHSA-vg6x-rcgg-rjx6
     allowedHosts: true,
     cors: {
-      origin: /https?:\/\/([A-Za-z0-9\-\.]+)?(localhost|\.local|\.test|\.site)(?::\d+)?$/
+      origin: /https?:\/\/([A-Za-z0-9\-\.]+)?(localhost|\.local|\.test|\.ddev\.site)(?::\d+)?$/
     },
     fs: {
       strict: false

buildchain/vite.config.ts

@@ -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.23",
+  "version": "4.1.24",
   "keywords": [
     "craftcms",
     "craft-plugin",