@forsakringskassan/docs-generator 1.30.1 → 1.30.2

package/dist/index.js

@@ -2159,7 +2159,12 @@ async function getGitBranch() {
   }
 }
 function getPullRequestID() {
-  return process.env.JOB_BASE_NAME;
+  if (process.env.JOB_BASE_NAME) {
+    const name = process.env.JOB_BASE_NAME;
+    const match = name.match(/PR-(\d+)/);
+    return match ? match[1] : void 0;
+  }
+  return void 0;
 }
 async function getSCMData(pkg, options) {
   const commitHash = await run(`git rev-parse HEAD`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forsakringskassan/docs-generator",
-  "version": "1.30.1",
+  "version": "1.30.2",
   "description": "Documentation generator",
   "keywords": [
     "documentation"

package/templates/macro/scm-info.njk.html

@@ -0,0 +1,5 @@
+{%- macro scmInfo(build, scm) -%}
+        {{ scm.branch }} (<a href="{{ scm.commitUrl }}">{{ scm.commitShort }}</a>)<br />
+        {% if scm.pr %}<a href="{{ scm.prUrl }}">PR {{ scm.pr }}</a><br />{% endif %}
+        {{ build.date }} {{ build.time }}
+{%- endmacro -%}

package/templates/partials/version.njk.html

@@ -1,13 +1,9 @@
-{%- macro scmInfo(scm) -%}
-        {% if scm.pr %}<a href="{{ scm.prUrl }}">PR {{ scm.pr }}</a>{% endif %}
-        {{ scm.branch }} (<a href="{{ scm.commitUrl }}">{{ scm.commitShort }}</a>)<br />
-        {{ build.date }} {{ build.time }}
-{%- endmacro -%}
+{% from "macro/scm-info.njk.html" import scmInfo -%}
 
 <div class="toolbar__item">
     <span class="version">
         {% if scm -%}
-            {{ scmInfo(scm) }}
+            {{ scmInfo(build, scm) }}
         {%- else -%}
             {{ pkg.version }}
         {%- endif %}