Merge branch 'develop' into feature/handle-single-and-archive-same-route

10up · Aug 9, 2023 · 90a5794 · 90a5794
2 parents 857878d + c58d618
commit 90a5794
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 24 deletions.
diff --git a/.changeset/curly-apricots-stare.md b/.changeset/curly-apricots-stare.md
@@ -0,0 +1,5 @@
+---
+"@headstartwp/next": patch
+---
+
+Fix: only convertUrls if url starts with sourceUrl
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -15,8 +15,10 @@
   },
   "changesets": [
     "bright-jokes-learn",
+    "curly-apricots-stare",
     "lovely-chicken-sparkle",
     "mighty-stingrays-pay",
+    "silent-kiwis-compare",
     "two-cats-vanish"
   ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @headstartwp/core
 
+## 1.1.0-next.1
+
+### Patch Changes
+
+- 1494a332: Further Optimize next.js props by removing yoast seo bloat.
+
 ## 1.1.0-next.0
 
 ### Minor Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@headstartwp/core",
-  "version": "1.1.0-next.0",
+  "version": "1.1.0-next.1",
   "description": "`@headstartwp/core` is the core package that houses framework-agnostic components and utilities for building headless sites with WordPress.",
   "homepage": "https://github.com/10up/headstartwp/blob/develop/packages/core/README.md",
   "license": "MIT",

diff --git a/packages/next/CHANGELOG.md b/packages/next/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @headstartwp/next
 
+## 1.1.0-next.1
+
+### Patch Changes
+
+- 232f4e68: Fix: only convertUrls if url starts with sourceUrl
+- 1494a332: Further Optimize next.js props by removing yoast seo bloat.
+- Updated dependencies [1494a332]
+  - @headstartwp/core@1.1.0-next.1
+
 ## 1.1.0-next.0
 
 ### Minor Changes

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@headstartwp/next",
-  "version": "1.1.0-next.0",
+  "version": "1.1.0-next.1",
   "description": "`@headstartwp/next` is the Next.js bindings for the headless framework.",
   "homepage": "https://github.com/10up/headstartwp/blob/develop/packages/next/README.md",
   "license": "MIT",
@@ -48,8 +48,8 @@
     "lint": "eslint src"
   },
   "dependencies": {
-    "@headstartwp/core": "^1.1.0-next.0",
     "deepmerge": "^4.3.1",
+    "@headstartwp/core": "^1.1.0-next.1",
     "modify-source-webpack-plugin": "^4.1.0",
     "loader-utils": "^3.2.0",
     "schema-utils": "^4.0.0"

diff --git a/packages/next/src/components/Yoast.tsx b/packages/next/src/components/Yoast.tsx
@@ -12,8 +12,15 @@ import {
 import { useSettings } from '@headstartwp/core/react';
 import Head from 'next/head';
 
-function convertUrl(url: string, hostUrl: string, sourceUrl: string) {
-	return `${hostUrl}${removeSourceUrl({ link: url, backendUrl: sourceUrl })}`;
+export function convertUrl(url: string, hostUrl: string, sourceUrl: string) {
+	if (!url.startsWith(sourceUrl)) {
+		return url;
+	}
+
+	return `${hostUrl}${removeSourceUrl({
+		link: url.replace(/\/?$/, '/'),
+		backendUrl: sourceUrl,
+	})}`;
 }
 
 type Props = {

diff --git a/packages/next/src/components/__tests__/Yoast.tsx b/packages/next/src/components/__tests__/Yoast.tsx
@@ -0,0 +1,25 @@
+import { convertUrl } from '../Yoast';
+
+describe('convertUrl', () => {
+	it('root works without trailing slash', () => {
+		expect(
+			convertUrl('https://test.com/test', 'https://test.test.com', 'https://test.com/test'),
+		).toBe('https://test.test.com/');
+	});
+
+	it('root works with trailing slash', () => {
+		expect(
+			convertUrl('https://test.com/test/', 'https://test.test.com', 'https://test.com/test'),
+		).toBe('https://test.test.com/');
+	});
+
+	it('external url returns external url', () => {
+		expect(
+			convertUrl(
+				'https://external.com/test',
+				'https://test.test.com',
+				'https://test.com/test',
+			),
+		).toBe('https://external.com/test');
+	});
+});
diff --git a/projects/wp-multisite-i18n-nextjs/package.json b/projects/wp-multisite-i18n-nextjs/package.json
@@ -14,8 +14,8 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@headstartwp/core": "^1.1.0-next.0",
-    "@headstartwp/next": "^1.1.0-next.0",
+    "@headstartwp/core": "^1.1.0-next.1",
+    "@headstartwp/next": "^1.1.0-next.1",
     "@linaria/babel-preset": "^4.4.5",
     "@linaria/core": "^4.2.10",
     "@linaria/react": "^4.3.8",

diff --git a/projects/wp-multisite-nextjs/package.json b/projects/wp-multisite-nextjs/package.json
@@ -14,8 +14,8 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@headstartwp/core": "^1.1.0-next.0",
-    "@headstartwp/next": "^1.1.0-next.0",
+    "@headstartwp/core": "^1.1.0-next.1",
+    "@headstartwp/next": "^1.1.0-next.1",
     "@linaria/babel-preset": "^4.4.5",
     "@linaria/core": "^4.2.10",
     "@linaria/react": "^4.3.8",

diff --git a/projects/wp-nextjs-ts/package.json b/projects/wp-nextjs-ts/package.json
@@ -14,8 +14,8 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@headstartwp/core": "^1.1.0-next.0",
-    "@headstartwp/next": "^1.1.0-next.0",
+    "@headstartwp/core": "^1.1.0-next.1",
+    "@headstartwp/next": "^1.1.0-next.1",
     "@linaria/babel-preset": "^4.4.5",
     "@linaria/core": "^4.2.10",
     "@linaria/react": "^4.3.8",

diff --git a/projects/wp-nextjs/package.json b/projects/wp-nextjs/package.json
@@ -14,8 +14,8 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@headstartwp/core": "^1.1.0-next.0",
-    "@headstartwp/next": "^1.1.0-next.0",
+    "@headstartwp/core": "^1.1.0-next.1",
+    "@headstartwp/next": "^1.1.0-next.1",
     "@10up/next-redis-cache-provider": "^0.1.5",
     "@linaria/babel-preset": "^4.4.5",
     "@linaria/core": "^4.2.10",