stop using patch-sitemap.js
diff --git a/antora-playbook.yml b/antora-playbook.yml
index 089db46..1048083 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -1,6 +1,6 @@
site:
title: Apache Camel
- url: /
+ url: https://camel.apache.org
start_page: latest@manual::index.adoc
content:
diff --git a/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs b/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs
index 4e12939..7c25455 100644
--- a/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs
+++ b/antora-ui-camel/src/partials/breadcrumbs-microdata.hbs
@@ -6,38 +6,33 @@
"@type": "ListItem",
"position": 1,
"name": "{{{site.title}}}",
- "item": "https://camel.apache.org/"
+ "item": "{{{site.url}}}/"
},
{
"@type": "ListItem",
"position": 2,
"name": "{{{page.component.title}}}",
- "item": "https://camel.apache.org{{{page.component.url}}}"
+ "item": "{{{site.url}}}{{{page.component.url}}}"
},
{
"@type": "ListItem",
"position": 3,
"name": "{{{page.componentVersion.displayVersion}}}",
- "item": "https://camel.apache.org{{{page.componentVersion.url}}}"
+ "item": "{{{site.url}}}{{{page.componentVersion.url}}}"
}
- {{#if page.breadcrumbs}}
+ {{~#each page.breadcrumbs~}}
,
- {{#each page.breadcrumbs}}
{
"@type": "ListItem",
"position": {{add @index 4}},
"name": "{{{remove_markup ./content }}}",
- {{~#if (and ./url (eq ./urlType 'internal'))~}}
- "item": "https://camel.apache.org{{{./url}}}"
- {{~else~}}
- "item": "https://camel.apache.org{{{../page.componentVersion.url}}}"
- {{~/if~}}
- }
- {{#unless @last}}
- ,
- {{/unless}}
- {{/each}}
+ {{#if (and ./url (eq ./urlType 'internal'))}}
+ "item": "{{{../site.url}}}{{{./url}}}"
+ {{else}}
+ "item": "{{{../site.url}}}{{{../page.componentVersion.url}}}"
{{/if}}
+ }
+ {{~/each~}}
]
}
</script>
diff --git a/antora-ui-camel/src/partials/head-info.hbs b/antora-ui-camel/src/partials/head-info.hbs
index 32c8bee..e35f5d7 100644
--- a/antora-ui-camel/src/partials/head-info.hbs
+++ b/antora-ui-camel/src/partials/head-info.hbs
@@ -1,6 +1,3 @@
- {{#with page.canonicalUrl}}
- <link rel="canonical" href="{{{this}}}">
- {{/with}}
{{#unless (eq page.attributes.pagination undefined)}}
{{#with page.previous}}
<link rel="prev" href="{{{relativize ./url}}}">
diff --git a/package.json b/package.json
index 420e66c..209217b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "1.0.0-SNAPSHOT",
"license": "Apache-2.0",
"scripts": {
- "build:antora": "antora --clean --fetch antora-playbook.yml --stacktrace --require ./patch-sitemap.js",
+ "build:antora": "antora --clean --fetch antora-playbook.yml --stacktrace",
"build:hugo": "hugo --cacheDir ${HUGO_CACHE_DIR:-$(pwd)/.hugo_data} ${HUGO_OPTIONS:-}",
"build:minify": "gulp minify",
"build:sitemap": "gulp sitemap",
@@ -20,9 +20,7 @@
},
"devDependencies": {
"@antora/cli": "^3.0.0-alpha.9",
- "@antora/playbook-builder": "^3.0.0-alpha.9",
"@antora/site-generator-default": "^3.0.0-alpha.9",
- "@antora/site-mapper": "^3.0.0-alpha.9",
"@deadlinks/cargo-deadlinks": "github-release:deadlinks/cargo-deadlinks:0.8.0/deadlinks-linux",
"@djencks/asciidoctor-antora-indexer": "^0.0.6",
"@djencks/asciidoctor-jsonpath": "^0.0.4",
diff --git a/patch-sitemap.js b/patch-sitemap.js
deleted file mode 100644
index 83342a8..0000000
--- a/patch-sitemap.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const v8 = require('v8');
-const buildPlaybook = require('@antora/playbook-builder');
-const mapSite = require('@antora/site-mapper');
-
-delete require.cache[require.resolve('@antora/playbook-builder')];
-delete require.cache[require.resolve('@antora/site-mapper')];
-
-const clone = (source) => v8.deserialize(v8.serialize(source));
-
-require.cache[require.resolve('@antora/playbook-builder')] = {
- exports: (args = [], env = {}, schema = undefined) => {
- const playbook = buildPlaybook(args, env, schema);
- const patched = clone(playbook);
- patched.changeSiteUrl = (url) => patched.site.url = url;
- return Object.freeze(patched);
- }
-}
-
-require.cache[require.resolve('@antora/site-mapper')] = {
- exports: (playbook, pages) => {
- playbook.changeSiteUrl('https://camel.apache.org');
- try {
- return mapSite(playbook, pages);
- } finally {
- playbook.changeSiteUrl('/');
- }
- }
-}
