Merge branch 'develop' into feature/preview-redirect-post-link

10up · Mar 6, 2024 · de5c030 · de5c030
2 parents 9e05f44 + 3f1b4f7
commit de5c030
Show file tree

Hide file tree

Showing 16 changed files with 733 additions and 87 deletions.
diff --git a/.changeset/fuzzy-kiwis-decide.md b/.changeset/fuzzy-kiwis-decide.md
@@ -0,0 +1,5 @@
+---
+"@headstartwp/headstartwp": patch
+---
+
+fix: hreflangs tags on multilingual sites
diff --git a/packages/next/src/components/Yoast.tsx b/packages/next/src/components/Yoast.tsx
@@ -77,6 +77,10 @@ export function Yoast({ seo, useHtml = false }: Props) {
 						props.href = convertUrl(props.href, hostUrl, sourceUrl);
 					}
 
+					if (props.rel === 'alternate') {
+						props.href = convertUrl(props.href, hostUrl, sourceUrl);
+					}
+
 					if (props.property === 'og:url') {
 						props.content = convertUrl(props.content, hostUrl, sourceUrl);
 					}

diff --git a/projects/wp-nextjs/.env b/projects/wp-nextjs/.env
@@ -1,2 +1,2 @@
 NEXT_PUBLIC_HEADLESS_WP_URL=https://js1.10up.com
-HOST_URL=https://js1.10up.com
+NEXT_PUBLIC_HOST_URL=https://js1.10up.com
diff --git a/projects/wp-nextjs/.env.development b/projects/wp-nextjs/.env.development
@@ -1,5 +1,5 @@
 NEXT_PUBLIC_HEADLESS_WP_URL=http://localhost:8888
-HOST_URL=http://localhost:3000
+NEXT_PUBLIC_HOST_URL=http://localhost:3000
 ENABLE_POLYLANG_INTEGRATION=false
 ENABLE_REQUEST_DEBUG=true
 ENABLE_REDIRECT_DEBUG=true

diff --git a/projects/wp-nextjs/headstartwp.config.js b/projects/wp-nextjs/headstartwp.config.js
@@ -8,7 +8,7 @@ module.exports = {
 	 * The WordPress Source Url
 	 */
 	sourceUrl: process.env.NEXT_PUBLIC_HEADLESS_WP_URL,
-	hostUrl: process.env.HOST_URL,
+	hostUrl: process.env.NEXT_PUBLIC_HOST_URL,
 	customPostTypes: [
 		// this is just an example
 		{
@@ -43,7 +43,7 @@ module.exports = {
 			enable: true,
 		},
 		polylang: {
-			enable: process.env?.ENABLE_POLYLANG_INTEGRATION === 'true',
+			enable: process?.env?.NEXT_PUBLIC_ENABLE_POLYLANG_INTEGRATION === 'true',
 		},
 	},
 

diff --git a/projects/wp-nextjs/next.config.js b/projects/wp-nextjs/next.config.js
@@ -14,10 +14,9 @@ const nextConfig = {
 		ignoreDuringBuilds: true,
 	},
 };
-
 // if you are not using polylang integration you can remove this code
 // if you are replace the locales with the ones you are using
-if (process.env?.ENABLE_POLYLANG_INTEGRATION === 'true') {
+if (process.env?.NEXT_PUBLIC_ENABLE_POLYLANG_INTEGRATION === 'true') {
 	nextConfig.i18n = {
 		locales: ['en', 'pt'],
 		defaultLocale: 'en',

diff --git a/wp/headless-wp/.wp-env.json b/wp/headless-wp/.wp-env.json
@@ -4,5 +4,16 @@
     "../local-plugin",
     "https://downloads.wordpress.org/plugin/wordpress-seo.22.1.zip",
     "https://downloads.wordpress.org/plugin/safe-redirect-manager.2.1.1.zip"
-  ]
+  ],
+  "env": {
+    "tests": {
+        "plugins": [
+          ".",
+          "../local-plugin",
+          "https://downloads.wordpress.org/plugin/wordpress-seo.22.1.zip",
+          "https://downloads.wordpress.org/plugin/safe-redirect-manager.2.1.1.zip",
+          "https://downloads.wordpress.org/plugin/polylang.3.5.4.zip"
+        ]
+    }
+}
 }
diff --git a/wp/headless-wp/composer.json b/wp/headless-wp/composer.json
@@ -25,6 +25,14 @@
           "reference": "trunk"
         }
       }
+    },
+    {
+      "type": "composer",
+      "url": "https://wpackagist.org",
+      "only": [
+        "wpackagist-plugin/*",
+        "wpackagist-theme/*"
+      ]
     }
   ],
   "require-dev": {
@@ -56,7 +64,9 @@
   },
   "extra": {
     "installer-paths": {
-        "vendor/{$name}/": ["type:wordpress-plugin"]
+      "vendor/{$name}/": [
+        "type:wordpress-plugin"
+      ]
     }
   }
 }