Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DC on hlx5 #917

Open
wants to merge 2 commits into
base: stage
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/scripts/query_metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ async function main() {
filename = filename.replace(/^\/+/, '');

const queryIndexUrl =
`https://main--dc--adobecom.hlx.live/${filename}`;
`https://main--dc--adobecom.aem.live/${filename}`;
const urls = await queryIndex(queryIndexUrl);

fs.writeFileSync(outputJson, JSON.stringify(urls, null, 2));
Expand Down Expand Up @@ -91,4 +91,4 @@ async function main() {
fs.writeFileSync(`diff_${filename}`, JSON.stringify(diff, null, 2));
}

main();
main();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <object-curly-spacing> reported by reviewdog 🐶
A space is required after '{'.

import {createTag} from "../../scripts/miloUtils.js";

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <object-curly-spacing> reported by reviewdog 🐶
A space is required before '}'.

import {createTag} from "../../scripts/miloUtils.js";

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quotes> reported by reviewdog 🐶
Strings must use singlequote.

import {createTag} from "../../scripts/miloUtils.js";

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'br' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ca' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ca_fr' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'mx' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'la' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'africa' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'za' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'be_nl' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'be_fr' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'be_en' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'cz' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'cy_en' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'dk' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'de' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ee' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'es' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'fr' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'gr_en' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'gr_el' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ie' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'il_en' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'il_he' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'it' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'lv' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'lt' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'lu_de' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'lu_en' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'lu_fr' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'hu' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'mt' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'mena_en' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'mena_ar' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'nl' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'no' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'at' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'pl' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'pt' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ro' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ch_de' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'si' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'sk' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ch_fr' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'fi' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'se' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ch_it' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'tr' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'uk' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'bg' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ru' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'ua' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'au' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'hk_en' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'in' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'in_hi' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'nz' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'hk_zh' found.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <quote-props> reported by reviewdog 🐶
Unnecessarily quoted property 'tw' found.

Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ export default function init(element) {
ENV = 'prod';
}

if (window.location.hostname === 'stage--dc--adobecom.hlx.page'
|| window.location.hostname === 'main--dc--adobecom.hlx.page'
|| window.location.hostname === 'stage--dc--adobecom.hlx.live'
|| window.location.hostname === 'main--dc--adobecom.hlx.live'
if (window.location.hostname === 'stage--dc--adobecom.aem.page'
|| window.location.hostname === 'main--dc--adobecom.aem.page'
|| window.location.hostname === 'stage--dc--adobecom.aem.live'
|| window.location.hostname === 'main--dc--adobecom.aem.live'
|| window.location.hostname === 'www.stage.adobe.com') {
WIDGET_ENV = `https://stage.acrobat.adobe.com/dc-hosted/${STG_DC_WIDGET_VERSION}/dc-app-launcher.js`;
DC_DOMAIN = 'https://stage.acrobat.adobe.com';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <no-unused-vars> reported by reviewdog 🐶
'DC_DOMAIN' is assigned a value but never used.

Expand Down Expand Up @@ -227,7 +227,7 @@ export default function init(element) {
// Redirect
const fallBack = 'https://www.adobe.com/go/acrobat-overview';
const redDir = () => {
if (window.location.hostname != 'main--dc--adobecom.hlx.live'
if (window.location.hostname != 'main--dc--adobecom.aem.live'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <eqeqeq> reported by reviewdog 🐶
Expected '!==' and instead saw '!='.

&& window.location.hostname != 'www.adobe.com' ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <eqeqeq> reported by reviewdog 🐶
Expected '!==' and instead saw '!='.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <space-in-parens> reported by reviewdog 🐶
There should be no space before this paren.

Suggested change
&& window.location.hostname != 'www.adobe.com' ) {
&& window.location.hostname != 'www.adobe.com') {

window.location = `https://www.adobe.com/go/acrobat-${verbRedirMap[VERB] || VERB.split('-').join('')}-${ENV}`|| REDIRECT_URL;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 [eslint] <space-infix-ops> reported by reviewdog 🐶
Operator '||' must be spaced.

Suggested change
window.location = `https://www.adobe.com/go/acrobat-${verbRedirMap[VERB] || VERB.split('-').join('')}-${ENV}`|| REDIRECT_URL;
window.location = `https://www.adobe.com/go/acrobat-${verbRedirMap[VERB] || VERB.split('-').join('')}-${ENV}` || REDIRECT_URL;

} else {
Expand Down
8 changes: 4 additions & 4 deletions acrobat/blocks/dc-converter-widget/dc-converter-widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ export default async function init(element) {
ENV = 'prod';
}

if (window.location.hostname === 'stage--dc--adobecom.hlx.page'
|| window.location.hostname === 'main--dc--adobecom.hlx.page'
|| window.location.hostname === 'stage--dc--adobecom.hlx.live'
|| window.location.hostname === 'main--dc--adobecom.hlx.live'
if (window.location.hostname === 'stage--dc--adobecom.aem.page'
|| window.location.hostname === 'main--dc--adobecom.aem.page'
|| window.location.hostname === 'stage--dc--adobecom.aem.live'
|| window.location.hostname === 'main--dc--adobecom.aem.live'
|| window.location.hostname === 'www.stage.adobe.com') {
WIDGET_ENV = `https://stage.acrobat.adobe.com/dc-hosted/${STG_DC_WIDGET_VERSION}/dc-app-launcher.js`;
DC_DOMAIN = 'https://www.stage.adobe.com/dc';
Expand Down
2 changes: 1 addition & 1 deletion acrobat/blocks/personalization/personalization.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Use the following URL query to see all Personaliztion blocks on a page `showAll`

| review | |
|---------------------|------------------------------------------------------------|
| Review url | https:// main -- dc -- adobecom.hlx.page / jpg-to-pdf |
| Review url | https:// main -- dc -- adobecom.aem.page / jpg-to-pdf |
| Title | Rate your Experience |
| Hide title | false |
| Rating verb | Vote, Votes |
Expand Down
4 changes: 2 additions & 2 deletions acrobat/blocks/rnr/rnr.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ const SHOW_COMMENTS_TRESHOLD = 5;
const ASSET_TYPE = 'ADOBE_COM';
const RNR_API_URL = (function () {
if (
window.location.hostname === 'main--dc--adobecom.hlx.page'
|| window.location.hostname === 'main--dc--adobecom.hlx.live'
window.location.hostname === 'main--dc--adobecom.aem.page'
|| window.location.hostname === 'main--dc--adobecom.aem.live'
|| window.location.hostname === 'www.adobe.com'
) return 'https://rnr.adobe.io/v1';
return 'https://rnr-stage.adobe.io/v1';
Expand Down
8 changes: 4 additions & 4 deletions acrobat/blocks/unity/unity.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ const localeMap = {

function getUnityLibs(prodLibs = '/unitylibs') {
const { hostname } = window.location;
if (!hostname.includes('hlx.page')
&& !hostname.includes('hlx.live')
if (!hostname.includes('.page')
&& !hostname.includes('.live')
&& !hostname.includes('localhost')) {
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`;
if (branch.indexOf('--') > -1) return `https://${branch}.aem.live/unitylibs`;
return `https://${branch}--unity--adobecom.aem.live/unitylibs`;
}

export default async function init(el) {
Expand Down
2 changes: 1 addition & 1 deletion acrobat/blocks/verb-widget/pdfAssetManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const getEnv = () => {

if (query) return ENVS[query];
if (host.includes('stage.adobe') || host.includes('corp.adobe') || host.includes('stage')) return ENVS.stage;
if (host.includes('hlx.page') || host.includes('localhost') || host.includes('hlx.live')) return ENVS.dev;
if (host.includes('.page') || host.includes('localhost') || host.includes('.live')) return ENVS.dev;
return ENVS.prod;
};

Expand Down
3 changes: 3 additions & 0 deletions acrobat/scripts/contentSecurityPolicy/csp.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ const STAGE_ENVS = [
'main--dc--adobecom.hlx.page',
'main--dc--adobecom.hlx.live',
'stage--dc--adobecom.hlx.page',
'main--dc--adobecom.aem.page',
'main--dc--adobecom.aem.live',
'stage--dc--adobecom.aem.page',
];

async function getCspEnv() {
Expand Down
8 changes: 8 additions & 0 deletions acrobat/scripts/contentSecurityPolicy/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ const connectSrc = [
'*.typekit.net',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
'cdn.linkedin.oribi.io',
'adobedc.demdex.net/',
'*.facebook.com',
Expand Down Expand Up @@ -160,6 +162,8 @@ const imgSrc = [
'fast-track--milo--adobecom.hlx.live',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
'client.messaging.adobe.com/',
'ad.doubleclick.net',
';',
Expand Down Expand Up @@ -218,6 +222,8 @@ const scriptSrc = [
'api.demandbase.com',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
'tr.snapchat.com',
'\'sha256-XZLMiKjK7kZsMSJR/aV6U3pMxjqlvU6v3tJSIimxjHs=\'',
';',
Expand All @@ -238,6 +244,8 @@ const styleSrc = [
'http://localhost:6456/',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
';',
];

Expand Down
9 changes: 9 additions & 0 deletions acrobat/scripts/contentSecurityPolicy/prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ const connectSrc = [
'main--dc--adobecom.hlx.page',
'main--milo--adobecom.hlx.page',
'main--dc--adobecom.hlx.live',
'main--dc--adobecom.aem.page',
'main--milo--adobecom.aem.page',
'main--dc--adobecom.aem.live',
'cdn.linkedin.oribi.io',
'*.typekit.net/',
'trial-eum-clienttons-s.akamaihd.net/',
Expand All @@ -52,6 +55,8 @@ const connectSrc = [
'ad.doubleclick.net',
'main--unity--adobecom.hlx.live',
'main--unity--adobecom.hlx.page',
'main--unity--adobecom.aem.live',
'main--unity--adobecom.aem.page',
';',
];

Expand Down Expand Up @@ -151,6 +156,8 @@ const imgSrc = [
'www.linkedin.com',
'main--dc--adobecom.hlx.page',
'main--milo--adobecom.hlx.page',
'main--dc--adobecom.aem.page',
'main--milo--adobecom.aem.page',
'a5.behance.net',
'www.googletagmanager.com',
'milo.adobe.com',
Expand Down Expand Up @@ -237,6 +244,7 @@ const scriptSrc = [
'trc.taboola.com',
'js.adsrvr.org',
'main--milo--adobecom.hlx.page',
'main--milo--adobecom.aem.page',
'tag.demandbase.com',
'*.typekit.net',
'zn3n5vyia1vy8b4ly-adobe.siteintercept.qualtrics.com/',
Expand All @@ -258,6 +266,7 @@ const styleSrc = [
'prod.adobeccstatic.com',
'use.typekit.net',
'main--milo--adobecom.hlx.page',
'main--milo--adobecom.aem.page',
'p.typekit.net',
';',
];
Expand Down
9 changes: 9 additions & 0 deletions acrobat/scripts/contentSecurityPolicy/stage.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const connectSrc = [
'tag-logger.demandbase.com',
'accounts.google.com/gsi/',
'acom-reviews--adobe.hlx.live/reviews-api/',
'acom-reviews--adobe.aem.live/reviews-api/',
'ade0164.d41.co/',
'adobe.tt.omtrdc.net',
'adobedc.demdex.net/',
Expand Down Expand Up @@ -53,6 +54,8 @@ const connectSrc = [
'wss://local-test.acrobat.com:*',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
'cdn.linkedin.oribi.io',
'*.akstat.io/',
'facebook.com',
Expand Down Expand Up @@ -163,6 +166,8 @@ const imgSrc = [
'http://localhost:6456/',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
's.yimg.jp',
'yjtag.yahoo.co.jp',
'client.messaging.adobe.com/',
Expand Down Expand Up @@ -256,6 +261,8 @@ const scriptSrc = [
'http://localhost:6456/',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
's.tgm.yahoo-net.jp',
's.yimg.jp',
'yjtag.yahoo.co.jp',
Expand All @@ -277,6 +284,8 @@ const styleSrc = [
'http://localhost:6456/',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
';',
];

Expand Down
8 changes: 4 additions & 4 deletions acrobat/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ const setLibs = (prodLibs, location) => {
// 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 (!(hostname.includes('.aem.') || 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`;
return branch.includes('--') ? `https://${branch}.aem.live/libs` : `https://${branch}--milo--adobecom.aem.live/libs`;
};

const getLocale = (locales, pathname = window.location.pathname) => {
Expand Down Expand Up @@ -293,7 +293,7 @@ const CONFIG = {
// geoRouting: 'on',
prodDomains: ['www.adobe.com', 'business.adobe.com', 'helpx.adobe.com'],
stageDomainsMap: {
'--dc--adobecom.hlx.page': {
'--dc--adobecom.(hlx|aem).page': {
'www.adobe.com': 'www.stage.adobe.com',
'business.adobe.com': 'business.adobe.com',
'blog.adobe.com': 'blog.adobe.com',
Expand All @@ -303,7 +303,7 @@ const CONFIG = {
'milo.adobe.com': 'milo.adobe.com',
'news.adobe.com': 'news.adobe.com',
},
'--dc--adobecom.hlx.live': {
'--dc--adobecom.(hlx|aem).live': {
'www.adobe.com': 'www.adobe.com',
'business.adobe.com': 'business.adobe.com',
'blog.adobe.com': 'blog.adobe.com',
Expand Down
6 changes: 4 additions & 2 deletions acrobat/scripts/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export const [setLibs, getLibs] = (() => {
// 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 (!(hostname.includes('.aem.') || 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`;
return branch.includes('--') ? `https://${branch}.aem.live/libs` : `https://${branch}--milo--adobecom.aem.live/libs`;
})();
return libs;
}, () => libs,
Expand All @@ -41,7 +41,9 @@ export function getEnv() {
const prodHosts = ['www.adobe.com', 'sign.ing', 'edit.ing'];
const stageHosts = [
'stage--dc--adobecom.hlx.page', 'main--dc--adobecom.hlx.page',
'stage--dc--adobecom.aem.page', 'main--dc--adobecom.aem.page',
'stage--dc--adobecom.hlx.live', 'main--dc--adobecom.hlx.live',
'stage--dc--adobecom.aem.live', 'main--dc--adobecom.aem.live',
'www.stage.adobe.com',
];

Expand Down
10 changes: 10 additions & 0 deletions edgeworkers/Acrobat_DC_web_prod/utils/csp/prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const connectSrc = [
'accounts.google.com/gsi/log',
'accounts.google.com/gsi/status',
'acom-reviews--adobe.hlx.live/reviews-api/',
'acom-reviews--adobe.aem.live/reviews-api/',
'ade0164.d41.co/',
'adobe.tt.omtrdc.net',
'adobedc.demdex.net/',
Expand All @@ -41,6 +42,9 @@ const connectSrc = [
'main--dc--adobecom.hlx.page',
'main--milo--adobecom.hlx.page',
'main--dc--adobecom.hlx.live',
'main--dc--adobecom.aem.page',
'main--milo--adobecom.aem.page',
'main--dc--adobecom.aem.live',
'cdn.linkedin.oribi.io',
'*.typekit.net/',
'trial-eum-clienttons-s.akamaihd.net/',
Expand All @@ -58,6 +62,8 @@ const connectSrc = [
'ad.doubleclick.net',
'main--unity--adobecom.hlx.live',
'main--unity--adobecom.hlx.page',
'main--unity--adobecom.aem.live',
'main--unity--adobecom.aem.page',
';',
];

Expand Down Expand Up @@ -156,7 +162,9 @@ const imgSrc = [
'www.googletagmanager.com/',
'www.linkedin.com',
'main--dc--adobecom.hlx.page',
'main--dc--adobecom.aem.page',
'main--milo--adobecom.hlx.page',
'main--milo--adobecom.aem.page',
'a5.behance.net',
'www.googletagmanager.com',
'milo.adobe.com',
Expand Down Expand Up @@ -242,6 +250,7 @@ const scriptSrc = [
'trc.taboola.com',
'js.adsrvr.org',
'main--milo--adobecom.hlx.page',
'main--milo--adobecom.aem.page',
'tag.demandbase.com',
'*.typekit.net',
'zn3n5vyia1vy8b4ly-adobe.siteintercept.qualtrics.com/',
Expand All @@ -261,6 +270,7 @@ const styleSrc = [
'adobeccstatic.com',
'use.typekit.net',
'main--milo--adobecom.hlx.page',
'main--milo--adobecom.aem.page',
'p.typekit.net',
';',
];
Expand Down
8 changes: 8 additions & 0 deletions edgeworkers/Acrobat_DC_web_prod/utils/csp/stage.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ const connectSrc = [
'wss://local-test.acrobat.com:*',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
'cdn.linkedin.oribi.io',
'*.akstat.io/',
';',
Expand Down Expand Up @@ -159,6 +161,8 @@ const imgSrc = [
'http://localhost:6456/',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
's.yimg.jp',
'yjtag.yahoo.co.jp',
'client.messaging.adobe.com/',
Expand Down Expand Up @@ -251,6 +255,8 @@ const scriptSrc = [
'http://localhost:6456/',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
's.tgm.yahoo-net.jp',
's.yimg.jp',
'yjtag.yahoo.co.jp',
Expand All @@ -270,6 +276,8 @@ const styleSrc = [
'http://localhost:6456/',
'*.hlx.page',
'*.hlx.live',
'*.aem.page',
'*.aem.live',
';',
];

Expand Down
Loading
Loading