@leverege/build-tools 2.58.3 → 2.58.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.58.3",
+  "version": "2.58.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -62,7 +62,7 @@
     "@google-cloud/artifact-registry": "^3.5.0",
     "@leverege/jsdoc-template": "^1.0.1",
     "ansi-colors": "^4.1.3",
-    "chalk": "^5.3.0",
+    "chalk": "^5.4.1",
     "command-line-args": "^6.0.1",
     "command-line-usage": "^7.0.3",
     "deepmerge": "^4.3.1",
@@ -70,7 +70,7 @@
     "execa": "^9.5.2",
     "glob": "^11.0.0",
     "handlebars": "^4.7.8",
-    "inquirer": "^12.2.0",
+    "inquirer": "^12.3.0",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.4",
     "ms": "^2.1.3",
@@ -85,6 +85,6 @@
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^10.9.2"
+    "npm": "^11.0.0"
   }
 }

package/src/Utils.mjs

@@ -9,6 +9,10 @@ import { glob } from 'glob'
 import { packageUp } from 'package-up'
 import YAML from 'js-yaml'
 
+// __dirname goes away with ESM so we take this approach instead and
+// this assumes this file lives in the src dir of the build-tools repo
+export const BUILD_TOOLS_ROOT = path.dirname( url.fileURLToPath( import.meta.url ) )
+
 let debugEnabled = process.env.BUILD_TOOLS_DEBUG === '1'
 
 export const enableDebug = () => { debugEnabled = true }
@@ -38,21 +42,6 @@ export const errorExit = ( error, opts = { errorCode : 1 } ) => {
 }
 /* eslint-enable no-console */
 
-const getFilename = () => {
-  const filename = url.fileURLToPath( import.meta.url )
-  return filename
-}
-
-const getDirname = () => {
-  const dirname = path.dirname( getFilename() )
-  return dirname
-}
-
-// because __dirname goes away with ESM
-export const getSourceTop = () => {
-  return getDirname()
-}
-
 export const isHex = ( hex ) => {
   return hex instanceof Buffer || /^[0-9a-f]+$/i.test( hex )
 }

package/src/circleate.sh

@@ -128,7 +128,7 @@ jobs:
           at: ~/project
       - run:
           name: Generate docs
-          command: npx jsdoc -r src -R README.md -d docs
+          command: npm run docs
       - store_artifacts:
           path: docs
           prefix: docs

package/src/generate-docs-conf.json

@@ -10,6 +10,7 @@
   "templates": {
     "cleverLinks": true,
     "monospaceLinks": false,
+    "preserveDescriptions": true,
     "default": {
       "useLongnameInNav": true,
       "outputSourceFiles": false
@@ -18,7 +19,8 @@
   "opts": {
     "template": "node_modules/@leverege/jsdoc-template",
     "encoding": "utf8",
-    "lenient": false
+    "lenient": false,
+    "markdown": true
   },
   "docdash": {
     "static": true,
@@ -30,10 +32,10 @@
     "scripts": [],
     "menu":{
       "Bitbucket": {
-	"href":"https://bitbucket.org/leverege/IF_THIS_MAKES_SENSE",
-	"target":"_blank",
-	"class":"menu-item",
-	"id":"repository"
+        "href":"https://bitbucket.org/leverege/IF_THIS_MAKES_SENSE",
+        "target":"_blank",
+        "class":"menu-item",
+        "id":"repository"
       }
     }
   }

package/src/generate-docs.mjs

@@ -7,23 +7,39 @@
  *   npx --package=jsdoc-to-markdown jsdoc2md --files src/*.js --configure ./jsdoc.json > docs/md/API.md
  *
  */
+import fs from 'node:fs'
+
 import {
-  condir,
+  BUILD_TOOLS_ROOT,
   debug,
+  err,
   getRepositoryDescr,
-  getSourceTop,
-  log,
   shellCmd,
 } from './Utils.mjs'
 
+const jsdocConfig = `${BUILD_TOOLS_ROOT}/generate-docs-conf.json`
 
-const jsdocTemplate = `${getSourceTop()}/jsdoc-template`
-const jsdocConfig = `${jsdocTemplate}/jsdoc.json`
+if ( !fs.existsSync( jsdocConfig ) ) { // eslint-disable-line security/detect-non-literal-fs-filename
+  err( `cannot find the jsdoc config file: ${jsdocConfig}` )
+  process.exit( 1 )
+}
 
 const repoDescr = await getRepositoryDescr()
 
-condir( { jsdocTemplate, jsdocConfig, repoDescr }, '<==The Repo' )
+debug( { jsdocConfig, repoDescr }, '<==The Repo' )
+
+// blow away any existing docs before recreating the docs dir
+if ( fs.existsSync( 'docs' ) ) {
+  fs.rmSync( 'docs', { recursive : true } )
+}
+fs.mkdirSync( 'docs/md', { recursive : true } )
 
-await shellCmd( `npx jsdoc -c ${jsdocConfig} -R README.md -d docs src` )
-await shellCmd( 'mkdir -p docs/md' )
-await shellCmd( `npx --package=jsdoc-to-markdown jsdoc2md --files src/*.js --configure ./jsdoc.json`, { stdout : { file : 'docs/md/API.md' } } )
+try {
+  await shellCmd( `npx --yes jsdoc -c ${jsdocConfig} -R README.md -d docs src` )
+  await shellCmd(
+    `npx --yes --package=jsdoc-to-markdown jsdoc2md --files src/*.js --configure ${jsdocConfig}`,
+    { stdout : { file : 'docs/md/API.md' } }
+  )
+} catch ( error ) {
+  err( error )
+}

package/src/helm-charts/prom-operator/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "The Prometheus Operator and Components"
 addHelmRepo prometheus-community https://prometheus-community.github.io/helm-charts
 
 showInstalling "The Prometheus Operator (kube-prometheus-stack)"
-[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="66"
+[ -z "$PROMETHEUS_STACK_CHART_VERSION" ] && PROMETHEUS_STACK_CHART_VERSION="67"
 
 NS="--namespace prometheus"