diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 5dc84d4e3..e86f3a0ed 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a Fix # Test URLs: -- Before: https://main--www-websites--bitdefender.hlx.page/zh-hk/ -- After: https://--www-websites--bitdefender.hlx.page/zh-hk/ +- Before: https://main--www-websites--bitdefender.aem.page/zh-hk/ +- After: https://--www-websites--bitdefender.aem.page/zh-hk/ diff --git a/README.md b/README.md index f22cec49e..3270c61c8 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ Your project's description... ## Environments -- Preview: https://main--bitdefender--hlxsites.hlx.page/ -- Live: https://main--bitdefender--hlxsites.hlx.live/ +- Preview: https://main--bitdefender--hlxsites.aem.page/ +- Live: https://main--bitdefender--hlxsites.aem.live/ ## Installation diff --git a/_src/blocks/embed/embed.js b/_src/blocks/embed/embed.js index 62e4b7001..94239a4ea 100644 --- a/_src/blocks/embed/embed.js +++ b/_src/blocks/embed/embed.js @@ -1,7 +1,7 @@ /* * Embed Block * Show videos and social posts directly on your page - * https://www.hlx.live/developer/block-collection/embed + * https://www.aem.live/developer/block-collection/embed */ const loadScript = (url, callback, type) => { diff --git a/_src/blocks/footer/footer.js b/_src/blocks/footer/footer.js index 2a1898aa2..335970695 100644 --- a/_src/blocks/footer/footer.js +++ b/_src/blocks/footer/footer.js @@ -129,7 +129,7 @@ async function runLandingpageLogic(block) { async function runAemFooterLogic() { // fetch footer content - const aemFooterHostname = window.location.hostname.includes('.hlx.') + const aemFooterHostname = window.location.hostname.includes('.aem.') || window.location.hostname.includes('localhost') ? 'https://stage.bitdefender.com' : ''; diff --git a/_src/blocks/header/header.js b/_src/blocks/header/header.js index 2a1bf8aae..90ca2302a 100644 --- a/_src/blocks/header/header.js +++ b/_src/blocks/header/header.js @@ -412,7 +412,7 @@ async function runDefaultHeaderLogic(block) { aemFetchDomain = websiteDomain.split('-').join('_'); } - const aemHeaderHostname = window.location.hostname.includes('.hlx.') + const aemHeaderHostname = window.location.hostname.includes('.aem.') || window.location.hostname.includes('localhost') ? 'https://stage.bitdefender.com' : ''; diff --git a/_src/blocks/particle-background/particle-background.js b/_src/blocks/particle-background/particle-background.js index d6e7873bd..7cb4feefe 100644 --- a/_src/blocks/particle-background/particle-background.js +++ b/_src/blocks/particle-background/particle-background.js @@ -57,7 +57,7 @@ async function init(block, aemOptions) { // await window.tsParticles.load({ id: particleIdSelector, options }); // let script = document.createElement('script'); // script.src = 'https://cdn.jsdelivr.net/npm/tsparticles@3.3.0/tsparticles.bundle.min.js'; - // script.src = 'https://dlp-fixes--www-websites--bitdefender.hlx.page/_src/scripts/vendor/tsparticles/tsparticles.bundle.min.js'; + // script.src = 'https://dlp-fixes--www-websites--bitdefender.aem.page/_src/scripts/vendor/tsparticles/tsparticles.bundle.min.js'; // script.src = '../../../_src/scripts/vendor/tsparticles/tsparticles.bundle.min.js'; // block.appendChild(script); // script.onload = () => { diff --git a/_src/blocks/video/video.js b/_src/blocks/video/video.js index 482179405..0491f81cf 100644 --- a/_src/blocks/video/video.js +++ b/_src/blocks/video/video.js @@ -1,7 +1,7 @@ /* * Video Block * Show a video referenced by a link - * https://www.hlx.live/developer/block-collection/video + * https://www.aem.live/developer/block-collection/video */ function embedYoutube(url, autoplay) { const usp = new URLSearchParams(url.search); diff --git a/_src/scripts/lib-franklin.js b/_src/scripts/lib-franklin.js index 342a73169..c07cffff4 100644 --- a/_src/scripts/lib-franklin.js +++ b/_src/scripts/lib-franklin.js @@ -12,7 +12,7 @@ */ const STICKY_NAVIGATION_SECTION_METADATA_KEY = 'sticky-navigation-item'; -export const ALL_FRANKLIN_DEV_SUBDOMAINS = ['localhost', '.hlx.page', '.hlx.live']; +export const ALL_FRANKLIN_DEV_SUBDOMAINS = ['localhost', '.aem.page', '.aem.live']; export const STICKY_NAVIGATION_DATASET_KEY = 'stickyNavName'; /** @@ -26,7 +26,7 @@ export const STICKY_NAVIGATION_DATASET_KEY = 'stickyNavName'; */ export function sampleRUM(checkpoint, data = {}) { const SESSION_STORAGE_KEY = 'aem-rum'; - sampleRUM.baseURL = sampleRUM.baseURL || new URL(window.RUM_BASE == null ? 'https://rum.hlx.page' : window.RUM_BASE, window.location); + sampleRUM.baseURL = sampleRUM.baseURL || new URL(window.RUM_BASE == null ? 'https://rum.aem.page' : window.RUM_BASE, window.location); sampleRUM.defer = sampleRUM.defer || []; const defer = (fnname) => { sampleRUM[fnname] = sampleRUM[fnname] @@ -87,7 +87,7 @@ export function sampleRUM(checkpoint, data = {}) { lazy: () => { // use classic script to avoid CORS issues const script = document.createElement('script'); - script.src = 'https://rum.hlx.page/.rum/@adobe/helix-rum-enhancer@^1/src/index.js'; + script.src = 'https://rum.aem.page/.rum/@adobe/helix-rum-enhancer@^1/src/index.js'; document.head.appendChild(script); return true; }, diff --git a/_src/scripts/libs/constants.js b/_src/scripts/libs/constants.js index 74cd80b70..443314389 100644 --- a/_src/scripts/libs/constants.js +++ b/_src/scripts/libs/constants.js @@ -1,5 +1,5 @@ export const Constants = { - DEV_BASE_URL: ["localhost", "stage", ".hlx."].some((domain) => + DEV_BASE_URL: ["localhost", "stage", ".aem."].some((domain) => window.location.hostname.includes(domain)) ? 'https://www.bitdefender.com' : '', FINGERPRINT_LOCAL_STORAGE_NAME: 'rhvID', @@ -10,5 +10,5 @@ export const Constants = { ZUROA_LOCALES: ['nl-nl', 'nl-be'], - DEV_DOMAINS: ["localhost", "stage", ".hlx."], + DEV_DOMAINS: ["localhost", "stage", ".aem."], } \ No newline at end of file diff --git a/_src/scripts/libs/store/store.js b/_src/scripts/libs/store/store.js index cf66f141d..780bf21ba 100644 --- a/_src/scripts/libs/store/store.js +++ b/_src/scripts/libs/store/store.js @@ -808,7 +808,7 @@ class BitCheckout { if (/^(localhost|local.bitdefender.com)/.test(hostname)) { return '3405af40-c88e-11ed-9a49-e17059797c0c'; } - if (/^(author-p23952-e81192|dev1|.hlx.)/.test(hostname)) { + if (/^(author-p23952-e81192|dev1|.aem.)/.test(hostname)) { return '91d619d0-c88e-11ed-9ff9-3bfdc38b7fc4'; } if (/^(author-p23952-e68355|stage)/.test(hostname)) { diff --git a/tools/block-list/app.js b/tools/block-list/app.js index 466dc05bc..04a4477c0 100644 --- a/tools/block-list/app.js +++ b/tools/block-list/app.js @@ -3,7 +3,7 @@ const { JSDOM } = require('jsdom'); // Base URLs const hostname = 'https://main--www-websites--bitdefender.aem.page'; -const jsonUrl = 'https://main--www-websites--bitdefender.hlx.page/query-index.json'; +const jsonUrl = 'https://main--www-websites--bitdefender.aem.page/query-index.json'; // Function to get class names from HTML const extractClassNames = (html) => { diff --git a/tools/sidekick/library.html b/tools/sidekick/library.html index b83528131..182762964 100644 --- a/tools/sidekick/library.html +++ b/tools/sidekick/library.html @@ -28,7 +28,7 @@