@leverege/build-tools 2.38.0 → 2.38.2

package/lib/server/firebaseDeploy.js

@@ -189,7 +189,7 @@ try {
   // deploying to a channel requires slightly different parameter structure 
   const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}`.split(' ') : 'deploy';
   const hostingPrefix = CHANNEL ? '' : 'hosting:';
-  await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`;
+  await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} DEPLOYMENT_TARGET=${TARGET.siteId} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`;
 } catch (err) {
   console.error(err);
 }

package/lib/server/firebaseServe.js

@@ -110,7 +110,7 @@ EXIT_EVENTS.forEach(event => {
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
 try {
-  await (0, _zx.$)`DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run serve --colors`;
+  await (0, _zx.$)`DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} DEPLOYMENT_TARGET=${TARGET.siteId} npm run serve --colors`;
 } catch (err) {
   console.error(err);
 }

package/lib/server/overwhelm.js

@@ -2,19 +2,21 @@
 
 // XXX console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
 /* eslint-disable no-console */
+/* eslint-disable security/detect-non-literal-fs-filename */
 "use strict";
 
-const path = require('node:path');
-const exec = require('node:child_process').execSync;
-const fs = require('node:fs');
-const chalk = require('chalk');
-const cliArgs = require('command-line-args');
+var _nodePath = _interopRequireDefault(require("node:path"));
+var _nodeChild_process = require("node:child_process");
+var _nodeFs = _interopRequireDefault(require("node:fs"));
+var _chalk = _interopRequireDefault(require("chalk"));
+var _commandLineArgs = _interopRequireDefault(require("command-line-args"));
+var _deepmerge = _interopRequireDefault(require("deepmerge"));
+var _glob = _interopRequireDefault(require("glob"));
+var _parseGitignore = _interopRequireDefault(require("parse-gitignore"));
+var _readlineSync = _interopRequireDefault(require("readline-sync"));
+var _jsYaml = _interopRequireDefault(require("js-yaml"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // const cliHelp = require( 'command-line-usage' )
-const deepmerge = require('deepmerge');
-const glob = require('glob');
-const parse = require('parse-gitignore');
-const ask = require('readline-sync');
-const YAML = require('js-yaml');
 const optionsDefinitions = [/* eslint-disable no-multi-spaces */
 {
   name: 'context',
@@ -76,20 +78,20 @@ const optionsDefinitions = [/* eslint-disable no-multi-spaces */
 }
 /* eslint-enable no-multi-spaces */];
 
-const args = cliArgs(optionsDefinitions);
+const args = (0, _commandLineArgs.default)(optionsDefinitions);
 
 // See if we are in a monorepo, which changes some of the rules.
-const gitTop = exec('git rev-parse --show-toplevel', {
+const gitTop = (0, _nodeChild_process.execSync)('git rev-parse --show-toplevel', {
   stdio: [undefined]
 }).toString().trim();
 let monoTop;
-if (fs.existsSync(`${gitTop}/packages`)) {
-  monoTop = path.basename(path.resolve()); // process.env.PWD
+if (_nodeFs.default.existsSync(`${gitTop}/packages`)) {
+  monoTop = _nodePath.default.basename(_nodePath.default.resolve()); // process.env.PWD
   console.log(`MONO=[${monoTop}]`);
 }
 
 // The kubernetes context is equal to the git branch name.
-const gitBranch = exec('git rev-parse --abbrev-ref HEAD', {
+const gitBranch = (0, _nodeChild_process.execSync)('git rev-parse --abbrev-ref HEAD', {
   stdio: [undefined]
 }).toString().trim();
 const context = args.context || monoTop || gitBranch;
@@ -97,8 +99,8 @@ if (context === 'master') {
   console.log('***ERROR: master context is forbidden; change to a different branch\n\n');
   process.exit(1);
 }
-if (!fs.existsSync('overwhelm.yaml')) {
-  console.log(chalk.red.bold(`
+if (!_nodeFs.default.existsSync('overwhelm.yaml')) {
+  console.log(_chalk.default.red.bold(`
 
 ***ERROR overwhelm => missing the overwhelm.yaml file - this command expects
                       to execute from within a platform-k8s branch
@@ -119,7 +121,7 @@ if (!fs.existsSync('overwhelm.yaml')) {
 // approach in order to keep us cognizant of exactly where a cluster is
 // being formed.
 //
-const yaml = YAML.load(fs.readFileSync('overwhelm.yaml', 'utf-8'));
+const yaml = _jsYaml.default.load(_nodeFs.default.readFileSync('overwhelm.yaml', 'utf-8'));
 const over = yaml.default;
 if (process.env.OVERWHELM_DEBUG) {
   console.log({
@@ -205,7 +207,7 @@ if (varErrors.length > 0) {
 }
 
 // Grab a list of the existing yaml templates.
-const yams = glob.sync('values-*.yaml');
+const yams = _glob.default.sync('values-*.yaml');
 
 // A function to apply the replacements to all of the matching yaml which
 // will error out if it runs into an unknown OVH<tag>.
@@ -242,13 +244,13 @@ const buildYaml = (yamls, replacements) => {
   const loaded = [];
   let allYamls = '';
   values.forEach(yaml => {
-    if (!fs.existsSync(yaml)) {
+    if (!_nodeFs.default.existsSync(yaml)) {
       console.log(`\n***ERROR: yaml file missing => ${yaml}\n`);
       process.exit(1);
     }
     if (!loaded.includes(yaml)) {
       allYamls += `\n# AHOY => ${yaml}\n\n`;
-      allYamls += fs.readFileSync(yaml, {
+      allYamls += _nodeFs.default.readFileSync(yaml, {
         encoding: 'utf-8'
       });
       loaded.push(yaml);
@@ -279,28 +281,28 @@ if (args.key) {
 }
 
 // Find all of the potential target dirs. Utilize .gitignore to ignore files
-const gitignore = parse(fs.readFileSync('.gitignore'));
+const gitignore = (0, _parseGitignore.default)(_nodeFs.default.readFileSync('.gitignore'));
 const opt = {
   ignore: gitignore.patterns
 };
-const ahoy = glob.sync('*/', opt);
+const ahoy = _glob.default.sync('*/', opt);
 
 // .noahoy = skips generation of values.yaml but allows helmup to run
 // .nohelm = overwhelm and helmup will skip the deployment entirely
 ahoy.forEach(dir => {
-  if (fs.existsSync(`${dir}/.noahoy`)) {
-    !args.fetchctx && console.log(chalk.yellow(`***WARNING: .noahoy detected, not regenerating ${dir}values.yaml`));
-  } else if (!fs.existsSync(`${dir}/.nohelm`)) {
+  if (_nodeFs.default.existsSync(`${dir}/.noahoy`)) {
+    !args.fetchctx && console.log(_chalk.default.yellow(`***WARNING: .noahoy detected, not regenerating ${dir}values.yaml`));
+  } else if (!_nodeFs.default.existsSync(`${dir}/.nohelm`)) {
     args.verbose && console.log(`Generating values in ${dir}`); // eslint-disable-line no-unused-expressions
 
     let valuesOut = []; // An accumulator for all of the output values.
 
     // Add support for localized values for things like keel (or whatever)
     const valuesLocal = `${dir}values-local.yaml`;
-    if (fs.existsSync(valuesLocal)) {
+    if (_nodeFs.default.existsSync(valuesLocal)) {
       args.verbose && console.log(`     Local values in ${valuesLocal}`); // eslint-disable-line no-unused-expressions
       valuesOut += '\n# AHOY => values-local.yaml\n\n';
-      valuesOut += fs.readFileSync(valuesLocal, {
+      valuesOut += _nodeFs.default.readFileSync(valuesLocal, {
         encoding: 'utf-8'
       });
     }
@@ -309,7 +311,7 @@ ahoy.forEach(dir => {
     // Augment the default service section of the YAML with settings that
     // usually come from the top level overwhelm.yaml file.
     //
-    const valuesAll = YAML.load(valuesOut) || {};
+    const valuesAll = _jsYaml.default.load(valuesOut) || {};
     const valuesSvc = {
       service: {
         project_id: 'OVH:<PROJECT_ID>',
@@ -318,7 +320,7 @@ ahoy.forEach(dir => {
         ingress: 'OVH:<INGRESS>'
       }
     };
-    const valuesMerged = YAML.dump(deepmerge(valuesSvc, valuesAll), {
+    const valuesMerged = _jsYaml.default.dump((0, _deepmerge.default)(valuesSvc, valuesAll), {
       quotingType: '"'
     });
     valuesOut = doReplacements(valuesMerged, over);
@@ -327,30 +329,30 @@ ahoy.forEach(dir => {
     // If we are going to override then we need to convert it to YAML and
     // do a deepmerge to combine the values.
     const valuesOverride = `${dir}/values-override.yaml`;
-    if (fs.existsSync(valuesOverride)) {
+    if (_nodeFs.default.existsSync(valuesOverride)) {
       console.log(`===>Applying Overrides=> ${valuesOverride}`);
-      const overrides = YAML.load(fs.readFileSync(valuesOverride, {
+      const overrides = _jsYaml.default.load(_nodeFs.default.readFileSync(valuesOverride, {
         encofind: 'utf-8'
       }));
-      const allValues = YAML.load(valuesOut);
-      valuesOut = YAML.dump(deepmerge(allValues, overrides), {
+      const allValues = _jsYaml.default.load(valuesOut);
+      valuesOut = _jsYaml.default.dump((0, _deepmerge.default)(allValues, overrides), {
         quotingType: '"'
       });
     }
     // DEPRECATED
 
-    fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
+    _nodeFs.default.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }
 });
 
 // we can also apply replaceables to any top level .ovh files to support top level config maps
-glob.sync('**/*.ovh').forEach(cfgmap => {
+_glob.default.sync('**/*.ovh').forEach(cfgmap => {
   const target = cfgmap.replace(/.ovh$/, '');
-  let valuesOut = fs.readFileSync(cfgmap, {
+  let valuesOut = _nodeFs.default.readFileSync(cfgmap, {
     encoding: 'utf-8'
   });
   valuesOut = doReplacements(valuesOut, over);
-  fs.writeFileSync(target, valuesOut);
+  _nodeFs.default.writeFileSync(target, valuesOut);
 });
 if (args.genvals) {
   process.exit(0);
@@ -362,9 +364,9 @@ if (over.PROJECT_NAME === 'minikube') {
   process.exit(0);
 }
 const projectId = over.PROJECT_ID;
-let zone = over.GCE_REGION + (over.GCE_ZONE ? `-${over.GCE_ZONE}` : '');
+const zone = over.GCE_REGION + (over.GCE_ZONE ? `-${over.GCE_ZONE}` : '');
 if (!clusterName) {
-  console.log(chalk.yellow(`
+  console.log(_chalk.default.yellow(`
 
     The overwhelm.yaml file in this branch is missing a CLUSTER_NAME setting,
     which was added to support cluster names that do not match the project
@@ -372,10 +374,10 @@ if (!clusterName) {
     adding this line following PROJECT_NAME in the default section of
     overwhelm.yaml:
 
-      ${chalk.bold.green(`CLUSTER_NAME   : "\${PROJECT_NAME}"`)}
+      ${_chalk.default.bold.green('CLUSTER_NAME   : \'${PROJECT_NAME}\'')}
 
     However, if the CLUSTER_NAME is not the same as the PROJECT_NAME then go
-    ahead and add the CLUSTER_NAME setting to the ${chalk.bold.green(projectId)} section of the
+    ahead and add the CLUSTER_NAME setting to the ${_chalk.default.bold.green(projectId)} section of the
     overwhelm.yaml file.
 
     `));
@@ -383,15 +385,15 @@ if (!clusterName) {
 }
 let kubeout = '_no_current_context_';
 try {
-  kubeout = exec('kubectl config current-context', {
+  kubeout = (0, _nodeChild_process.execSync)('kubectl config current-context', {
     stdio: [undefined]
   });
 } catch (err) {
   // err && console.log( `Caught Error =>[${err}]` )
 }
 const currentCtx = kubeout.toString().trim();
-let desiredCtx = `gke_${projectId}_${zone}_${clusterName}`;
-let cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`;
+const desiredCtx = `gke_${projectId}_${zone}_${clusterName}`;
+const cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`;
 const matchedCtx = currentCtx === desiredCtx;
 if (args.matchk8s) {
   process.exit(matchedCtx ? 0 : 1);
@@ -401,7 +403,7 @@ if (args.matchk8s) {
 if (args.fetchctx) {
   if (!matchedCtx) {
     try {
-      exec(`${cmd}`, {
+      (0, _nodeChild_process.execSync)(`${cmd}`, {
         stdio: [undefined]
       });
     } catch (err) {
@@ -414,30 +416,30 @@ if (args.fetchctx) {
 if (matchedCtx) {
   console.log(`
 
-  Current context matches => ${chalk.bold.green(currentCtx)}
+  Current context matches => ${_chalk.default.bold.green(currentCtx)}
 
   `);
 } else {
   console.log(`
   You are about to change your Kubernetes context to:
-      CLUSTER_NAME => ${chalk.bold.green(clusterName)}
-      PROJECT_ID   => ${chalk.bold.green(projectId)}
-      REGION       => ${chalk.bold.green(zone)}
+      CLUSTER_NAME => ${_chalk.default.bold.green(clusterName)}
+      PROJECT_ID   => ${_chalk.default.bold.green(projectId)}
+      REGION       => ${_chalk.default.bold.green(zone)}
 
   `);
 }
 const operation = matchedCtx ? 'refetch the credentials' : 'switch your context';
-const ans = ask.question(`Enter "${chalk.bold.green('yes')}" if you wish to ${operation} => `);
+const ans = _readlineSync.default.question(`Enter "${_chalk.default.bold.green('yes')}" if you wish to ${operation} => `);
 if (ans !== 'yes') {
   if (matchedCtx) {
-    console.log(chalk.bold.yellow('\n\nSkipping a refetch of your Kubernetes context and credentials\n\n'));
+    console.log(_chalk.default.bold.yellow('\n\nSkipping a refetch of your Kubernetes context and credentials\n\n'));
     process.exit(0);
   }
-  console.log(chalk.bold.red('\n\nYour Kubernetes context and credentials do NOT match - this could be bad!\n\n'));
+  console.log(_chalk.default.bold.red('\n\nYour Kubernetes context and credentials do NOT match - this could be bad!\n\n'));
   process.exit(1);
 }
-console.log(`\n\nExecuting: ${chalk.bold.yellow(cmd)}\n\n`);
-exec(`${cmd}`, (error, out) => {
+console.log(`\n\nExecuting: ${_chalk.default.bold.yellow(cmd)}\n\n`);
+(0, _nodeChild_process.execSync)(`${cmd}`, (error, out) => {
   if (error) {
     console.log(`\n\n***ERROR ${error}\n\n`);
     process.exit(1);

package/lib/web/firebaseDeploy.js

@@ -189,7 +189,7 @@ try {
   // deploying to a channel requires slightly different parameter structure 
   const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}`.split(' ') : 'deploy';
   const hostingPrefix = CHANNEL ? '' : 'hosting:';
-  await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`;
+  await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} DEPLOYMENT_TARGET=${TARGET.siteId} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`;
 } catch (err) {
   console.error(err);
 }

package/lib/web/firebaseServe.js

@@ -110,7 +110,7 @@ EXIT_EVENTS.forEach(event => {
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
 try {
-  await (0, _zx.$)`DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run serve --colors`;
+  await (0, _zx.$)`DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} DEPLOYMENT_TARGET=${TARGET.siteId} npm run serve --colors`;
 } catch (err) {
   console.error(err);
 }

package/lib/web/overwhelm.js

@@ -2,19 +2,21 @@
 
 // XXX console.log( `TOP=>[${process.cwd()}] PWD=[${process.env.PWD}]` )
 /* eslint-disable no-console */
+/* eslint-disable security/detect-non-literal-fs-filename */
 "use strict";
 
-const path = require('node:path');
-const exec = require('node:child_process').execSync;
-const fs = require('node:fs');
-const chalk = require('chalk');
-const cliArgs = require('command-line-args');
+var _nodePath = _interopRequireDefault(require("node:path"));
+var _nodeChild_process = require("node:child_process");
+var _nodeFs = _interopRequireDefault(require("node:fs"));
+var _chalk = _interopRequireDefault(require("chalk"));
+var _commandLineArgs = _interopRequireDefault(require("command-line-args"));
+var _deepmerge = _interopRequireDefault(require("deepmerge"));
+var _glob = _interopRequireDefault(require("glob"));
+var _parseGitignore = _interopRequireDefault(require("parse-gitignore"));
+var _readlineSync = _interopRequireDefault(require("readline-sync"));
+var _jsYaml = _interopRequireDefault(require("js-yaml"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // const cliHelp = require( 'command-line-usage' )
-const deepmerge = require('deepmerge');
-const glob = require('glob');
-const parse = require('parse-gitignore');
-const ask = require('readline-sync');
-const YAML = require('js-yaml');
 const optionsDefinitions = [/* eslint-disable no-multi-spaces */
 {
   name: 'context',
@@ -76,20 +78,20 @@ const optionsDefinitions = [/* eslint-disable no-multi-spaces */
 }
 /* eslint-enable no-multi-spaces */];
 
-const args = cliArgs(optionsDefinitions);
+const args = (0, _commandLineArgs.default)(optionsDefinitions);
 
 // See if we are in a monorepo, which changes some of the rules.
-const gitTop = exec('git rev-parse --show-toplevel', {
+const gitTop = (0, _nodeChild_process.execSync)('git rev-parse --show-toplevel', {
   stdio: [undefined]
 }).toString().trim();
 let monoTop;
-if (fs.existsSync(`${gitTop}/packages`)) {
-  monoTop = path.basename(path.resolve()); // process.env.PWD
+if (_nodeFs.default.existsSync(`${gitTop}/packages`)) {
+  monoTop = _nodePath.default.basename(_nodePath.default.resolve()); // process.env.PWD
   console.log(`MONO=[${monoTop}]`);
 }
 
 // The kubernetes context is equal to the git branch name.
-const gitBranch = exec('git rev-parse --abbrev-ref HEAD', {
+const gitBranch = (0, _nodeChild_process.execSync)('git rev-parse --abbrev-ref HEAD', {
   stdio: [undefined]
 }).toString().trim();
 const context = args.context || monoTop || gitBranch;
@@ -97,8 +99,8 @@ if (context === 'master') {
   console.log('***ERROR: master context is forbidden; change to a different branch\n\n');
   process.exit(1);
 }
-if (!fs.existsSync('overwhelm.yaml')) {
-  console.log(chalk.red.bold(`
+if (!_nodeFs.default.existsSync('overwhelm.yaml')) {
+  console.log(_chalk.default.red.bold(`
 
 ***ERROR overwhelm => missing the overwhelm.yaml file - this command expects
                       to execute from within a platform-k8s branch
@@ -119,7 +121,7 @@ if (!fs.existsSync('overwhelm.yaml')) {
 // approach in order to keep us cognizant of exactly where a cluster is
 // being formed.
 //
-const yaml = YAML.load(fs.readFileSync('overwhelm.yaml', 'utf-8'));
+const yaml = _jsYaml.default.load(_nodeFs.default.readFileSync('overwhelm.yaml', 'utf-8'));
 const over = yaml.default;
 if (process.env.OVERWHELM_DEBUG) {
   console.log({
@@ -205,7 +207,7 @@ if (varErrors.length > 0) {
 }
 
 // Grab a list of the existing yaml templates.
-const yams = glob.sync('values-*.yaml');
+const yams = _glob.default.sync('values-*.yaml');
 
 // A function to apply the replacements to all of the matching yaml which
 // will error out if it runs into an unknown OVH<tag>.
@@ -242,13 +244,13 @@ const buildYaml = (yamls, replacements) => {
   const loaded = [];
   let allYamls = '';
   values.forEach(yaml => {
-    if (!fs.existsSync(yaml)) {
+    if (!_nodeFs.default.existsSync(yaml)) {
       console.log(`\n***ERROR: yaml file missing => ${yaml}\n`);
       process.exit(1);
     }
     if (!loaded.includes(yaml)) {
       allYamls += `\n# AHOY => ${yaml}\n\n`;
-      allYamls += fs.readFileSync(yaml, {
+      allYamls += _nodeFs.default.readFileSync(yaml, {
         encoding: 'utf-8'
       });
       loaded.push(yaml);
@@ -279,28 +281,28 @@ if (args.key) {
 }
 
 // Find all of the potential target dirs. Utilize .gitignore to ignore files
-const gitignore = parse(fs.readFileSync('.gitignore'));
+const gitignore = (0, _parseGitignore.default)(_nodeFs.default.readFileSync('.gitignore'));
 const opt = {
   ignore: gitignore.patterns
 };
-const ahoy = glob.sync('*/', opt);
+const ahoy = _glob.default.sync('*/', opt);
 
 // .noahoy = skips generation of values.yaml but allows helmup to run
 // .nohelm = overwhelm and helmup will skip the deployment entirely
 ahoy.forEach(dir => {
-  if (fs.existsSync(`${dir}/.noahoy`)) {
-    !args.fetchctx && console.log(chalk.yellow(`***WARNING: .noahoy detected, not regenerating ${dir}values.yaml`));
-  } else if (!fs.existsSync(`${dir}/.nohelm`)) {
+  if (_nodeFs.default.existsSync(`${dir}/.noahoy`)) {
+    !args.fetchctx && console.log(_chalk.default.yellow(`***WARNING: .noahoy detected, not regenerating ${dir}values.yaml`));
+  } else if (!_nodeFs.default.existsSync(`${dir}/.nohelm`)) {
     args.verbose && console.log(`Generating values in ${dir}`); // eslint-disable-line no-unused-expressions
 
     let valuesOut = []; // An accumulator for all of the output values.
 
     // Add support for localized values for things like keel (or whatever)
     const valuesLocal = `${dir}values-local.yaml`;
-    if (fs.existsSync(valuesLocal)) {
+    if (_nodeFs.default.existsSync(valuesLocal)) {
       args.verbose && console.log(`     Local values in ${valuesLocal}`); // eslint-disable-line no-unused-expressions
       valuesOut += '\n# AHOY => values-local.yaml\n\n';
-      valuesOut += fs.readFileSync(valuesLocal, {
+      valuesOut += _nodeFs.default.readFileSync(valuesLocal, {
         encoding: 'utf-8'
       });
     }
@@ -309,7 +311,7 @@ ahoy.forEach(dir => {
     // Augment the default service section of the YAML with settings that
     // usually come from the top level overwhelm.yaml file.
     //
-    const valuesAll = YAML.load(valuesOut) || {};
+    const valuesAll = _jsYaml.default.load(valuesOut) || {};
     const valuesSvc = {
       service: {
         project_id: 'OVH:<PROJECT_ID>',
@@ -318,7 +320,7 @@ ahoy.forEach(dir => {
         ingress: 'OVH:<INGRESS>'
       }
     };
-    const valuesMerged = YAML.dump(deepmerge(valuesSvc, valuesAll), {
+    const valuesMerged = _jsYaml.default.dump((0, _deepmerge.default)(valuesSvc, valuesAll), {
       quotingType: '"'
     });
     valuesOut = doReplacements(valuesMerged, over);
@@ -327,30 +329,30 @@ ahoy.forEach(dir => {
     // If we are going to override then we need to convert it to YAML and
     // do a deepmerge to combine the values.
     const valuesOverride = `${dir}/values-override.yaml`;
-    if (fs.existsSync(valuesOverride)) {
+    if (_nodeFs.default.existsSync(valuesOverride)) {
       console.log(`===>Applying Overrides=> ${valuesOverride}`);
-      const overrides = YAML.load(fs.readFileSync(valuesOverride, {
+      const overrides = _jsYaml.default.load(_nodeFs.default.readFileSync(valuesOverride, {
         encofind: 'utf-8'
       }));
-      const allValues = YAML.load(valuesOut);
-      valuesOut = YAML.dump(deepmerge(allValues, overrides), {
+      const allValues = _jsYaml.default.load(valuesOut);
+      valuesOut = _jsYaml.default.dump((0, _deepmerge.default)(allValues, overrides), {
         quotingType: '"'
       });
     }
     // DEPRECATED
 
-    fs.writeFileSync(`${dir}/values.yaml`, valuesOut);
+    _nodeFs.default.writeFileSync(`${dir}/values.yaml`, valuesOut);
   }
 });
 
 // we can also apply replaceables to any top level .ovh files to support top level config maps
-glob.sync('**/*.ovh').forEach(cfgmap => {
+_glob.default.sync('**/*.ovh').forEach(cfgmap => {
   const target = cfgmap.replace(/.ovh$/, '');
-  let valuesOut = fs.readFileSync(cfgmap, {
+  let valuesOut = _nodeFs.default.readFileSync(cfgmap, {
     encoding: 'utf-8'
   });
   valuesOut = doReplacements(valuesOut, over);
-  fs.writeFileSync(target, valuesOut);
+  _nodeFs.default.writeFileSync(target, valuesOut);
 });
 if (args.genvals) {
   process.exit(0);
@@ -362,9 +364,9 @@ if (over.PROJECT_NAME === 'minikube') {
   process.exit(0);
 }
 const projectId = over.PROJECT_ID;
-let zone = over.GCE_REGION + (over.GCE_ZONE ? `-${over.GCE_ZONE}` : '');
+const zone = over.GCE_REGION + (over.GCE_ZONE ? `-${over.GCE_ZONE}` : '');
 if (!clusterName) {
-  console.log(chalk.yellow(`
+  console.log(_chalk.default.yellow(`
 
     The overwhelm.yaml file in this branch is missing a CLUSTER_NAME setting,
     which was added to support cluster names that do not match the project
@@ -372,10 +374,10 @@ if (!clusterName) {
     adding this line following PROJECT_NAME in the default section of
     overwhelm.yaml:
 
-      ${chalk.bold.green(`CLUSTER_NAME   : "\${PROJECT_NAME}"`)}
+      ${_chalk.default.bold.green('CLUSTER_NAME   : \'${PROJECT_NAME}\'')}
 
     However, if the CLUSTER_NAME is not the same as the PROJECT_NAME then go
-    ahead and add the CLUSTER_NAME setting to the ${chalk.bold.green(projectId)} section of the
+    ahead and add the CLUSTER_NAME setting to the ${_chalk.default.bold.green(projectId)} section of the
     overwhelm.yaml file.
 
     `));
@@ -383,15 +385,15 @@ if (!clusterName) {
 }
 let kubeout = '_no_current_context_';
 try {
-  kubeout = exec('kubectl config current-context', {
+  kubeout = (0, _nodeChild_process.execSync)('kubectl config current-context', {
     stdio: [undefined]
   });
 } catch (err) {
   // err && console.log( `Caught Error =>[${err}]` )
 }
 const currentCtx = kubeout.toString().trim();
-let desiredCtx = `gke_${projectId}_${zone}_${clusterName}`;
-let cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`;
+const desiredCtx = `gke_${projectId}_${zone}_${clusterName}`;
+const cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`;
 const matchedCtx = currentCtx === desiredCtx;
 if (args.matchk8s) {
   process.exit(matchedCtx ? 0 : 1);
@@ -401,7 +403,7 @@ if (args.matchk8s) {
 if (args.fetchctx) {
   if (!matchedCtx) {
     try {
-      exec(`${cmd}`, {
+      (0, _nodeChild_process.execSync)(`${cmd}`, {
         stdio: [undefined]
       });
     } catch (err) {
@@ -414,30 +416,30 @@ if (args.fetchctx) {
 if (matchedCtx) {
   console.log(`
 
-  Current context matches => ${chalk.bold.green(currentCtx)}
+  Current context matches => ${_chalk.default.bold.green(currentCtx)}
 
   `);
 } else {
   console.log(`
   You are about to change your Kubernetes context to:
-      CLUSTER_NAME => ${chalk.bold.green(clusterName)}
-      PROJECT_ID   => ${chalk.bold.green(projectId)}
-      REGION       => ${chalk.bold.green(zone)}
+      CLUSTER_NAME => ${_chalk.default.bold.green(clusterName)}
+      PROJECT_ID   => ${_chalk.default.bold.green(projectId)}
+      REGION       => ${_chalk.default.bold.green(zone)}
 
   `);
 }
 const operation = matchedCtx ? 'refetch the credentials' : 'switch your context';
-const ans = ask.question(`Enter "${chalk.bold.green('yes')}" if you wish to ${operation} => `);
+const ans = _readlineSync.default.question(`Enter "${_chalk.default.bold.green('yes')}" if you wish to ${operation} => `);
 if (ans !== 'yes') {
   if (matchedCtx) {
-    console.log(chalk.bold.yellow('\n\nSkipping a refetch of your Kubernetes context and credentials\n\n'));
+    console.log(_chalk.default.bold.yellow('\n\nSkipping a refetch of your Kubernetes context and credentials\n\n'));
     process.exit(0);
   }
-  console.log(chalk.bold.red('\n\nYour Kubernetes context and credentials do NOT match - this could be bad!\n\n'));
+  console.log(_chalk.default.bold.red('\n\nYour Kubernetes context and credentials do NOT match - this could be bad!\n\n'));
   process.exit(1);
 }
-console.log(`\n\nExecuting: ${chalk.bold.yellow(cmd)}\n\n`);
-exec(`${cmd}`, (error, out) => {
+console.log(`\n\nExecuting: ${_chalk.default.bold.yellow(cmd)}\n\n`);
+(0, _nodeChild_process.execSync)(`${cmd}`, (error, out) => {
   if (error) {
     console.log(`\n\n***ERROR ${error}\n\n`);
     process.exit(1);

package/package.json

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

package/src/bash-funcs

@@ -145,7 +145,8 @@ function postToSlack() {
   local dts="`date +\"%c\"`"
   local slackURL="https://hooks.slack.com/services/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"
   local channel="#dev-ops-helm"
-  local slackmsg="\n--- $running by \`$USER\` in \`$GCP_PROJECT_ID\` @ $dts\n \`$toPost\`\n node `node --version` / `build-tools --version` /  helm `helm version --short`\n"
+  local account="`gcloud config get account`"
+  local slackmsg="\n--- $running by \`$account\` in \`$GCP_PROJECT_ID\` @ $dts\n \`$toPost\`\n node `node --version` / `build-tools --version` /  helm `helm version --short`\n"
 
   curl -X POST -H 'Content-type: application/json' \
            --data "{\"text\":\"$slackmsg\",\"channel\":\"$channel\"}" \

package/src/firebaseDeploy.mjs

@@ -209,7 +209,7 @@ try {
   const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}`.split( ' ' ) : 'deploy'
   const hostingPrefix = CHANNEL ? '' : 'hosting:'
 
-  await $`npm run clean && DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`
+  await $`npm run clean && DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`
 } catch ( err ) {
   console.error( err )
 }

package/src/firebaseServe.mjs

@@ -138,7 +138,7 @@ EXIT_EVENTS
 await fs.writeFile( path.join( process.cwd(), '.env.temp' ), envFileContent )
 
 try {
-  await $`DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} npm run serve --colors`
+  await $`DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run serve --colors`
 } catch ( err ) {
   console.error( err )
 }