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

Fix hreflang #426

Merged
merged 29 commits into from
Dec 14, 2023
Merged
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
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
helix-importer-ui
helix-importer-ui
tools/sitemap
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ node_modules/*
helix-importer-ui
.DS_Store

.vscode/*
.vscode/*
tools/sitemap/node_modules/*
5 changes: 0 additions & 5 deletions helix-sitemap.yaml

This file was deleted.

37 changes: 0 additions & 37 deletions solutions/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,6 @@ export const DEFAULT_COUNTRY = 'au';

export const METADATA_ANAYTICS_TAGS = 'analytics-tags';

const hreflangMap = new Map([
['en-ro', { baseUrl: 'https://www.bitdefender.ro', pageType: 'html' }],
['de', { baseUrl: 'https://www.bitdefender.de', pageType: 'html' }],
['sv', { baseUrl: 'https://www.bitdefender.se', pageType: 'html' }],
['pt', { baseUrl: 'https://www.bitdefender.pt', pageType: 'html' }],
['en-sv', { baseUrl: 'https://www.bitdefender.se', pageType: 'html' }],
['pt-BR', { baseUrl: 'https://www.bitdefender.com.br', pageType: 'html' }],
['en', { baseUrl: 'https://www.bitdefender.com', pageType: 'html' }],
['it', { baseUrl: 'https://www.bitdefender.it', pageType: 'html' }],
['fr', { baseUrl: 'https://www.bitdefender.fr', pageType: 'html' }],
['nl-BE', { baseUrl: 'https://www.bitdefender.br', pageType: 'html' }],
['es', { baseUrl: 'https://www.bitdefender.es', pageType: 'html' }],
['en-AU', { baseUrl: 'https://www.bitdefender.com.au', pageType: '' }],
['ro', { baseUrl: 'https://www.bitdefender.ro', pageType: 'html' }],
['nl', { baseUrl: 'https://www.bitdefender.nl', pageType: 'html' }],
['en-GB', { baseUrl: 'https://www.bitdefender.co.uk', pageType: 'html' }],
['zh-hk', { baseUrl: 'https://www.bitdefender.com/zh-hk', pageType: '' }],
['zh-tw', { baseUrl: 'https://www.bitdefender.com/zh-tw', pageType: '' }],
['x-default', { baseUrl: 'https://www.bitdefender.com', pageType: 'html' }],
]);

window.hlx.plugins.add('rum-conversion', {
load: 'lazy',
url: '../plugins/rum-conversion/src/index.js',
Expand Down Expand Up @@ -501,22 +480,6 @@ async function loadLazy(doc) {
sampleRUM('lazy');
sampleRUM.observe(main.querySelectorAll('div[data-block-name]'));
sampleRUM.observe(main.querySelectorAll('picture > img'));

hreflangMap.forEach(({ baseUrl, pageType }, key) => {
const link = document.createElement('link');
link.setAttribute('rel', 'alternate');
link.setAttribute('hreflang', key);

const lastCharFromHref = window.location.pathname.slice(-1);
const isCurrentIndexPage = lastCharFromHref === '/';
const suffix = `${pageType && !isCurrentIndexPage ? `.${pageType}` : ''}`;

let href = `${baseUrl}${window.location.pathname.replace(/\/us\/en/, '')}`;
href = `${href}${suffix}`;

link.setAttribute('href', href);
document.head.appendChild(link);
});
}

/**
Expand Down
443 changes: 443 additions & 0 deletions solutions/sitemap.xml

Large diffs are not rendered by default.

63 changes: 63 additions & 0 deletions tools/sitemap/create.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import fs from 'fs/promises';
import convert from 'xml-js';
import path from 'path';

const QUERY_INDEX_URL = 'https://www.bitdefender.com.au/solutions/query-index.json';
const LOCALE_URL = 'https://www.bitdefender.com.au';

const hreflangMap = [
['en-ro', { baseUrl: 'https://www.bitdefender.ro', pageType: '.html' }],
['de', { baseUrl: 'https://www.bitdefender.de', pageType: '.html' }],
['sv', { baseUrl: 'https://www.bitdefender.se', pageType: '.html' }],
['pt', { baseUrl: 'https://www.bitdefender.pt', pageType: '.html' }],
['en-sv', { baseUrl: 'https://www.bitdefender.se', pageType: '.html' }],
['pt-BR', { baseUrl: 'https://www.bitdefender.com.br', pageType: '.html' }],
['en', { baseUrl: 'https://www.bitdefender.com', pageType: '.html' }],
['it', { baseUrl: 'https://www.bitdefender.it', pageType: '.html' }],
['fr', { baseUrl: 'https://www.bitdefender.fr', pageType: '.html' }],
['nl-BE', { baseUrl: 'https://www.bitdefender.br', pageType: '.html' }],
['es', { baseUrl: 'https://www.bitdefender.es', pageType: '.html' }],
['en-AU', { baseUrl: 'https://www.bitdefender.com.au', pageType: '' }],
['ro', { baseUrl: 'https://www.bitdefender.ro', pageType: '.html' }],
['nl', { baseUrl: 'https://www.bitdefender.nl', pageType: '.html' }],
['en-GB', { baseUrl: 'https://www.bitdefender.co.uk', pageType: '.html' }],
['zh-hk', { baseUrl: 'https://www.bitdefender.com/zh-hk', pageType: '' }],
['zh-tw', { baseUrl: 'https://www.bitdefender.com/zh-tw', pageType: '' }],
['x-default', { baseUrl: 'https://www.bitdefender.com', pageType: '.html' }],
];

try {
const response = await fetch(QUERY_INDEX_URL);
const json = await response.json();
const sitemapPath = path.join(process.cwd(), '../../solutions/sitemap.xml');

const output = {
urlset: {
_attributes: {
'xmlns:xhtml': 'http://www.w3.org/1999/xhtml',
xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9',
},
url: json?.data.map((row) => ({
loc: `${LOCALE_URL}${row.path}`,
'xhtml:link': Object.keys(hreflangMap).map((key) => {
const hreflang = hreflangMap[key][0];
const href = `${hreflangMap[key][1].baseUrl}${row.path}${hreflangMap[key][1].pageType}`;
return {
_attributes: {
rel: 'alternate',
hreflang,
href,
},
};
}),
})),
},
};

const options = { compact: true, ignoreComment: true, spaces: 4 };
const xml = convert.json2xml(output, options);
await fs.writeFile(sitemapPath, xml);
} catch (error) {
// eslint-disable-next-line no-console
console.error(error);
}
32 changes: 32 additions & 0 deletions tools/sitemap/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions tools/sitemap/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "bitdefender-sitemap-creator",
"version": "1.0.0",
"description": "",
"type": "module",
"main": "create.js",
"scripts": {
"start": "node create.js"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"xml-js": "1.6.11"
}
}