Merge branch 'release/4.1.25' into v4

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Retour Changelog
 
+## 4.1.25 - 2024.04.03
+### Changed
+* Only look at adding site prefixes to `pathonly` redirects via GraphQL
+
+### Fixed
+* Fixed an issue with Postgres throwing a `PDOException` ([#336](https://github.com/nystudio107/craft-retour/issues/336))
+
 ## 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

buildchain/package-lock.json

@@ -48,7 +48,6 @@
     "vite-plugin-checker": "^0.8.0",
     "vite-plugin-compression": "^0.5.0",
     "vite-plugin-externals": "^0.6.0",
-    "vite-plugin-restart": "^0.4.0",
     "vue-tsc": "^2.0.0"
   },
   "scripts": {

buildchain/package.json

@@ -2,7 +2,8 @@
 export default {
   "extends": [
     "stylelint-config-recommended",
-    "stylelint-config-standard-scss"
+    "stylelint-config-standard-scss",
+    "stylelint-config-recommended-vue"
   ],
   "rules": {
     // For TailwindCSS @apply directive

buildchain/stylelint.config.js

@@ -5,7 +5,6 @@ import tailwindcss from "@tailwindcss/vite";
 import {visualizer} from 'rollup-plugin-visualizer';
 import viteCompressionPlugin from 'vite-plugin-compression';
 import {viteExternalsPlugin} from 'vite-plugin-externals';
-import viteRestartPlugin from 'vite-plugin-restart';
 import * as path from 'path';
 
 // https://vitejs.dev/config/
@@ -28,11 +27,6 @@ export default defineConfig(({command}) => ({
     sourcemap: true
   },
   plugins: [
-    viteRestartPlugin({
-      reload: [
-        '../src/templates/**/*',
-      ],
-    }),
     createVuePlugin(),
     viteExternalsPlugin({
       'vue': 'Vue',

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

composer.json

@@ -76,7 +76,7 @@ public static function resolve(mixed $source, array $arguments, mixed $context,
                 Retour::$plugin->statistics->incrementStatistics($uri, false, $siteId);
             }
         }
-        if ($redirect !== null && isset($redirect['redirectDestUrl'])) {
+        if ($redirect !== null && isset($redirect['redirectDestUrl']) && $redirect['redirectSrcMatch'] === 'pathonly') {
             $dest = $redirect['redirectDestUrl'];
             $path = $redirect['redirectDestUrl'];
             // Combine the URL and path together, merging them as appropriate

docs/package-lock.json

@@ -508,7 +508,7 @@ public function getStaticRedirect(string $fullUrl, string $pathOnly, $siteId, bo
             ->limit(1);
 
         if ($enabledOnly) {
-            $query->andWhere(['enabled' => 1]);
+            $query->andWhere(['enabled' => true]);
         }
         $result = $query->one();
         if ($result) {
@@ -1309,7 +1309,7 @@ protected function getRedirectsByMatchType(int $limit = null, int $siteId = null
         $query->andWhere(['redirectMatchType' => $type]);
 
         if ($enabledOnly) {
-            $query->andWhere(['enabled' => 1]);
+            $query->andWhere(['enabled' => true]);
         }
 
         return $query->all();