Skip to content

Commit 2a25749

Browse files
committed
Merge branch 'stackable' into docs/building
# Conflicts: # README.adoc
2 parents 3148b97 + 5c08d9f commit 2a25749

40 files changed

+2271
-16395
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
12-
- uses: actions/setup-node@v2
11+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
12+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1313
with:
1414
node-version: '16'
1515
- name: Cache Node.js modules
16-
uses: actions/cache@v2
16+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
1717
with:
1818
path: ~/.npm
1919
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}

README.adoc

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,37 @@
99
:url-antora-docs: https://docs.antora.org
1010
:url-git: https://git-scm.com
1111
:url-git-dl: {url-git}/downloads
12-
:url-gulp: http://gulpjs.com
1312
:url-opendevise: https://opendevise.com
1413
:url-nodejs: https://nodejs.org
1514
:url-nvm: https://github.com/creationix/nvm
1615
:url-nvm-install: {url-nvm}#installation
1716
:url-source-maps: https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Use_a_source_map
1817

19-
This project is the UI template used on {url-stackable-docs}[the Stackable docs]. It is based on the {url-default-ui}[Antora default UI]. As intended, this repository is forked from the default UI and customized to our needs. The document below contains information about this repo, but consult the default UI README as well for additional useful information.
18+
This project is the UI template used on {url-stackable-docs}[the Stackable docs].
19+
It is based on (forked from) the {url-default-ui}[Antora default UI] and customized to our needs.
20+
The document below contains information about this repo, but consult the default UI README as well for additional useful information.
2021

2122
== Quickstart
2223

23-
`npm` is required. We recommend `nvm` to install `npm`, see the Default UI README for instructions on how to install it.
24+
=== Prerequisites
2425

25-
Run
26+
To preview and bundle the default UI, you need the following software on your computer:
2627

28+
* {url-git}[git] (command: `git`)
29+
* {url-nodejs}[Node.js] (commands: `node` and `npm`)
30+
31+
== Build process
32+
33+
The UI is built with Gulp.
34+
Linting, bundling, and previewing are supported.
35+
This repository is referenced as a submodule in the documentation repository, and the bundling takes place there.
36+
37+
To create a bundle run:
2738
[source,js]
2839
npm ci
2940
npm run bundle
3041

31-
to create a bundle. It will be created in `build/ui-bundle.zip`
42+
It will be created in `build/ui-bundle.zip`
3243

3344
== Project structure
3445

@@ -43,15 +54,13 @@ Inside the `src` directory are:
4354
* `layouts`: TODO
4455
* `partials`: Contains all the Handlebars files. This is the directory containing all the templated HTML for the site.
4556

46-
== Build process
47-
48-
The UI is built with Gulp. Linting, bundling and previewing is supported. This repository is referenced as a submodule in the documentation repository and the bundling takes place there.
49-
5057
=== Gulp
5158

52-
To work on the build process of this, you need to understand [gulp](https://gulpjs.com/docs/en/getting-started/javascript-and-gulpfiles). Gulp is a builder/bundler that is used to package this antora UI.
59+
To work on the build process of this, you need to understand [gulp](https://gulpjs.com/docs/en/getting-started/javascript-and-gulpfiles).
60+
Gulp is a builder/bundler that is used to package this antora UI.
5361

54-
In this project, `gulpfile.js` is the main entrypoint for gulp. This file references tasks in the `gulp.d` directory.
62+
In this project, `gulpfile.js` is the main entrypoint for gulp.
63+
This file references tasks in the `gulp.d` directory.
5564

5665
You don't need to install the `gulp` CLI yourself, you can call package scripts (i.e. `npm run bundle` which will then call `gulp` from the `node_modules`)
5766

@@ -66,12 +75,14 @@ ui:
6675

6776
=== Previewing the UI during development
6877

69-
It is useful to be able to see changes quickly while working on the UI. To start the preview at http://localhost:5252, run `npm run preview`.
78+
It is useful to be able to see changes quickly while working on the UI.
79+
To start the preview at http://localhost:5252, run `npm run preview`.
7080
Press kbd:[Ctrl+C] to stop the preview server and end the continuous build.
7181

7282
==== How it works
7383

74-
The `preview-src` directory contains dummy docs content which will be used to render the UI templates. The `ui-model.yml` contains dummy information similar to the antora-playbook.yaml.
84+
The `preview-src` directory contains dummy docs content, which will be used to render the UI templates.
85+
The `ui-model.yml` contains dummy information similar to the antora-playbook.yaml.
7586

7687
== Notes on our Customized Version
7788

@@ -81,6 +92,12 @@ We have added our own tracking solution into `src/partials/head-scripts.hbs`. It
8192
=== Highlight.js v10
8293
[Ticket](https://github.com/stackabletech/documentation/issues/232) - Due to the removal of HTML-passthru in v11 (which we need for [Callouts](https://docs.asciidoctor.org/asciidoc/latest/verbatim/callouts/)) the highlight.js has not been updated from v10. This also affects the Antora Default UI. Both decisions will be revisited when the upstream upgrade is available.
8394

95+
=== Search with pagefind
96+
We use https://pagefind.app/[pagefind] for search.
97+
The index is generated as part of the build in the `documentation` repository.
98+
Various `pagefind-*` tags are used to mark content that should be indexed.
99+
Only the stable docs are indexed (no previous versions, no nightly).
100+
84101
== Copyright and License
85102

86103
Copyright (C) 2017-present OpenDevise Inc. and the Antora Project.

gulp.d/tasks/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = (src, dest, preview) => () => {
3737
}),
3838
postcssUrl([
3939
{
40-
filter: '**/~typeface-*/files/*',
40+
filter: '**/~@fontsource/*/files/*',
4141
url: (asset) => {
4242
const relpath = asset.pathname.substr(1)
4343
const abspath = require.resolve(relpath)

0 commit comments

Comments
 (0)