From 3db6f15a514969b862e8860dd4f97d11fafef1d0 Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Tue, 6 Jun 2023 08:39:43 +0100 Subject: [PATCH 1/4] AV-55075 update tab striping --- antora-playbook.yml | 2 ++ package-lock.json | 14 ++++++++++++++ package.json | 1 + 3 files changed, 17 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index fbe150e18d..658f399783 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -164,6 +164,7 @@ asciidoc: idprefix: '@' idseparator: '-@' tabs: tabs + tabs-sync-option: true toc: ~ page-toclevels: 1@ xrefstyle: short @@ -190,6 +191,7 @@ asciidoc: - ./lib/template-block.js - asciidoctor-kroki - asciidoctor-external-callout + - '@asciidoctor/tabs' ui: bundle: url: https://github.com/couchbase/docs-ui/releases/download/prod-166/ui-bundle.zip diff --git a/package-lock.json b/package-lock.json index 2238d8c2a4..12f9c28ca0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "name": "docs-site", "dependencies": { "@antora/site-generator-ms": "git+https://gitlab.com/opendevise/oss/antora-site-generator-ms#as-extension", + "@asciidoctor/tabs": "^1.0.0-beta.5", "antora": "~3.1", "asciidoctor-external-callout": "~1.2.0", "asciidoctor-kroki": "0.15.4", @@ -217,6 +218,14 @@ "yarn": ">=1.1.0" } }, + "node_modules/@asciidoctor/tabs": { + "version": "1.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@asciidoctor/tabs/-/tabs-1.0.0-beta.5.tgz", + "integrity": "sha512-DwtBO2BfqTyCrbP019c2AWlF+DvK5Q59mEEaAkDp9pdaFLeAyzDc1ZR4D5IYUGL3i9Ms9gCpeHDX+Sp6zNjb8Q==", + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/@iarna/toml": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", @@ -6038,6 +6047,11 @@ "unxhr": "1.0.1" } }, + "@asciidoctor/tabs": { + "version": "1.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@asciidoctor/tabs/-/tabs-1.0.0-beta.5.tgz", + "integrity": "sha512-DwtBO2BfqTyCrbP019c2AWlF+DvK5Q59mEEaAkDp9pdaFLeAyzDc1ZR4D5IYUGL3i9Ms9gCpeHDX+Sp6zNjb8Q==" + }, "@iarna/toml": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", diff --git a/package.json b/package.json index 6e79ad253d..ea92466761 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dependencies": { "antora": "~3.1", "@antora/site-generator-ms": "git+https://gitlab.com/opendevise/oss/antora-site-generator-ms#as-extension", + "@asciidoctor/tabs": "^1.0.0-beta.5", "asciidoctor-external-callout": "~1.2.0", "asciidoctor-kroki": "0.15.4", "gulp": "~4.0", From 962486f9fb1647384caa31832d6282474ba7fe58 Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Tue, 6 Jun 2023 13:32:59 +0100 Subject: [PATCH 2/4] AV-55075 ui and yarn install --- Dockerfile.jenkins | 1 + antora-playbook.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index f7db8d6326..ec01ef8b2c 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -9,6 +9,7 @@ RUN addgroup -g $GROUP_ID jenkins && \ yarn global add --ignore-optional --silent git+https://gitlab.com/opendevise/oss/antora-site-generator-ms#as-extension && \ yarn global add --ignore-optional --silent asciidoctor-kroki && \ yarn global add --ignore-optional --silent asciidoctor-external-callout && \ + yarn global add --ignore-optional --silent https://yarn.pm/@asciidoctor/tabs && \ yarn global add --ignore-optional --silent markdown-it && \ yarn global add --ignore-optional --silent yaml && \ apk add --no-cache --quiet --virtual .build-deps py3-pip && \ diff --git a/antora-playbook.yml b/antora-playbook.yml index 658f399783..97141f37d6 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -194,6 +194,6 @@ asciidoc: - '@asciidoctor/tabs' ui: bundle: - url: https://github.com/couchbase/docs-ui/releases/download/prod-166/ui-bundle.zip + url: https://github.com/couchbase/docs-ui/releases/download/prod-167/ui-bundle.zip output: dir: ./public From 49e365ef4009c9cde1d68091d9ff5004d936f4dc Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Tue, 6 Jun 2023 15:30:42 +0100 Subject: [PATCH 3/4] fix Yarn parameter --- Dockerfile.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins index ec01ef8b2c..0dac7eb28a 100644 --- a/Dockerfile.jenkins +++ b/Dockerfile.jenkins @@ -9,7 +9,7 @@ RUN addgroup -g $GROUP_ID jenkins && \ yarn global add --ignore-optional --silent git+https://gitlab.com/opendevise/oss/antora-site-generator-ms#as-extension && \ yarn global add --ignore-optional --silent asciidoctor-kroki && \ yarn global add --ignore-optional --silent asciidoctor-external-callout && \ - yarn global add --ignore-optional --silent https://yarn.pm/@asciidoctor/tabs && \ + yarn global add --ignore-optional --silent @asciidoctor/tabs && \ yarn global add --ignore-optional --silent markdown-it && \ yarn global add --ignore-optional --silent yaml && \ apk add --no-cache --quiet --virtual .build-deps py3-pip && \ From 5cacdc1f9c36d84d831a1bf8825aabeb95888aa7 Mon Sep 17 00:00:00 2001 From: Hakim Cassimally Date: Wed, 7 Jun 2023 11:55:58 +0100 Subject: [PATCH 4/4] PR tweaks --- antora-playbook.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 97141f37d6..a3ce5414d2 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -164,7 +164,7 @@ asciidoc: idprefix: '@' idseparator: '-@' tabs: tabs - tabs-sync-option: true + tabs-sync-option: '' toc: ~ page-toclevels: 1@ xrefstyle: short diff --git a/package.json b/package.json index ea92466761..0aa9d199ce 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "dependencies": { "antora": "~3.1", "@antora/site-generator-ms": "git+https://gitlab.com/opendevise/oss/antora-site-generator-ms#as-extension", - "@asciidoctor/tabs": "^1.0.0-beta.5", + "@asciidoctor/tabs": "1.0.0-beta.5", "asciidoctor-external-callout": "~1.2.0", "asciidoctor-kroki": "0.15.4", "gulp": "~4.0",