update package lock

.gitea/workflows/build-and-pubilsh.yaml

@@ -2,7 +2,12 @@
 name: Build and publish container images
 
 on:
-- workflow_dispatch
+  workflow_dispatch:
+    inputs:
+      version:
+        type: string
+        description: Semver to publish (e.g. "<major>.<minor>.<patch>")
+        required: true
 
 jobs:
   build-and-publish:
@@ -26,6 +31,24 @@ jobs:
         username: ${{ secrets.REGISTRY_USER }}
         password: ${{ secrets.REGISTRY_TOKEN }}
 
+    - name: Parse Semver Tag String
+      id: semver
+      shell: bash
+      env:
+        version_str: ${{ inputs.version }}
+      run: |
+        if egrep '^[0-9]+\.[0-9]+\.[0-9]+$' <<<"$version_str" >/dev/null 2>&1 ; then
+          n=${version_str//[!0-9]/ }
+          a=(${n//\./ })
+
+          echo "major=${a[0]}" >> $GITHUB_OUTPUT
+          echo "minor=${a[1]}" >> $GITHUB_OUTPUT
+          echo "patch=${a[2]}" >> $GITHUB_OUTPUT
+        else
+          echo 'Invalid semver version given'
+          exit 1
+        fi
+
     - name: Build Container and publish
       uses: docker/build-push-action@v4
       env:
@@ -36,9 +59,9 @@ jobs:
         push: true
         tags: |
           gitea.jbrumond.me/doc-utils/utils:latest
-          gitea.jbrumond.me/doc-utils/utils:0.2.0
+          gitea.jbrumond.me/doc-utils/utils:${{ steps.semver.outputs.major }}.${{ steps.semver.outputs.minor }}.${{ steps.semver.outputs.patch }}
-          gitea.jbrumond.me/doc-utils/utils:0.2
+          gitea.jbrumond.me/doc-utils/utils:${{ steps.semver.outputs.major }}.${{ steps.semver.outputs.minor }}
-          gitea.jbrumond.me/doc-utils/utils:0
+          gitea.jbrumond.me/doc-utils/utils:${{ steps.semver.outputs.major }}
         platforms: |
           linux/amd64
           linux/arm64
@@ -46,7 +69,7 @@ jobs:
         # linux/arm/v7
         # linux/arm/v6
         build-args: |
-          NODE_VERSION=20
+          NODE_VERSION=22
         secrets: |
           "npmrc=@doc-utils:registry=https://gitea.jbrumond.me/api/packages/doc-utils/npm/
           //gitea.jbrumond.me/api/packages/doc-utils/npm/:_authToken=${{ secrets.NPM_TOKEN }}"

.gitea/workflows/build.yaml

@@ -2,6 +2,7 @@
 name: Build container images
 
 on:
+  workflow_dispatch: { }
   push:
     branches:
     - master

Dockerfile

@@ -20,4 +20,5 @@ RUN ln -s /doc-utils/node_modules/@doc-utils/jsonschema2markdown/bin/jsonschema2
 RUN ln -s /doc-utils/node_modules/@doc-utils/markdown2html/bin/markdown2html /bin/markdown2html
 RUN ln -s /doc-utils/node_modules/@doc-utils/markdown2html/bin/strip-frontmatter /bin/strip-frontmatter
 
+WORKDIR /workspace
 ENTRYPOINT [ "/bin/bash", "-l", "-c" ]

package-lock.json

@@ -6,9 +6,9 @@
     "": {
       "dependencies": {
         "@doc-utils/color-themes": "^0.2.0",
-        "@doc-utils/docs2website": "^0.1.6",
+        "@doc-utils/docs2website": "^0.2.1",
         "@doc-utils/jsonschema2markdown": "^0.1.1",
-        "@doc-utils/markdown2html": "^0.3.4"
+        "@doc-utils/markdown2html": "^0.3.6"
       }
     },
     "node_modules/@doc-utils/color-themes": {
@@ -17,13 +17,13 @@
       "integrity": "sha512-UtjY25B8m4qdMvrmTPK3I1JXckbc1cvCOmIygHFBexpSWBQmb+sdoXfdCsoSpgPncurz1kwlEXffgPELCGtP8g=="
     },
     "node_modules/@doc-utils/docs2website": {
-      "version": "0.1.6",
+      "version": "0.2.1",
-      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fdocs2website/-/0.1.6/docs2website-0.1.6.tgz",
+      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fdocs2website/-/0.2.1/docs2website-0.2.1.tgz",
-      "integrity": "sha512-1lEXuNYs+mR5biiGEP+CQkRvq0ggH06ftAid1pG78/aVmTgR+VHoJlR+MoP2UDyzmNtxLG45xBAnnxwRZ8U/OA==",
+      "integrity": "sha512-6goqNgKGz4wBc5UK3y11Bs4IJpLj16hRpA6cEMYVoDSlHNHFyytkjXc6YvpTSvJyqsqOCkcNkT80WN8zc3ERRA==",
       "dependencies": {
-        "@doc-utils/color-themes": "^0.1.14",
+        "@doc-utils/color-themes": "^0.2.0",
         "@doc-utils/jsonschema2markdown": "^0.1.1",
-        "@doc-utils/markdown2html": "^0.2.1",
+        "@doc-utils/markdown2html": "^0.3.6",
         "glob": "^10.2.3",
         "ical": "^0.8.0",
         "ical-generator": "^4.1.0",
@@ -31,29 +31,9 @@
         "mustache": "^4.2.0",
         "xmlbuilder2": "^3.1.1",
         "yaml": "^2.2.2"
-      }
+      },
-    },
+      "bin": {
-    "node_modules/@doc-utils/docs2website/node_modules/@doc-utils/color-themes": {
+        "docs2website": "bin/docs2website"
-      "version": "0.1.16",
-      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fcolor-themes/-/0.1.16/color-themes-0.1.16.tgz",
-      "integrity": "sha512-6H0clUE0+mRQXbAHLinLSg8YfG3KkZ9zRhbngUtpwPbUHVt9WrnMkmT9rg2VXb+C+35oM6bRPX3QcJxmZESoLw=="
-    },
-    "node_modules/@doc-utils/docs2website/node_modules/@doc-utils/markdown2html": {
-      "version": "0.2.6",
-      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fmarkdown2html/-/0.2.6/markdown2html-0.2.6.tgz",
-      "integrity": "sha512-6cQNzthYOOlkT6rr6E1lpSJ4Zq991+chblSRxv69SVT8y5cIs6c9tFu75MXoIKX4+H68Q4i10gtMrrsXD+bkaA==",
-      "dependencies": {
-        "bytefield-svg": "^1.6.1",
-        "dompurify": "^2.3.6",
-        "jsdom": "^20.0.1",
-        "katex": "^0.16.7",
-        "marked": "^5.0.2",
-        "nomnoml": "^1.5.2",
-        "pikchr": "^0.0.5",
-        "prismjs": "^1.29.0",
-        "qrcode": "^1.5.1",
-        "vega": "^5.22.1",
-        "yaml": "^2.2.2"
       }
     },
     "node_modules/@doc-utils/jsonschema2markdown": {
@@ -70,9 +50,9 @@
       }
     },
     "node_modules/@doc-utils/markdown2html": {
-      "version": "0.3.4",
+      "version": "0.3.6",
-      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fmarkdown2html/-/0.3.4/markdown2html-0.3.4.tgz",
+      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fmarkdown2html/-/0.3.6/markdown2html-0.3.6.tgz",
-      "integrity": "sha512-zL3kay/zbrBJWGKIxGCyF+EXsafSxY1aN+miG+GOyml1neoOwd67vNIiE96KuEucf6rvuICPiYTjm3uJxkjd/g==",
+      "integrity": "sha512-LCt5HAAcHz6lE+IqV2igQP7bbTq1juNbyn4KWqn3xe9eSslIyl7EvSaEH68WQtqEzX/iVFOvZz7qSoqsQeggXA==",
       "dependencies": {
         "bytefield-svg": "^1.6.1",
         "dompurify": "^2.3.6",
@@ -2610,13 +2590,13 @@
       "integrity": "sha512-UtjY25B8m4qdMvrmTPK3I1JXckbc1cvCOmIygHFBexpSWBQmb+sdoXfdCsoSpgPncurz1kwlEXffgPELCGtP8g=="
     },
     "@doc-utils/docs2website": {
-      "version": "0.1.6",
+      "version": "0.2.1",
-      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fdocs2website/-/0.1.6/docs2website-0.1.6.tgz",
+      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fdocs2website/-/0.2.1/docs2website-0.2.1.tgz",
-      "integrity": "sha512-1lEXuNYs+mR5biiGEP+CQkRvq0ggH06ftAid1pG78/aVmTgR+VHoJlR+MoP2UDyzmNtxLG45xBAnnxwRZ8U/OA==",
+      "integrity": "sha512-6goqNgKGz4wBc5UK3y11Bs4IJpLj16hRpA6cEMYVoDSlHNHFyytkjXc6YvpTSvJyqsqOCkcNkT80WN8zc3ERRA==",
       "requires": {
-        "@doc-utils/color-themes": "^0.1.14",
+        "@doc-utils/color-themes": "^0.2.0",
         "@doc-utils/jsonschema2markdown": "^0.1.1",
-        "@doc-utils/markdown2html": "^0.2.1",
+        "@doc-utils/markdown2html": "^0.3.6",
         "glob": "^10.2.3",
         "ical": "^0.8.0",
         "ical-generator": "^4.1.0",
@@ -2624,31 +2604,6 @@
         "mustache": "^4.2.0",
         "xmlbuilder2": "^3.1.1",
         "yaml": "^2.2.2"
-      },
-      "dependencies": {
-        "@doc-utils/color-themes": {
-          "version": "0.1.16",
-          "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fcolor-themes/-/0.1.16/color-themes-0.1.16.tgz",
-          "integrity": "sha512-6H0clUE0+mRQXbAHLinLSg8YfG3KkZ9zRhbngUtpwPbUHVt9WrnMkmT9rg2VXb+C+35oM6bRPX3QcJxmZESoLw=="
-        },
-        "@doc-utils/markdown2html": {
-          "version": "0.2.6",
-          "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fmarkdown2html/-/0.2.6/markdown2html-0.2.6.tgz",
-          "integrity": "sha512-6cQNzthYOOlkT6rr6E1lpSJ4Zq991+chblSRxv69SVT8y5cIs6c9tFu75MXoIKX4+H68Q4i10gtMrrsXD+bkaA==",
-          "requires": {
-            "bytefield-svg": "^1.6.1",
-            "dompurify": "^2.3.6",
-            "jsdom": "^20.0.1",
-            "katex": "^0.16.7",
-            "marked": "^5.0.2",
-            "nomnoml": "^1.5.2",
-            "pikchr": "^0.0.5",
-            "prismjs": "^1.29.0",
-            "qrcode": "^1.5.1",
-            "vega": "^5.22.1",
-            "yaml": "^2.2.2"
-          }
-        }
       }
     },
     "@doc-utils/jsonschema2markdown": {
@@ -2665,9 +2620,9 @@
       }
     },
     "@doc-utils/markdown2html": {
-      "version": "0.3.4",
+      "version": "0.3.6",
-      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fmarkdown2html/-/0.3.4/markdown2html-0.3.4.tgz",
+      "resolved": "https://gitea.jbrumond.me/api/packages/doc-utils/npm/%40doc-utils%2Fmarkdown2html/-/0.3.6/markdown2html-0.3.6.tgz",
-      "integrity": "sha512-zL3kay/zbrBJWGKIxGCyF+EXsafSxY1aN+miG+GOyml1neoOwd67vNIiE96KuEucf6rvuICPiYTjm3uJxkjd/g==",
+      "integrity": "sha512-LCt5HAAcHz6lE+IqV2igQP7bbTq1juNbyn4KWqn3xe9eSslIyl7EvSaEH68WQtqEzX/iVFOvZz7qSoqsQeggXA==",
       "requires": {
         "bytefield-svg": "^1.6.1",
         "dompurify": "^2.3.6",

package.json

@@ -2,8 +2,8 @@
   "private": true,
   "dependencies": {
     "@doc-utils/color-themes": "^0.2.0",
-    "@doc-utils/docs2website": "^0.1.6",
+    "@doc-utils/docs2website": "^0.2.1",
     "@doc-utils/jsonschema2markdown": "^0.1.1",
-    "@doc-utils/markdown2html": "^0.3.4"
+    "@doc-utils/markdown2html": "^0.3.6"
   }
 }