This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
The following commit(s) were added to refs/heads/master by this push:
new 68a20c0 CAMEL-15154: include all sitemaps in sitemap.xml
68a20c0 is described below
commit 68a20c0669df0b1f5341c9bdfe4a599027ba818c
Author: Zoran Regvart <zregv...@apache.org>
AuthorDate: Sun Jun 7 15:24:10 2020 +0200
CAMEL-15154: include all sitemaps in sitemap.xml
This configures Hugo to output the sitemap in `sitemap-website.xml` and
adds a build step to add it to the sitemap index in `sitemap.xml`
already generated by Antora. With this the `sitemap.xml` should contain
pointers to all relevant sitemap files.
---
config.toml | 3 +
gulpfile.js | 13 ++++-
package.json | 2 +
yarn.lock | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 194 insertions(+), 4 deletions(-)
diff --git a/config.toml b/config.toml
index dcfaa68..6ea5661 100644
--- a/config.toml
+++ b/config.toml
@@ -27,6 +27,9 @@ timeout = 300000
dir = ":cacheDir/:project"
maxAge = "12h"
+[sitemap]
+ filename = "sitemap-website.xml"
+
[[menu.main]]
name = "Blog"
weight = 2
diff --git a/gulpfile.js b/gulpfile.js
index eb43122..3973c1d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,7 @@
+const cheerio = require('gulp-cheerio');
+const env = process.env.CAMEL_ENV || 'development';
const gulp = require('gulp');
const htmlmin = require('gulp-htmlmin');
-const env = process.env.CAMEL_ENV || 'development'
gulp.task('minify', (done) => {
if (env !== 'production') {
@@ -18,3 +19,13 @@ gulp.task('minify', (done) => {
}))
.pipe(gulp.dest('public'));
});
+
+gulp.task('sitemap', (done) => {
+ return gulp.src('public/sitemap.xml')
+ .pipe(cheerio(($, f) =>
+ $('sitemapindex').append(`<sitemap>
+<loc>https://camel.apache.org/sitemap-website.xml</loc>
+</sitemap>`)
+ ))
+ .pipe(gulp.dest('public'));
+});
diff --git a/package.json b/package.json
index bdbfde3..a42755e 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
"build:antora": "antora --clean --fetch antora-playbook.yml",
"build:hugo": "hugo --cacheDir ${HUGO_CACHE_DIR:-$(pwd)/.hugo_data}",
"build:minify": "gulp minify",
+ "build:sitemap": "gulp sitemap",
"build": "run-s build:*",
"preview": "run-s preview:*",
"preview:antora": "antora --clean --fetch antora-playbook.yml",
@@ -26,6 +27,7 @@
"@djencks/asciidoctor-antora-indexer": "^0.0.2",
"escape-string-regexp": "~2.0",
"gulp": "~4.0",
+ "gulp-cheerio": "^1.0.0",
"gulp-htmlmin": "~5.0",
"html-validate": "~1.2",
"hugo-cli": "~0.11",
diff --git a/yarn.lock b/yarn.lock
index 9b6e2d4..441aa44 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -240,6 +240,13 @@ ansi-colors@^1.0.1:
dependencies:
ansi-wrap "^0.1.0"
+ansi-cyan@^0.1.1:
+ version "0.1.1"
+ resolved
"https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873";
+ integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
+ dependencies:
+ ansi-wrap "0.1.0"
+
ansi-escapes@^4.2.1:
version "4.3.1"
resolved
"https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61";
@@ -254,6 +261,13 @@ ansi-gray@^0.1.1:
dependencies:
ansi-wrap "0.1.0"
+ansi-red@^0.1.1:
+ version "0.1.1"
+ resolved
"https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c";
+ integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
+ dependencies:
+ ansi-wrap "0.1.0"
+
ansi-regex@^2.0.0:
version "2.1.1"
resolved
"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
@@ -321,6 +335,14 @@ argparse@^1.0.7:
dependencies:
sprintf-js "~1.0.2"
+arr-diff@^1.0.1:
+ version "1.1.0"
+ resolved
"https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a";
+ integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
+ dependencies:
+ arr-flatten "^1.0.1"
+ array-slice "^0.2.3"
+
arr-diff@^4.0.0:
version "4.0.0"
resolved
"https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520";
@@ -345,6 +367,11 @@ arr-map@^2.0.0, arr-map@^2.0.2:
dependencies:
make-iterator "^1.0.0"
+arr-union@^2.0.1:
+ version "2.1.0"
+ resolved
"https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d";
+ integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
+
arr-union@^3.1.0:
version "3.1.0"
resolved
"https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4";
@@ -370,6 +397,11 @@ array-last@^1.1.1:
dependencies:
is-number "^4.0.0"
+array-slice@^0.2.3:
+ version "0.2.3"
+ resolved
"https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5";
+ integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
+
array-slice@^1.0.0:
version "1.1.0"
resolved
"https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4";
@@ -705,6 +737,28 @@ chardet@^0.7.0:
resolved
"https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e";
integrity
sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+cheerio@0.*:
+ version "0.22.0"
+ resolved
"https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e";
+ integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=
+ dependencies:
+ css-select "~1.2.0"
+ dom-serializer "~0.1.0"
+ entities "~1.1.1"
+ htmlparser2 "^3.9.1"
+ lodash.assignin "^4.0.9"
+ lodash.bind "^4.1.4"
+ lodash.defaults "^4.0.1"
+ lodash.filter "^4.4.0"
+ lodash.flatten "^4.2.0"
+ lodash.foreach "^4.3.0"
+ lodash.map "^4.4.0"
+ lodash.merge "^4.4.0"
+ lodash.pick "^4.2.1"
+ lodash.reduce "^4.4.0"
+ lodash.reject "^4.4.0"
+ lodash.some "^4.4.0"
+
cheerio@^1.0.0-rc.2:
version "1.0.0-rc.3"
resolved
"https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6";
@@ -1227,7 +1281,7 @@ dom-serializer@0:
domelementtype "^2.0.1"
entities "^2.0.0"
-dom-serializer@~0.1.1:
+dom-serializer@~0.1.0, dom-serializer@~0.1.1:
version "0.1.1"
resolved
"https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0";
integrity
sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
@@ -1543,6 +1597,13 @@ ext@^1.1.2:
dependencies:
type "^2.0.0"
+extend-shallow@^1.1.2:
+ version "1.1.4"
+ resolved
"https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071";
+ integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
+ dependencies:
+ kind-of "^1.1.0"
+
extend-shallow@^2.0.1:
version "2.0.1"
resolved
"https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
@@ -2019,6 +2080,15 @@ grapheme-splitter@^1.0.4:
resolved
"https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e";
integrity
sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+gulp-cheerio@^1.0.0:
+ version "1.0.0"
+ resolved
"https://registry.yarnpkg.com/gulp-cheerio/-/gulp-cheerio-1.0.0.tgz#01c5324dba0fbe5f1b3ddce9e61ef1a8b43278d0";
+ integrity
sha512-4dgOVngKJK0+Re+prT/nuXtKM7+F92XeidxjuCeOpOlmYA5rkVaoKrH+xMN/JWOd2iI5OP/NJ6BIjWxeU+ozXQ==
+ dependencies:
+ cheerio "0.*"
+ plugin-error "^0.1.2"
+ through2 "^0.6.3"
+
gulp-cli@^2.2.0:
version "2.2.0"
resolved
"https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.0.tgz#5533126eeb7fe415a7e3e84a297d334d5cf70ebc";
@@ -2264,7 +2334,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0,
inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
resolved
"https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c";
integrity
sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -2529,6 +2599,11 @@ is-windows@^1.0.1, is-windows@^1.0.2:
resolved
"https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d";
integrity
sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+isarray@0.0.1:
+ version "0.0.1"
+ resolved
"https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+ integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
isarray@1.0.0, isarray@~1.0.0:
version "1.0.0"
resolved
"https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11";
@@ -2658,6 +2733,11 @@ keyv@^3.0.0:
dependencies:
json-buffer "3.0.0"
+kind-of@^1.1.0:
+ version "1.1.0"
+ resolved
"https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44";
+ integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
+
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
version "3.2.2"
resolved
"https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64";
@@ -2795,11 +2875,71 @@ locate-path@^3.0.0:
p-locate "^3.0.0"
path-exists "^3.0.0"
+lodash.assignin@^4.0.9:
+ version "4.2.0"
+ resolved
"https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2";
+ integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.bind@^4.1.4:
+ version "4.2.1"
+ resolved
"https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35";
+ integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=
+
lodash.clonedeep@4.5.0:
version "4.5.0"
resolved
"https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef";
integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+lodash.defaults@^4.0.1:
+ version "4.2.0"
+ resolved
"https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c";
+ integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.filter@^4.4.0:
+ version "4.6.0"
+ resolved
"https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace";
+ integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=
+
+lodash.flatten@^4.2.0:
+ version "4.4.0"
+ resolved
"https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f";
+ integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.foreach@^4.3.0:
+ version "4.5.0"
+ resolved
"https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53";
+ integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
+
+lodash.map@^4.4.0:
+ version "4.6.0"
+ resolved
"https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3";
+ integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
+
+lodash.merge@^4.4.0:
+ version "4.6.2"
+ resolved
"https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a";
+ integrity
sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.pick@^4.2.1:
+ version "4.4.0"
+ resolved
"https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3";
+ integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
+
+lodash.reduce@^4.4.0:
+ version "4.6.0"
+ resolved
"https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b";
+ integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=
+
+lodash.reject@^4.4.0:
+ version "4.6.0"
+ resolved
"https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415";
+ integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=
+
+lodash.some@^4.4.0:
+ version "4.6.0"
+ resolved
"https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d";
+ integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
+
lodash@^4.15.0, lodash@^4.17.14, lodash@^4.17.15:
version "4.17.15"
resolved
"https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548";
@@ -3516,6 +3656,17 @@ pinkie@^2.0.0:
resolved
"https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870";
integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+plugin-error@^0.1.2:
+ version "0.1.2"
+ resolved
"https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace";
+ integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
+ dependencies:
+ ansi-cyan "^0.1.1"
+ ansi-red "^0.1.1"
+ arr-diff "^1.0.1"
+ arr-union "^2.0.1"
+ extend-shallow "^1.1.2"
+
plugin-error@^1.0.1:
version "1.0.1"
resolved
"https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c";
@@ -3648,6 +3799,16 @@ read-pkg@^3.0.0:
string_decoder "^1.1.1"
util-deprecate "^1.0.1"
+"readable-stream@>=1.0.33-1 <1.1.0-0":
+ version "1.0.34"
+ resolved
"https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c";
+ integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.1"
+ isarray "0.0.1"
+ string_decoder "~0.10.x"
+
readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2,
readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2,
readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5,
readable-stream@^2.3.6, readable-stream@~2.3.6:
version "2.3.7"
resolved
"https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57";
@@ -4149,6 +4310,11 @@ string_decoder@^1.1.1:
dependencies:
safe-buffer "~5.2.0"
+string_decoder@~0.10.x:
+ version "0.10.31"
+ resolved
"https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94";
+ integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
string_decoder@~1.1.1:
version "1.1.1"
resolved
"https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
@@ -4287,6 +4453,14 @@ through2-filter@^3.0.0:
through2 "~2.0.0"
xtend "~4.0.0"
+through2@^0.6.3:
+ version "0.6.5"
+ resolved
"https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48";
+ integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
+ dependencies:
+ readable-stream ">=1.0.33-1 <1.1.0-0"
+ xtend ">=4.0.0 <4.1.0-0"
+
through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
version "2.0.5"
resolved
"https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd";
@@ -4700,7 +4874,7 @@ xmlhttprequest@1.8.0:
resolved
"https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc";
integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
-xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
version "4.0.2"
resolved
"https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54";
integrity
sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
