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

chore: update URLs and hostname references from .hlx. to .aem. #344

Open
wants to merge 2 commits into
base: main
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/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a
Fix #<gh-issue-id>

Test URLs:
- Before: https://main--www-websites--bitdefender.hlx.page/zh-hk/
- After: https://<branch>--www-websites--bitdefender.hlx.page/zh-hk/
- Before: https://main--www-websites--bitdefender.aem.page/zh-hk/
- After: https://<branch>--www-websites--bitdefender.aem.page/zh-hk/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion _src/blocks/embed/embed.js
Original file line number Diff line number Diff line change
@@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion _src/blocks/footer/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
: '';
Expand Down
2 changes: 1 addition & 1 deletion _src/blocks/header/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
: '';
Expand Down
2 changes: 1 addition & 1 deletion _src/blocks/particle-background/particle-background.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down
2 changes: 1 addition & 1 deletion _src/blocks/video/video.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
6 changes: 3 additions & 3 deletions _src/scripts/lib-franklin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand All @@ -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]
Expand Down Expand Up @@ -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;
},
Expand Down
4 changes: 2 additions & 2 deletions _src/scripts/libs/constants.js
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -10,5 +10,5 @@ export const Constants = {

ZUROA_LOCALES: ['nl-nl', 'nl-be'],

DEV_DOMAINS: ["localhost", "stage", ".hlx."],
DEV_DOMAINS: ["localhost", "stage", ".aem."],
}
2 changes: 1 addition & 1 deletion _src/scripts/libs/store/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion tools/block-list/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion tools/sidekick/library.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<body>
<script
type="module"
src="https://www.hlx.live/tools/sidekick/library/index.js"
src="https://www.aem.live/tools/sidekick/library/index.js"
></script>
<script>
const library = document.createElement('sidekick-library')
Expand Down
Loading