Merge branch 'release/5.1.5' into v5

CHANGELOG.md

@@ -1,5 +1,10 @@
 # SEOmatic Changelog
 
+## 5.1.5 - 2024.10.21
+### Fixed
+* Fixed `togImageField` field typo in the FeedMe integration ([#1520](https://github.com/nystudio107/craft-seomatic/issues/1520))
+* Fixed a field mapping issue for fields in the FeedMe integration ([#1520](https://github.com/nystudio107/craft-seomatic/issues/1520))
+
 ## 5.1.4 - 2024.09.29
 ### Fixed
 * Normalize the incoming `url` and `path` so that `mergUrlWithPath()` handles edge-cases properly ([#1512](https://github.com/nystudio107/craft-seomatic/issues/1512))

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:

README.md

@@ -37,7 +37,7 @@ To install SEOmatic, follow these steps:
 
 You can also install SEOmatic via the **Plugin Store** in the Craft Control Panel.
 
-SEOmatic works on Craft 4.x.
+SEOmatic works on Craft 5.x.
 
 ## Documentation
 

composer.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-seomatic",
   "description": "SEOmatic facilitates modern SEO best practices & implementation for Craft CMS 5. It is a turnkey SEO system that is comprehensive, powerful, and flexible.",
   "type": "craft-plugin",
-  "version": "5.1.4",
+  "version": "5.1.5",
   "minimum-stability": "dev",
   "prefer-stable": true,
   "keywords": [

src/templates/_includes/integrations/feedme/seo-settings.twig

@@ -66,36 +66,6 @@ fields[seoMeta][metaGlobalVars][canonicalUrl]
             label: 'SEO Keywords',
             handle: 'seoKeywords',
         },
-        {
-            label: 'SEO Image Source',
-            handle: 'seoImageSource',
-            default: {
-            type: 'select',
-            options: [
-                {
-                    label: 'From Asset Field',
-                    value: 'fromField',
-                },
-                {
-                    label: 'Custom Image',
-                    value: 'fromAsset',
-                },
-                {
-                    label: 'Custom URL',
-                    value: 'fromUrl',
-                },
-            ],
-        },
-        },
-        {
-            label: 'SEO Asset Field',
-            handle: 'seoImageField',
-        },
-        {
-            label: 'SEO Custom Image',
-            handle: 'seoImageIds',
-            type: 'assets',
-        },
         {
             label: 'SEO Custom URL',
             handle: 'seoImage',
@@ -158,8 +128,37 @@ fields[seoMeta][metaGlobalVars][canonicalUrl]
             handle: 'twitterDescription',
         },
         {
-            label: 'X (Twitter) Image Source',
-            handle: 'twitterImageSource',
+            label: 'X (Twitter) Custom URL',
+            handle: 'twitterImage',
+        },
+        {
+            label: 'X (Twitter) Image Description',
+            handle: 'twitterImageDescription',
+        },
+        {
+            label: 'Facebook Title',
+            handle: 'ogTitle',
+        },
+        {
+            label: 'Facebook Description',
+            handle: 'ogDescription',
+        },
+        {
+            label: 'Facebook Custom URL',
+            handle: 'ogImage',
+        },
+        {
+            label: 'Facebook Image Description',
+            handle: 'ogImageDescription',
+        },
+    ],
+}, {
+    label: 'General Settings',
+    handle: 'metaBundleSettings',
+    fields: [
+        {
+            label: 'SEO Image Source',
+            handle: 'seoImageSource',
             default: {
             type: 'select',
             options: [
@@ -179,30 +178,14 @@ fields[seoMeta][metaGlobalVars][canonicalUrl]
         },
         },
         {
-            label: 'X (Twitter) Asset Field',
-            handle: 'twitterImageField',
+            label: 'SEO Asset Field',
+            handle: 'seoImageField',
         },
         {
-            label: 'X (Twitter) Custom Image',
-            handle: 'twitterImageIds',
+            label: 'SEO Custom Image',
+            handle: 'seoImageIds',
             type: 'assets',
         },
-        {
-            label: 'X (Twitter) Custom URL',
-            handle: 'twitterImage',
-        },
-        {
-            label: 'X (Twitter) Image Description',
-            handle: 'twitterImageDescription',
-        },
-        {
-            label: 'Facebook Title',
-            handle: 'ogTitle',
-        },
-        {
-            label: 'Facebook Description',
-            handle: 'ogDescription',
-        },
         {
             label: 'Facebook Image Source',
             handle: 'ogImageSource',
@@ -226,20 +209,42 @@ fields[seoMeta][metaGlobalVars][canonicalUrl]
         },
         {
             label: 'Facebook Asset Field',
-            handle: 'togImageField',
+            handle: 'ogImageField',
         },
         {
             label: 'Facebook Custom Image',
             handle: 'ogImageIds',
             type: 'assets',
         },
         {
-            label: 'Facebook Custom URL',
-            handle: 'ogImage',
+            label: 'X (Twitter) Image Source',
+            handle: 'twitterImageSource',
+            default: {
+            type: 'select',
+            options: [
+                {
+                    label: 'From Asset Field',
+                    value: 'fromField',
+                },
+                {
+                    label: 'Custom Image',
+                    value: 'fromAsset',
+                },
+                {
+                    label: 'Custom URL',
+                    value: 'fromUrl',
+                },
+            ],
+        },
         },
         {
-            label: 'Facebook Image Description',
-            handle: 'ogImageDescription',
+            label: 'X (Twitter) Asset Field',
+            handle: 'twitterImageField',
+        },
+        {
+            label: 'X (Twitter) Custom Image',
+            handle: 'twitterImageIds',
+            type: 'assets',
         },
     ],
 }, {

src/web/assets/dist/manifest.json

@@ -16,7 +16,7 @@
     ]
   },
   "src/js/dashboard.js": {
-    "file": "assets/dashboard-Br4rtrbC.js",
+    "file": "assets/dashboard-DdsPmLgD.js",
     "name": "dashboard",
     "src": "src/js/dashboard.js",
     "isEntry": true,