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.

Sign up for GitHub

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

upgrade to Helix 5 #319

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

upgrade to Helix 5 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
## Validate Changes ##
<-- Include steps to test or links to content packages as needed -->

- Before: https://main--24petwatch--hlxsites.hlx.page/
- After: https://<branch>--24petwatch--hlxsites.hlx.page/
- Before: https://main--24petwatch--hlxsites.aem.page/
- After: https://<branch>--24petwatch--hlxsites.aem.page/
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Your project's description...

## Environments
- Preview: https://main--24petwatch--hlxsites.hlx.page/
- Live: https://main--24petwatch--hlxsites.hlx.live/
- Preview: https://main--24petwatch--hlxsites.aem.page/
- Live: https://main--24petwatch--hlxsites.aem.live/

## Installation

Expand Down Expand Up @@ -40,6 +40,6 @@ graph LR
### CDN Setup

The CDN has the following configuration:
* `main--24petwatch--hlxsites.hlx.live` will handle `/blocks/*`, `/blog*`, `/styles/*`, `/scripts/*`
* `main--24petwatch-crosswalk-prod--hlxsites.hlx.live` will handle `/`, `/ca`, `/media`, `/fragments/*`
* `main--24petwatch--hlxsites.aem.live` will handle `/blocks/*`, `/blog*`, `/styles/*`, `/scripts/*`
* `main--24petwatch-crosswalk-prod--hlxsites.aem.live` will handle `/`, `/ca`, `/media`, `/fragments/*`
* `author-pXXXXXX-eYYYYY.adobeaemcloud.com/` will handle the rest
2 changes: 1 addition & 1 deletion scripts/lib-analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function getDatastreamConfiguration() {
if (hostname?.endsWith('petwatch.com')) {
edgeConfigId = '3843429b-2a2d-43ce-9227-6aa732ddf7da'; // 24petwatch(PROD)
}
if (hostname?.endsWith('hlx.page') || hostname?.endsWith('hlx.live')) {
if (hostname?.endsWith('aem.page') || hostname?.endsWith('aem.live')) {
edgeConfigId = '1b0ec0ce-b541-4d0f-a78f-fb2a6ca8713c'; // 24petwatch(STAGE)
}

Expand Down
6 changes: 3 additions & 3 deletions scripts/lib-franklin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,9 +872,9 @@ export const isMobile = window.matchMedia('(max-width: 767px)');
export const isTablet = window.matchMedia('(min-width: 768px)');
export const isDesktop = window.matchMedia('(min-width: 900px)');
export const isDesktopLG = window.matchMedia('(min-width: 1200px)');
export const edsBlogDomain = 'main--24petwatch--hlxsites.hlx.live';
export const edsXWalkDomain = 'main--24petwatch-crosswalk--hlxsites.hlx.live';
export const edsXWalkDomainProd = 'main--24petwatch-crosswalk-prod--hlxsites.hlx.live';
export const edsBlogDomain = 'main--24petwatch--hlxsites.aem.live';
export const edsXWalkDomain = 'main--24petwatch-crosswalk--hlxsites.aem.live';
export const edsXWalkDomainProd = 'main--24petwatch-crosswalk-prod--hlxsites.aem.live';
export const isCrosswalkDomain = window.location.hostname === edsXWalkDomain
|| window.location.hostname === edsXWalkDomainProd;
export const isCanada = window.location.pathname.startsWith('/ca/') || window.location.pathname === '/ca';
Expand Down