Merge branch 'stage' into MWPW-163785

adobecom · Jan 2, 2025 · 4ef9689 · 4ef9689
2 parents 735d422 + 99ca9d0
commit 4ef9689
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 39 deletions.
diff --git a/acrobat/blocks/unity/unity.js b/acrobat/blocks/unity/unity.js
@@ -94,16 +94,13 @@ export const localeMap = {
 };
 
 function getUnityLibs(prodLibs = '/unitylibs') {
-  const { hostname } = window.location;
-  if (!hostname.includes('hlx.page')
-    && !hostname.includes('hlx.live')
-    && !hostname.includes('localhost')) {
-    return prodLibs;
-  }
+  const { hostname, search } = window.location;
+  if (!/\.hlx\.|\.aem\.|local|stage/.test(hostname)) return prodLibs;
   // eslint-disable-next-line compat/compat
-  const branch = new URLSearchParams(window.location.search).get('unitylibs') || 'main';
-  if (branch.indexOf('--') > -1) return `https://${branch}.hlx.live/unitylibs`;
-  return `https://${branch}--unity--adobecom.hlx.live/unitylibs`;
+  const branch = new URLSearchParams(search).get('unitylibs') || 'main';
+  if (branch === 'main' && hostname === 'www.stage.adobe.com') return prodLibs;
+  const env = hostname.includes('.hlx.') ? 'hlx' : 'aem';
+  return `https://${branch}${branch.includes('--') ? '' : '--unity--adobecom'}.${env}.live/unitylibs`;
 }
 
 export default async function init(el) {

diff --git a/acrobat/scripts/contentSecurityPolicy/dev.js b/acrobat/scripts/contentSecurityPolicy/dev.js
@@ -210,7 +210,7 @@ const scriptSrc = [
   '*.aem.page',
   '*.aem.live',
   'tr.snapchat.com',
-  '\'sha256-XZLMiKjK7kZsMSJR/aV6U3pMxjqlvU6v3tJSIimxjHs=\'',
+  '\'sha256-nAigApwVAFaAG381OAPIUWINK3JzGgUcb2TZvwX6MK8=\'',
   ';',
 ];
 

diff --git a/acrobat/scripts/contentSecurityPolicy/prod.js b/acrobat/scripts/contentSecurityPolicy/prod.js
@@ -255,7 +255,7 @@ const scriptSrc = [
   'rum.hlx.page',
   'tr.snapchat.com',
   'api.demandbase.com/api/v3',
-  '\'sha256-XZLMiKjK7kZsMSJR/aV6U3pMxjqlvU6v3tJSIimxjHs=\'',
+  '\'sha256-nAigApwVAFaAG381OAPIUWINK3JzGgUcb2TZvwX6MK8=\'',
   ';',
 ];
 

diff --git a/acrobat/scripts/contentSecurityPolicy/stage.js b/acrobat/scripts/contentSecurityPolicy/stage.js
@@ -260,7 +260,7 @@ const scriptSrc = [
   's.yimg.jp',
   'yjtag.yahoo.co.jp',
   'tr.snapchat.com',
-  '\'sha256-XZLMiKjK7kZsMSJR/aV6U3pMxjqlvU6v3tJSIimxjHs=\'',
+  '\'sha256-nAigApwVAFaAG381OAPIUWINK3JzGgUcb2TZvwX6MK8=\'',
   ';',
 ];
 

diff --git a/acrobat/scripts/scripts.js b/acrobat/scripts/scripts.js
@@ -21,14 +21,15 @@ document.querySelectorAll('a').forEach((p, idx) => {
 /**
  * The decision engine for where to get Milo's libs from.
  */
-const setLibs = (prodLibs, location) => {
-  const { hostname, search } = location || window.location;
+const setLibs = (prodLibs, location = window.location) => {
+  const { hostname, search } = location;
+  if (!/\.hlx\.|\.aem\.|local|stage/.test(hostname)) return prodLibs;
   // eslint-disable-next-line compat/compat
   const branch = new URLSearchParams(search).get('milolibs') || 'main';
-  if (branch === 'main' && hostname === 'www.stage.adobe.com') return 'https://www.stage.adobe.com/libs';
-  if (!(hostname.includes('.hlx.') || hostname.includes('local') || hostname.includes('stage'))) return prodLibs;
+  if (branch === 'main' && hostname === 'www.stage.adobe.com') return '/libs';
   if (branch === 'local') return 'http://localhost:6456/libs';
-  return branch.includes('--') ? `https://${branch}.hlx.live/libs` : `https://${branch}--milo--adobecom.hlx.live/libs`;
+  const env = hostname.includes('.hlx.') ? 'hlx' : 'aem';
+  return `https://${branch}${branch.includes('--') ? '' : '--milo--adobecom'}.${env}.live/libs`;
 };
 
 const getLocale = (locales, pathname = window.location.pathname) => {

diff --git a/acrobat/scripts/utils.js b/acrobat/scripts/utils.js
@@ -25,28 +25,29 @@ export const [setLibs, getLibs] = (() => {
     (prodLibs, location) => {
       libs = (() => {
         const { hostname, search } = location || window.location;
+        if (!/\.hlx\.|\.aem\.|local|stage/.test(hostname)) return prodLibs;
         // eslint-disable-next-line compat/compat
         const branch = new URLSearchParams(search).get('milolibs') || 'main';
         if (branch === 'main' && hostname === 'www.stage.adobe.com') return '/libs';
-        if (!(hostname.includes('.hlx.') || hostname.includes('local') || hostname.includes('stage'))) return prodLibs;
         if (branch === 'local') return 'http://localhost:6456/libs';
-        return branch.includes('--') ? `https://${branch}.hlx.live/libs` : `https://${branch}--milo--adobecom.hlx.live/libs`;
+        const env = hostname.includes('.hlx.') ? 'hlx' : 'aem';
+        return `https://${branch}${branch.includes('--') ? '' : '--milo--adobecom'}.${env}.live/libs`;
       })();
       return libs;
     }, () => libs,
   ];
 })();
 
 export function getEnv() {
-  const prodHosts = ['www.adobe.com', 'sign.ing', 'edit.ing'];
-  const stageHosts = [
+  const { hostname } = window.location;
+  if (['www.adobe.com', 'sign.ing', 'edit.ing'].includes(hostname)) return 'prod';
+  if ([
     'stage--dc--adobecom.hlx.page', 'main--dc--adobecom.hlx.page',
     'stage--dc--adobecom.hlx.live', 'main--dc--adobecom.hlx.live',
+    'stage--dc--adobecom.aem.page', 'main--dc--adobecom.aem.page',
+    'stage--dc--adobecom.aem.live', 'main--dc--adobecom.aem.live',
     'www.stage.adobe.com',
-  ];
-
-  if (prodHosts.includes(window.location.hostname)) return 'prod';
-  if (stageHosts.includes(window.location.hostname)) return 'stage';
+  ].includes(hostname)) return 'stage';
   return 'dev';
 }
 

diff --git a/head.html b/head.html
@@ -7,20 +7,21 @@
 <script>
   window.setLibs = (prodLibs, location = window.location) => {
     const { hostname, search } = location;
+    if (!/\.hlx\.|\.aem\.|local|stage/.test(hostname)) return prodLibs;
     const branch = new URLSearchParams(search).get('milolibs') || 'main';
-    if (branch === 'main' && hostname === 'www.stage.adobe.com') return 'https://www.stage.adobe.com/libs';
-    if (!/(\.hlx\.|local|stage)/.test(hostname)) return prodLibs;
+    if (branch === 'main' && hostname === 'www.stage.adobe.com') return '/libs';
     if (branch === 'local') return 'http://localhost:6456/libs';
-    return branch.includes('--') ? `https://${branch}.hlx.live/libs` : `https://${branch}--milo--adobecom.hlx.live/libs`;
+    const env = hostname.includes('.hlx.') ? 'hlx' : 'aem';
+    return `https://${branch}${branch.includes('--') ? '' : '--milo--adobecom'}.${env}.live/libs`;
   };
-  
+
   window.getUnityLibs = (prodLibs = '/unitylibs') => {
     const { hostname, search } = window.location;
-    if (!hostname.includes('hlx.page') && !hostname.includes('hlx.live') && !hostname.includes('localhost')) {
-      return prodLibs;
-    }
+    if (!/\.hlx\.|\.aem\.|local|stage/.test(hostname)) return prodLibs;
     const branch = new URLSearchParams(search).get('unitylibs') || 'main';
-    return branch.includes('--') ? `https://${branch}.hlx.live/unitylibs` : `https://${branch}--unity--adobecom.hlx.live/unitylibs`;
+    if (branch === 'main' && hostname === 'www.stage.adobe.com') return prodLibs;
+    const env = hostname.includes('.hlx.') ? 'hlx' : 'aem';
+    return `https://${branch}${branch.includes('--')? '' : '--unity--adobecom'}.${env}.live/unitylibs`;
   }
 
   window.loadLink = (href, options = {}) => {

diff --git a/test/scripts/utils.test.js b/test/scripts/utils.test.js
@@ -1,10 +1,15 @@
-import { setLibs, getLibs } from '../../acrobat/scripts/utils';
-import * as sinon from 'sinon';
+/* eslint-disable compat/compat */
 import { expect } from '@esm-bundle/chai';
+import { setLibs } from '../../acrobat/scripts/utils.js';
 
-describe('Test utils.js', async () => {
-  it('tests setLibs', async () => {
-    const libs = setLibs('/lib');
-    expect(libs).to.equal('https://main--milo--adobecom.hlx.live/libs');
+describe('Test utils.js', () => {
+  it('tests setLibs with hlx domain', () => {
+    const libs = setLibs('/lib', new URL('https://stage--dc--adobecom.hlx.live?milolibs=test'));
+    expect(libs).to.equal('https://test--milo--adobecom.hlx.live/libs');
+  });
+
+  it('tests setLibs with aem domain', () => {
+    const libs = setLibs('/lib', new URL('https://stage--dc--adobecom.aem.live?milolibs=test'));
+    expect(libs).to.equal('https://test--milo--adobecom.aem.live/libs');
   });
 });