@leverege/build-tools 2.59.0-beta.1 → 2.59.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.59.0-beta.1",
+  "version": "2.59.0-beta.3",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/Docker.mjs

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
-import * as path from 'node:path';
-import { fileURLToPath } from 'node:url';
+import path from 'node:path'
+import url from 'node:url'
 
 import chalk from 'chalk'
 import handlebars from 'handlebars'
@@ -15,8 +15,7 @@ import {
   warning
 } from './Utils.mjs'
 
-const __filename = fileURLToPath( import.meta.url )
-const __dirname = path.dirname( __filename )
+const DIRNAME = path.dirname( url.fileURLToPath( import.meta.url ) )
 
 // TODO: change default to node 22 (jod) after 01/01/25
 const dockerfileNodeVersion = process.env.USE_NODEJS_22 ? 'jod-alpine' : 'iron-alpine'
@@ -41,16 +40,16 @@ const pluginTemplate = `
 # footprints small, so adding packages "just because" is not considered
 # a best practice.
 `
-const dockerfileTemplate = fs.readFileSync( path.join( __dirname, './dockerfileTemplate.hbs' ), 'utf8' )
-const bashrcTemplate = fs.readFileSync( path.join( __dirname, './bashrcTemplate.hbs' ), 'utf8' )
-const cloudBuildSteps = fs.readFileSync( path.join( __dirname, './cloudBuildSteps.hbs' ), 'utf8' )
+const dockerfileTemplate = fs.readFileSync( path.join( DIRNAME, './templates/dockerfileTemplate.hbs' ), 'utf8' )
+const bashrcTemplate = fs.readFileSync( path.join( DIRNAME, './templates/bashrcTemplate.hbs' ), 'utf8' )
+const cloudBuildSteps = fs.readFileSync( path.join( DIRNAME, './templates/cloudBuildSteps.hbs' ), 'utf8' )
 
 const defaultSettings = {
   apkadds : '',
   date : getDateTimestamp(),
   nodeimage : process.env.USE_NODEJS_22 ? 'jod-alpine' : 'iron-alpine',
   imageBase : process.env.USE_NODEJS_22 ? 'node:jod-alpine' : 'node:iron-alpine',
-  npmlogging : process.env.VERBOSE_NPM_LOGGING ? '--ddd' : '--ddd',
+  npmlogging : process.env.VERBOSE_NPM_LOGGING ? '--ddd' : '--silent',
   pluginfile : '# NO PLUGIN',
   preInstallPluginfile : '# NO PRE-INSTALL PLUGIN',
   regvers : 'package.version',

package/src/{dockerfileTemplate.hbs → templates/dockerfileTemplate.hbs}

@@ -32,8 +32,6 @@ RUN if [ "${BUILD_ENV}" = "debian" ]; then \
       npm install -g npm@10; \
     fi
 
-{{preInstallPluginfile}}
-
 # Use SKIP_PREPARE to disable hook-and-release from running
 ENV SKIP_PREPARE=true