Merge branch 'release/5.0.0-beta.3' into v5

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Retour Changelog
 
+## 5.0.0-beta.3 - 2024.02.09
+### Added
+* Added a custom Field icon
+
+### Fixed
+* Added  the unused `static` to the Tailwind CSS `blocklist` to avoid a name collision with a Craft CSS class ([#1412](https://github.com/nystudio107/craft-seomatic/issues/1412))
+
 ## 5.0.0-beta.2 - 2024.02.05
 ### Added
 * Add `phpstan` and `ecs` code linting

buildchain/tailwind.config.ts

@@ -4,6 +4,9 @@ export default {
     '../src/templates/**/*.{twig,html}',
     './src/vue/**/*.{vue,html}',
   ],
+  blocklist: [
+    'static',
+  ],
   theme: {},
   plugins: [],
 };

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": "5.0.0-beta.1",
+  "version": "5.0.0-beta.3",
   "keywords": [
     "craftcms",
     "craft-plugin",
@@ -27,7 +27,7 @@
   },
   "require": {
     "php": "^8.0.2",
-    "craftcms/cms": "^5.0.0-alpha.1",
+    "craftcms/cms": "^5.0.0-beta.1",
     "nystudio107/craft-plugin-vite": "^5.0.0-beta.1",
     "league/csv": "^8.2 || ^9.0",
     "jean85/pretty-package-versions": "^1.5 || ^2.0"
@@ -40,7 +40,8 @@
   "scripts": {
     "phpstan": "phpstan --ansi --memory-limit=1G",
     "check-cs": "ecs check --ansi",
-    "fix-cs": "ecs check --fix --ansi"
+    "fix-cs": "ecs check --fix --ansi",
+    "test": "codecept run unit --coverage-xml"
   },
   "config": {
     "allow-plugins": {

phpstan.neon

@@ -1,5 +1,5 @@
 includes:
-    - vendor/craftcms/phpstan/phpstan.neon
+    - %currentWorkingDirectory%/vendor/craftcms/phpstan/phpstan.neon
 
 parameters:
     level: 5

src/fields/ShortLink.php

@@ -10,7 +10,6 @@
 namespace nystudio107\retour\fields;
 
 use Craft;
-use craft\base\Element;
 use craft\base\ElementInterface;
 use craft\base\Field;
 use craft\base\PreviewableFieldInterface;
@@ -29,11 +28,10 @@
  */
 class ShortLink extends Field implements PreviewableFieldInterface
 {
+    protected static bool $allowShortLinkUpdates = true;
     public string $redirectSrcMatch = 'pathonly';
     public int $redirectHttpCode = 301;
 
-    protected static bool $allowShortLinkUpdates = true;
-
     // Static Methods
     // =========================================================================
 
@@ -45,6 +43,14 @@ public static function displayName(): string
         return Craft::t('retour', 'Short Link');
     }
 
+    /**
+     * @inheritdoc
+     */
+    public static function icon(): string
+    {
+        return '@nystudio107/retour/icon-mask.svg';
+    }
+
     /**
      * Prevent element updates from updating the short link redirects.
      */

src/web/assets/dist/manifest.json

@@ -57,9 +57,9 @@
   },
   "src/js/Retour.js": {
     "css": [
-      "assets/retour-axBeLE34.css"
+      "assets/retour-0lLzocvu.css"
     ],
-    "file": "assets/retour-GsbkZ0RI.js",
+    "file": "assets/retour-mao8V0mm.js",
     "isEntry": true,
     "src": "src/js/Retour.js"
   },