Make compatible with Helix 5 aem.page/live URLs (#89)

adaptto · Apr 16, 2024 · 184ee6e · 184ee6e
1 parent 11db31f
commit 184ee6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scripts/services/Link.js b/scripts/services/Link.js
@@ -1,5 +1,5 @@
-const adaptToSiteUrlRegex = /^https?:\/\/([^/.]+--adaptto-website--adaptto.hlx.(page|live)|adapt.to|franklin.adaptto.de|localhost:\d+)(\/.+)$/;
-const adaptToSiteUrlPathnameGroup = 3;
+const adaptToSiteUrlRegex = /^https?:\/\/([^/.]+--adaptto-website--adaptto.(hlx|aem).(page|live)|adapt.to|localhost:\d+)(\/.+)$/;
+const adaptToSiteUrlPathnameGroup = 4;
 const downloadUrlRegex = /^.+\.(pdf|zip)$/;
 
 /**

diff --git a/test/scripts/services/LinkHandler.test.js b/test/scripts/services/LinkHandler.test.js
@@ -9,6 +9,7 @@ describe('services/LinkHandler', () => {
   it('rewriteUrl', () => {
     expect(rewriteUrl('https://adapt.to/mypath')).to.eq('/mypath');
     expect(rewriteUrl('https://experimental-download-links--adaptto-website--adaptto.hlx.page/2021/schedule')).to.eq('/2021/schedule');
+    expect(rewriteUrl('https://experimental-download-links--adaptto-website--adaptto.aem.page/2021/schedule')).to.eq('/2021/schedule');
     expect(rewriteUrl('https://main--adaptto-website--adaptto.hlx.live/2021/schedule#day1')).to.eq('/2021/schedule#day1');
     expect(rewriteUrl('https://localhost:2000/2021/schedule#day1')).to.eq('/2021/schedule#day1');
     expect(rewriteUrl('https://my.host.com/mypath')).to.eq('https://my.host.com/mypath');