Update to Antora 3.0.1

Closes gh-2038
This commit is contained in:
Eleftheria Stein
2022-03-11 15:46:19 +01:00
parent 1b18d64220
commit e157700087
6 changed files with 9 additions and 50 deletions

View File

@@ -20,8 +20,7 @@ ui:
url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip
snapshot: true snapshot: true
pipeline: antora:
extensions: extensions:
- require: ./antora/extensions/version-fix.js - require: ./antora/extensions/version-fix.js
- require: ./antora/extensions/major-minor-segment.js - require: ./antora/extensions/major-minor-segment.js
- require: ./antora/extensions/root-component-name.js

View File

@@ -3,8 +3,8 @@
const { posix: path } = require('path') const { posix: path } = require('path')
module.exports.register = (pipeline, { config }) => { module.exports.register = function({ config }) {
pipeline.on('contentClassified', ({ contentCatalog }) => { this.on('contentClassified', ({ contentCatalog }) => {
contentCatalog.getComponents().forEach(component => { contentCatalog.getComponents().forEach(component => {
const componentName = component.name; const componentName = component.name;
const generationToVersion = new Map(); const generationToVersion = new Map();
@@ -197,4 +197,4 @@ function no_data(key, value) {
return value ? "__data__" : value; return value ? "__data__" : value;
} }
return value; return value;
} }

View File

@@ -1,40 +0,0 @@
// https://gitlab.com/antora/antora/-/issues/132#note_712132072
'use strict'
const { posix: path } = require('path')
module.exports.register = (pipeline, { config }) => {
pipeline.on('contentClassified', ({ contentCatalog }) => {
const rootComponentName = config.rootComponentName || 'ROOT'
const rootComponentNameLength = rootComponentName.length
contentCatalog.findBy({ component: rootComponentName }).forEach((file) => {
if (file.out) {
file.out.dirname = file.out.dirname.substr(rootComponentNameLength)
file.out.path = file.out.path.substr(rootComponentNameLength + 1)
file.out.rootPath = fixPath(file.out.rootPath)
}
if (file.pub) {
file.pub.url = file.pub.url.substr(rootComponentNameLength + 1)
if (file.pub.rootPath) {
file.pub.rootPath = fixPath(file.pub.rootPath)
}
}
if (file.rel) {
if (file.rel.pub) {
file.rel.pub.url = file.rel.pub.url.substr(rootComponentNameLength + 1)
file.rel.pub.rootPath = fixPath(file.rel.pub.rootPath);
}
}
})
const rootComponent = contentCatalog.getComponent(rootComponentName)
rootComponent?.versions?.forEach((version) => {
version.url = version.url.substr(rootComponentName.length + 1)
})
// const siteStartPage = contentCatalog.getById({ component: '', version: '', module: '', family: 'alias', relative: 'index.adoc' })
// if (siteStartPage) delete siteStartPage.out
})
function fixPath(path) {
return path.split('/').slice(1).join('/') || '.'
}
}

View File

@@ -1,8 +1,8 @@
'use strict' 'use strict'
module.exports.register = (pipeline, { config }) => { module.exports.register = function({ config }) {
pipeline.on('contentAggregated', ({ contentAggregate }) => { this.on('contentAggregated', ({ contentAggregate }) => {
contentAggregate.forEach(aggregate => { contentAggregate.forEach(aggregate => {
if (aggregate.version === "2.6.2" && if (aggregate.version === "2.6.2" &&
aggregate.prerelease == "-SNAPSHOT") { aggregate.prerelease == "-SNAPSHOT") {

View File

@@ -20,7 +20,7 @@ ui:
url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip
snapshot: true snapshot: true
pipeline: antora:
extensions: extensions:
- require: ./antora/extensions/version-fix.js
- require: ./antora/extensions/major-minor-segment.js - require: ./antora/extensions/major-minor-segment.js
- require: ./antora/extensions/root-component-name.js

View File

@@ -29,7 +29,7 @@ dependencies {
} }
antora { antora {
antoraVersion = "3.0.0-alpha.8" antoraVersion = "3.0.1"
arguments = ["--fetch"] arguments = ["--fetch"]
} }