@teipublisher/pb-components 3.6.4 → 3.6.5

package/.github/workflows/node.js.yml

@@ -27,6 +27,13 @@ jobs:
         run:
           npm ci
           npm run build:production
+      - name: Set up Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 11
+      - name: Generate tei-publisher app with Jinks
+        run: ci/setup-tei-publisher-app.sh
       - name: Build docker image
         run: docker build -t exist-db -f Dockerfile .
       - name: Start docker image
@@ -57,6 +64,13 @@ jobs:
         run:
           npm ci
           npm run build:production
+      - name: Set up Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 11
+      - name: Generate tei-publisher app with Jinks
+        run: ci/setup-tei-publisher-app.sh
       - name: Build docker image
         run: docker build -t exist-db -f Dockerfile .
       - name: Start docker image

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [3.6.5](https://github.com/eeditiones/tei-publisher-components/compare/v3.6.4...v3.6.5) (2026-07-14)
+
+
+### Bug Fixes
+
+* **pb-page:** detect API version via /api/version on Jinks apps ([ee074fd](https://github.com/eeditiones/tei-publisher-components/commit/ee074fd6fd730ee059e1c440ee5db265b16129ec))
+* **pb-view,pb-grid:** state management: preserve current page/chapter when creating new pb-view ([f86779f](https://github.com/eeditiones/tei-publisher-components/commit/f86779f5ad30c73f7266e2cbe22cba399e297630))
+
 ## [3.6.4](https://github.com/eeditiones/tei-publisher-components/compare/v3.6.3...v3.6.4) (2026-07-03)
 
 

package/Dockerfile

@@ -1,52 +1,63 @@
 ARG EXIST_VERSION=release
 ARG BUILD=local
-ARG PUBLISHER_VERSION=9.1.1
+ARG ROUTER_VERSION=1.12.1
 
 # START STAGE 1
 FROM ghcr.io/eeditiones/builder:latest AS builder
 
-ARG ROUTER_VERSION=1.10.0
-ARG PUBLISHER_VERSION
+ARG ROUTER_VERSION
 
-# Build tei-publisher-app
-RUN  git clone https://github.com/eeditiones/tei-publisher-app.git \
-    && cd tei-publisher-app \
-    && git checkout v${PUBLISHER_VERSION} \
-    # if you prefer to have webcomponents included locally, comment out following line and
-    # enable the ones below
-    && sed -i 's/$config:webcomponents :=.*;/$config:webcomponents := "local";/' modules/config.xqm \
-    && ant -Dnpm=npm xar-local
+WORKDIR /tmp
+
+# Build EXPATH dependencies required by the generated tei-publisher app
+RUN git clone --depth 1 https://github.com/eeditiones/jinks-templates.git \
+    && cd jinks-templates \
+    && ant
 
+RUN git clone --depth 1 https://github.com/eeditiones/tei-publisher-lib.git \
+    && cd tei-publisher-lib \
+    && ant
+
+# tei-publisher-app XAR is generated before docker build by ci/setup-tei-publisher-app.sh
+# using Jinks main + ci/tp_config.json (see .github/workflows/node.js.yml).
+COPY tei-publisher-app/tei-publisher.xar /tmp/tei-publisher.xar
+RUN mkdir -p tei-publisher-app \
+    && cd tei-publisher-app \
+    && jar xf /tmp/tei-publisher.xar \
+    && mkdir -p resources/lib resources/scripts resources/i18n/common
 WORKDIR /tmp/tei-publisher-app
 
+# Inject the webcomponents built in this repo (tp_config.json sets script.webcomponents=local)
+COPY dist/*.js resources/lib/
 COPY dist/*.js resources/scripts/
 COPY i18n/common/* resources/i18n/common/
 
-RUN ant
+RUN ant xar
 
 WORKDIR /tmp
 
 ADD http://exist-db.org/exist/apps/public-repo/public/roaster-${ROUTER_VERSION}.xar 001.xar
-ADD https://github.com/eeditiones/tei-publisher-lib/releases/latest/download/tei-publisher-lib.xar 002.xar
 
 FROM duncdrum/existdb:${EXIST_VERSION} AS build_local
 
 ARG USR=root
 USER ${USR}
 
-ONBUILD COPY --from=builder /tmp/tei-publisher-app/build/*.xar /exist/autodeploy/
 ONBUILD COPY --from=builder /tmp/*.xar /exist/autodeploy/
+ONBUILD COPY --from=builder /tmp/jinks-templates/build/*.xar /exist/autodeploy/004.xar
+ONBUILD COPY --from=builder /tmp/tei-publisher-lib/build/*.xar /exist/autodeploy/005.xar
+ONBUILD COPY --from=builder /tmp/tei-publisher-app/build/*.xar /exist/autodeploy/006.xar
 
 # TODO(DP): Tagging scheme add EXIST_VERSION to the tag
-FROM  ghcr.io/jinntec/base:main AS build_prod
+FROM ghcr.io/jinntec/base:main AS build_prod
 
 ARG USR=nonroot
 USER ${USR}
 
-# Copy EXPATH dependencies
-ONBUILD COPY --from=builder --chown=${USR} /tmp/tei-publisher-app/build/*.xar /exist/autodeploy/
-ONBUILD COPY --from=builder --chown=${USR} /tmp/*.xar /exist/autodeploy/
-
+ONBUILD COPY --from=builder /tmp/*.xar /exist/autodeploy/
+ONBUILD COPY --from=builder /tmp/jinks-templates/build/*.xar /exist/autodeploy/004.xar
+ONBUILD COPY --from=builder /tmp/tei-publisher-lib/build/*.xar /exist/autodeploy/005.xar
+ONBUILD COPY --from=builder /tmp/tei-publisher-app/build/*.xar /exist/autodeploy/006.xar
 
 FROM build_${BUILD}
 
@@ -55,8 +66,6 @@ USER ${USR}
 
 WORKDIR /exist
 
-# ARG ADMIN_PASS=none
-
 ARG CACHE_MEM
 ARG MAX_BROKER
 ARG JVM_MAX_RAM_PERCENTAGE
@@ -72,26 +81,6 @@ ENV JDK_JAVA_OPTIONS="\
     -Dteipublisher.context-path=${CONTEXT_PATH} \
     -Dteipublisher.proxy-caching=${PROXY_CACHING}"
 
-# ENV JAVA_TOOL_OPTIONS="\
-#   -Dfile.encoding=UTF8 \
-#   -Dsun.jnu.encoding=UTF-8 \
-#   -Djava.awt.headless=true \
-#   -Dorg.exist.db-connection.cacheSize=${CACHE_MEM:-256}M \
-#   -Dorg.exist.db-connection.pool.max=${MAX_BROKER:-20} \
-#   -Dlog4j.configurationFile=/exist/etc/log4j2.xml \
-#   -Dexist.home=/exist \
-#   -Dexist.configurationFile=/exist/etc/conf.xml \
-#   -Djetty.home=/exist \
-#   -Dexist.jetty.config=/exist/etc/jetty/standard.enabled-jetty-configs \
-#   -Dteipublisher.ner-endpoint=${NER_ENDPOINT} \
-#   -Dteipublisher.context-path=${CONTEXT_PATH} \
-#   -Dteipublisher.proxy-caching=${PROXY_CACHING} \
-#   -XX:+UseG1GC \
-#   -XX:+UseStringDeduplication \
-#   -XX:+UseContainerSupport \
-#   -XX:MaxRAMPercentage=${JVM_MAX_RAM_PERCENTAGE:-75.0} \
-#   -XX:+ExitOnOutOfMemoryError"
-
 # pre-populate the database by launching it once and change default pw
 RUN [ "java", "org.exist.start.Main", "client", "--no-gui",  "-l", "-u", "admin", "-P", "" ]
 

package/ci/setup-tei-publisher-app.sh

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+# Generate tei-publisher-app with Jinks for CI and local Docker builds.
+# Uses the latest jinks main branch (profiles) and ci/tp_config.json.
+# Downloads the deployed app as a XAR (jinks update --sync only fetches changed
+# files, not the full Ant project including build.xml).
+set -euo pipefail
+
+JINKS_REF="${JINKS_REF:-main}"
+JINKS_IMAGE="${JINKS_IMAGE:-ghcr.io/eeditiones/jinks:latest}"
+JINKS_SERVER="${JINKS_SERVER:-http://localhost:8080/exist/apps/jinks}"
+CONTAINER_NAME="${JINKS_CONTAINER_NAME:-jinks-server-ci}"
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+APP_DIR="$ROOT/tei-publisher-app"
+JINKS_SRC="$(mktemp -d /tmp/jinks-src.XXXXXX)"
+
+cleanup() {
+  docker rm -f "$CONTAINER_NAME" 2>/dev/null || true
+  rm -rf "$JINKS_SRC"
+}
+trap cleanup EXIT
+
+if lsof -Pi :8080 -sTCP:LISTEN -t >/dev/null 2>&1; then
+  echo "Error: port 8080 is already in use. Stop the service or set JINKS_CONTAINER_NAME to use another setup."
+  lsof -Pi :8080 -sTCP:LISTEN
+  exit 1
+fi
+
+echo "Cloning jinks (${JINKS_REF})..."
+git clone --depth 1 -b "$JINKS_REF" https://github.com/eeditiones/jinks.git "$JINKS_SRC"
+echo "Building jinks XAR..."
+(cd "$JINKS_SRC" && ant)
+
+echo "Starting Jinks server (${JINKS_IMAGE})..."
+docker pull "$JINKS_IMAGE"
+docker run -d --name "$CONTAINER_NAME" -p 8080:8080 \
+  -v "$JINKS_SRC/build:/exist/autodeploy" \
+  "$JINKS_IMAGE"
+
+echo "Waiting for Jinks API..."
+for i in $(seq 1 120); do
+  if curl -sf "${JINKS_SERVER}/api/configurations" >/dev/null 2>&1; then
+    echo "Jinks is ready."
+    break
+  fi
+  if [ "$i" -eq 120 ]; then
+    echo "Timeout waiting for Jinks."
+    docker logs "$CONTAINER_NAME" 2>&1 | tail -50
+    exit 1
+  fi
+  sleep 2
+done
+
+echo "Creating tei-publisher app..."
+npx --yes @teipublisher/jinks-cli create -q -c "$ROOT/ci/tp_config.json" -s "$JINKS_SERVER"
+
+echo "Downloading tei-publisher app XAR..."
+rm -rf "$APP_DIR"
+mkdir -p "$APP_DIR"
+(
+  cd "$APP_DIR"
+  npx --yes @teipublisher/jinks-cli run tei-publisher download -s "$JINKS_SERVER"
+)
+
+if [ ! -f "$APP_DIR/tei-publisher.xar" ]; then
+  echo "Error: tei-publisher.xar was not downloaded."
+  ls -la "$APP_DIR"
+  exit 1
+fi
+
+echo "tei-publisher-app ready at ${APP_DIR}"

package/ci/tp_config.json

@@ -0,0 +1,31 @@
+{
+    "label": "TEI Publisher Documentation and Demo",
+    "id": "http://existsolutions.com/apps/tei-publisher",
+    "extends": [
+        "base10",
+        "markdown",
+        "demo-data",
+        "theme-base10",
+        "jats",
+        "docbook",
+        "iiif",
+        "playground",
+        "landing-page",
+        "docs",
+        "docker",
+        "ci",
+        "docx",
+        "upload"
+    ],
+    "version": "10.0.0",
+    "pkg": {
+        "abbrev": "tei-publisher"
+    },
+    "defaults": {
+        "site-root": "/exist/apps/tei-publisher"
+    },
+    "script": {
+        "webcomponents": "local"
+    },
+    "description": "TEI Publisher provides a flexible and sustainable toolbox which enables scholars with limited technical skills to publish their material without forcing it into a one-size-fits-all framework."
+}