feat: use aem page (#494)

Author: tripodsan

.github/workflows/release.yaml

@@ -2,7 +2,7 @@ name: Semantic Release
 on:
   push:
     branches:
-      - 'main'
+      - main
 
 jobs:
   build:

src/steps/utils.js

@@ -12,9 +12,9 @@
 
 const AZURE_BLOB_REGEXP = /^https:\/\/hlx\.blob\.core\.windows\.net\/external\//;
 
-const MEDIA_BLOB_REGEXP = /^https:\/\/.*\.hlx3?\.(live|page)\/media_.*/;
+const MEDIA_BLOB_REGEXP = /^https:\/\/.*\.(aem|hlx3?)\.(live|page)\/media_.*/;
 
-const HELIX_URL_REGEXP = /^https:\/\/(?!admin\.|www\.)[^.]+\.hlx3?\.(live|page)\/?.*/;
+const HELIX_URL_REGEXP = /^https:\/\/(?!admin\.|www\.)[^.]+\.(aem|hlx3?)\.(live|page)\/?.*/;
 
 /**
  * Returns the original host name from the request to the outer CDN.

src/utils/auth.js

@@ -24,7 +24,7 @@ import idpMicrosoft from './idp-configs/microsoft.js';
 // eslint-disable-next-line import/no-unresolved
 import cryptoImpl from '#crypto';
 
-const AUTH_REDIRECT_URL = 'https://login.hlx.page/.auth';
+const AUTH_REDIRECT_URL = 'https://login.aem.page/.auth';
 
 let ADMIN_KEY_PAIR = null;
 

test/steps/utils.test.js

@@ -113,6 +113,8 @@ describe('Rewrite URLs test', () => {
     assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.hlx.live/media_1234.png'), './media_1234.png');
     assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.hlx.page/media_1234.png'), './media_1234.png');
     assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.hlx3.page/media_1234.png'), './media_1234.png');
+    assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.aem.page/media_1234.png'), './media_1234.png');
+    assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.aem.live/media_1234.png'), './media_1234.png');
   });
 
   it('replaces an helix url', () => {
@@ -133,15 +135,18 @@ describe('Rewrite URLs test', () => {
   });
 
   it('replaces an helix url with fragments', () => {
+    assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.aem.page/blog/article#heading'), '/blog/article#heading');
     assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.hlx.page/blog/article#heading'), '/blog/article#heading');
     assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.hlx.live/blog/article#heading'), '/blog/article#heading');
+    assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.aem.live/blog/article#heading'), '/blog/article#heading');
     assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.hlx3.page/blog/article#heading'), '/blog/article#heading');
     assert.strictEqual(rewriteUrl({}, 'https://main--pages--adobe.hlx3.page/blog/article?a=42#heading'), '/blog/article?a=42#heading');
     assert.strictEqual(rewriteUrl({}, 'https://mwpw-118214--express-website--adobe.hlx.page/express/experiments/ccx0074/test#how-to-make-flyers'), '/express/experiments/ccx0074/test#how-to-make-flyers');
   });
 
   it('keeps helix urls for www and admin in place', () => {
     assert.strictEqual(rewriteUrl({}, 'https://www.hlx.page/docs'), 'https://www.hlx.page/docs');
+    assert.strictEqual(rewriteUrl({}, 'https://www.aem.live/docs'), 'https://www.aem.live/docs');
     assert.strictEqual(rewriteUrl({}, 'https://admin.hlx.live/api'), 'https://admin.hlx.live/api');
   });
 

test/utils/auth.test.js

@@ -306,7 +306,7 @@ describe('Auth Test', () => {
     assert.deepStrictEqual(sp, {
       client_id: 'dummy-clientid',
       prompt: 'select_account',
-      redirect_uri: 'https://login.hlx.page/.auth',
+      redirect_uri: 'https://login.aem.page/.auth',
       response_type: 'code',
       scope: 'openid profile email',
       state: {
@@ -437,7 +437,7 @@ describe('AuthInfo tests', () => {
     assert.deepStrictEqual(sp, {
       client_id: 'dummy-clientid',
       prompt: 'select_account',
-      redirect_uri: 'https://login.hlx.page/.auth',
+      redirect_uri: 'https://login.aem.page/.auth',
       response_type: 'code',
       scope: 'openid profile email',
       state: {