@leverege/build-tools 2.38.0-john.2 → 2.38.0

package/lib/server/build-tools.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 "use strict";
 
+const fs = require('node:fs');
+const path = require('node:path');
 const chalk = require('chalk');
 const cliArgs = require('command-line-args');
 const cliHelp = require('command-line-usage');
-const fs = require('fs');
 const npmRegistryFetch = require('npm-registry-fetch');
-const path = require('path');
 const semverLt = require('semver/functions/lt');
 
 /* eslint-disable no-console */

package/lib/server/firebaseServe.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 // https://github.com/google/zx
 /* eslint-disable max-len */
+/* eslint-disable no-console */
 "use strict";
 
 var _enquirer = _interopRequireDefault(require("enquirer"));

package/lib/server/push-my-chart.js

@@ -9,9 +9,9 @@ const pushItGood = async () => {
   const pusher = (0, _semver.lt)(version.stdout, '3.7.0') ? 'push' : 'cm-push';
   try {
     const museum = await (0, _execa.default)('helm', [pusher, 'helm', 'leverege']);
-    console.log(museum.stdout);
+    console.log(museum.stdout); // eslint-disable-line no-console
   } catch (ex) {
-    console.log(ex.stderr);
+    console.log(ex.stderr); // eslint-disable-line no-console
     process.exit(1);
   }
 };

package/lib/server/refresh-npm-token.js

@@ -26,7 +26,7 @@ var _semver = require("semver");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // we can't use $ until we upgrade to ESM execa
 if ((0, _semver.lt)(process.version, '18.0.0')) {
-  console.log(_chalk.default.red('\n\n***ERROR: must be running at least node 18\n'));
+  console.log(_chalk.default.red('\n\n***ERROR: must be running at least node 18\n')); // eslint-disable-line no-console
   process.exit(1);
 }
 
@@ -108,9 +108,11 @@ try {
 }
 const now = new Date().toLocaleString();
 const slackURL = 'https://hooks.slack.com/services/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';
+const execaAct = await (0, _execa.default)('gcloud', ['config', 'get', 'account']);
+const account = execaAct.stdout;
 const slackData = {
   // eslint-disable-next-line max-len
-  text: `--- npmrc refreshed by \`${process.env.USER}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
+  text: `--- npmrc refreshed by \`${account}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm'
 };
 if (process.env.REFRESH_NPM_TOKEN_DEBUG) {

package/lib/server/tag-release.js

@@ -4,12 +4,12 @@
 /* eslint-disable max-len */
 "use strict";
 
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _commandLineArgs = _interopRequireDefault(require("command-line-args"));
 var _commandLineUsage = _interopRequireDefault(require("command-line-usage"));
 var _zx = require("zx");
 var _enquirer = _interopRequireDefault(require("enquirer"));
 var _ansiColors = _interopRequireDefault(require("ansi-colors"));
-var _path = _interopRequireDefault(require("path"));
 var _readPkg = require("read-pkg");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const {
@@ -117,14 +117,14 @@ const getGitRootDirectory = async () => {
   return stdout.split('\n')[0];
 };
 const getSubDirectories = async (repositoryRoot, directory) => {
-  const absolutePathDirectory = _path.default.join(repositoryRoot, directory);
-  const relativeDirectory = _path.default.relative(repositoryRoot, absolutePathDirectory);
+  const absolutePathDirectory = _nodePath.default.join(repositoryRoot, directory);
+  const relativeDirectory = _nodePath.default.relative(repositoryRoot, absolutePathDirectory);
   try {
     const entries = await _zx.fs.promises.readdir(absolutePathDirectory, {
       withFileTypes: true
     });
     const subDirectories = entries.filter(entry => entry.isDirectory());
-    return subDirectories.map(entry => _path.default.join(relativeDirectory, entry.name));
+    return subDirectories.map(entry => _nodePath.default.join(relativeDirectory, entry.name));
   } catch (err) {
     return [];
   }
@@ -145,8 +145,8 @@ const findPackagesInDirectories = async (repositoryRoot, directories) => {
     const directoriesToSearch = hasWildcard ? await getSubDirectories(repositoryRoot, basePath) : [basePath];
     for (let i = 0; i < directoriesToSearch.length; i++) {
       const currentDirectory = directoriesToSearch[i];
-      const pkgPath = _path.default.join(directoriesToSearch[i], 'package.json');
-      const pkgExists = await fileExists(_path.default.join(repositoryRoot, pkgPath)); // eslint-disable-line no-await-in-loop
+      const pkgPath = _nodePath.default.join(directoriesToSearch[i], 'package.json');
+      const pkgExists = await fileExists(_nodePath.default.join(repositoryRoot, pkgPath)); // eslint-disable-line no-await-in-loop
       if (pkgExists) {
         acc.push(currentDirectory);
       }
@@ -165,7 +165,7 @@ const getMonorepoPackagePaths = async (repositoryRoot, packagesPath) => {
 };
 const selectPackageToUpdate = async (repositoryRoot, packagePaths) => {
   const currentPath = process.cwd();
-  const currentPackageRelativePath = _path.default.relative(repositoryRoot, currentPath);
+  const currentPackageRelativePath = _nodePath.default.relative(repositoryRoot, currentPath);
   const {
     packageName
   } = await prompt({
@@ -175,7 +175,7 @@ const selectPackageToUpdate = async (repositoryRoot, packagePaths) => {
     choices: packagePaths,
     initial: currentPackageRelativePath
   });
-  return _path.default.join(repositoryRoot, packageName);
+  return _nodePath.default.join(repositoryRoot, packageName);
 };
 const getPackagePath = async ({
   repositoryRoot,
@@ -543,7 +543,7 @@ ${_ansiColors.default.blue('Branch:')} ${branch}
 ${_ansiColors.default.blue('Version:')} ${version}
 ${_ansiColors.default.blue('Root directory:')} ${repositoryRoot}
 ${_ansiColors.default.blue('Package name:')} ${packageName}
-${_ansiColors.default.blue('package.json path:')} ${_path.default.join(packagePath, 'package.json')}${buildMessage ? `
+${_ansiColors.default.blue('package.json path:')} ${_nodePath.default.join(packagePath, 'package.json')}${buildMessage ? `
 ${_ansiColors.default.blue('Commit message:')} ${buildMessage}` : ''}${isBetaRelease || noGitTag ? '' : `
 ${_ansiColors.default.blue('Git tag:')} ${tagName}`}${isBetaRelease || noGitTag ? '' : `
 ${_ansiColors.default.blue('Git tag annotation:')} ${annotationMessage}`}${publishable ? `
@@ -640,7 +640,7 @@ config.branch = args.branch || (await getBranch({
   branchFilter: args['branch-filter']
 }));
 await checkoutToBranch(config);
-const argsPackagePath = args['package-path'] && _path.default.join(config.repositoryRoot, args['package-path']);
+const argsPackagePath = args['package-path'] && _nodePath.default.join(config.repositoryRoot, args['package-path']);
 config.packagePath = argsPackagePath || (await getPackagePath(config));
 config.isPackageInRepositoryRoot = await isPackageInRepositoryRoot(config);
 config.version = args.version || (await getVersion(config));

package/lib/server/unleash.js

@@ -42,7 +42,7 @@ const npmRunner = async script => {
   if (await isProtected()) {
     const script = ['test', 'lint'];
     for (let i = 0; i < script.length; i++) {
-      await npmRunner(script[i]);
+      await npmRunner(script[i]); // eslint-disable-line no-await-in-loop
     }
   } else {
     process.exit(0);

package/lib/web/build-tools.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 "use strict";
 
+const fs = require('node:fs');
+const path = require('node:path');
 const chalk = require('chalk');
 const cliArgs = require('command-line-args');
 const cliHelp = require('command-line-usage');
-const fs = require('fs');
 const npmRegistryFetch = require('npm-registry-fetch');
-const path = require('path');
 const semverLt = require('semver/functions/lt');
 
 /* eslint-disable no-console */

package/lib/web/firebaseServe.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 // https://github.com/google/zx
 /* eslint-disable max-len */
+/* eslint-disable no-console */
 "use strict";
 
 var _enquirer = _interopRequireDefault(require("enquirer"));

package/lib/web/push-my-chart.js

@@ -9,9 +9,9 @@ const pushItGood = async () => {
   const pusher = (0, _semver.lt)(version.stdout, '3.7.0') ? 'push' : 'cm-push';
   try {
     const museum = await (0, _execa.default)('helm', [pusher, 'helm', 'leverege']);
-    console.log(museum.stdout);
+    console.log(museum.stdout); // eslint-disable-line no-console
   } catch (ex) {
-    console.log(ex.stderr);
+    console.log(ex.stderr); // eslint-disable-line no-console
     process.exit(1);
   }
 };

package/lib/web/refresh-npm-token.js

@@ -26,7 +26,7 @@ var _semver = require("semver");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // we can't use $ until we upgrade to ESM execa
 if ((0, _semver.lt)(process.version, '18.0.0')) {
-  console.log(_chalk.default.red('\n\n***ERROR: must be running at least node 18\n'));
+  console.log(_chalk.default.red('\n\n***ERROR: must be running at least node 18\n')); // eslint-disable-line no-console
   process.exit(1);
 }
 
@@ -108,9 +108,11 @@ try {
 }
 const now = new Date().toLocaleString();
 const slackURL = 'https://hooks.slack.com/services/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';
+const execaAct = await (0, _execa.default)('gcloud', ['config', 'get', 'account']);
+const account = execaAct.stdout;
 const slackData = {
   // eslint-disable-next-line max-len
-  text: `--- npmrc refreshed by \`${process.env.USER}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
+  text: `--- npmrc refreshed by \`${account}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel: '#dev-ops-helm'
 };
 if (process.env.REFRESH_NPM_TOKEN_DEBUG) {

package/lib/web/tag-release.js

@@ -4,12 +4,12 @@
 /* eslint-disable max-len */
 "use strict";
 
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _commandLineArgs = _interopRequireDefault(require("command-line-args"));
 var _commandLineUsage = _interopRequireDefault(require("command-line-usage"));
 var _zx = require("zx");
 var _enquirer = _interopRequireDefault(require("enquirer"));
 var _ansiColors = _interopRequireDefault(require("ansi-colors"));
-var _path = _interopRequireDefault(require("path"));
 var _readPkg = require("read-pkg");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const {
@@ -117,14 +117,14 @@ const getGitRootDirectory = async () => {
   return stdout.split('\n')[0];
 };
 const getSubDirectories = async (repositoryRoot, directory) => {
-  const absolutePathDirectory = _path.default.join(repositoryRoot, directory);
-  const relativeDirectory = _path.default.relative(repositoryRoot, absolutePathDirectory);
+  const absolutePathDirectory = _nodePath.default.join(repositoryRoot, directory);
+  const relativeDirectory = _nodePath.default.relative(repositoryRoot, absolutePathDirectory);
   try {
     const entries = await _zx.fs.promises.readdir(absolutePathDirectory, {
       withFileTypes: true
     });
     const subDirectories = entries.filter(entry => entry.isDirectory());
-    return subDirectories.map(entry => _path.default.join(relativeDirectory, entry.name));
+    return subDirectories.map(entry => _nodePath.default.join(relativeDirectory, entry.name));
   } catch (err) {
     return [];
   }
@@ -145,8 +145,8 @@ const findPackagesInDirectories = async (repositoryRoot, directories) => {
     const directoriesToSearch = hasWildcard ? await getSubDirectories(repositoryRoot, basePath) : [basePath];
     for (let i = 0; i < directoriesToSearch.length; i++) {
       const currentDirectory = directoriesToSearch[i];
-      const pkgPath = _path.default.join(directoriesToSearch[i], 'package.json');
-      const pkgExists = await fileExists(_path.default.join(repositoryRoot, pkgPath)); // eslint-disable-line no-await-in-loop
+      const pkgPath = _nodePath.default.join(directoriesToSearch[i], 'package.json');
+      const pkgExists = await fileExists(_nodePath.default.join(repositoryRoot, pkgPath)); // eslint-disable-line no-await-in-loop
       if (pkgExists) {
         acc.push(currentDirectory);
       }
@@ -165,7 +165,7 @@ const getMonorepoPackagePaths = async (repositoryRoot, packagesPath) => {
 };
 const selectPackageToUpdate = async (repositoryRoot, packagePaths) => {
   const currentPath = process.cwd();
-  const currentPackageRelativePath = _path.default.relative(repositoryRoot, currentPath);
+  const currentPackageRelativePath = _nodePath.default.relative(repositoryRoot, currentPath);
   const {
     packageName
   } = await prompt({
@@ -175,7 +175,7 @@ const selectPackageToUpdate = async (repositoryRoot, packagePaths) => {
     choices: packagePaths,
     initial: currentPackageRelativePath
   });
-  return _path.default.join(repositoryRoot, packageName);
+  return _nodePath.default.join(repositoryRoot, packageName);
 };
 const getPackagePath = async ({
   repositoryRoot,
@@ -543,7 +543,7 @@ ${_ansiColors.default.blue('Branch:')} ${branch}
 ${_ansiColors.default.blue('Version:')} ${version}
 ${_ansiColors.default.blue('Root directory:')} ${repositoryRoot}
 ${_ansiColors.default.blue('Package name:')} ${packageName}
-${_ansiColors.default.blue('package.json path:')} ${_path.default.join(packagePath, 'package.json')}${buildMessage ? `
+${_ansiColors.default.blue('package.json path:')} ${_nodePath.default.join(packagePath, 'package.json')}${buildMessage ? `
 ${_ansiColors.default.blue('Commit message:')} ${buildMessage}` : ''}${isBetaRelease || noGitTag ? '' : `
 ${_ansiColors.default.blue('Git tag:')} ${tagName}`}${isBetaRelease || noGitTag ? '' : `
 ${_ansiColors.default.blue('Git tag annotation:')} ${annotationMessage}`}${publishable ? `
@@ -640,7 +640,7 @@ config.branch = args.branch || (await getBranch({
   branchFilter: args['branch-filter']
 }));
 await checkoutToBranch(config);
-const argsPackagePath = args['package-path'] && _path.default.join(config.repositoryRoot, args['package-path']);
+const argsPackagePath = args['package-path'] && _nodePath.default.join(config.repositoryRoot, args['package-path']);
 config.packagePath = argsPackagePath || (await getPackagePath(config));
 config.isPackageInRepositoryRoot = await isPackageInRepositoryRoot(config);
 config.version = args.version || (await getVersion(config));

package/lib/web/unleash.js

@@ -42,7 +42,7 @@ const npmRunner = async script => {
   if (await isProtected()) {
     const script = ['test', 'lint'];
     for (let i = 0; i < script.length; i++) {
-      await npmRunner(script[i]);
+      await npmRunner(script[i]); // eslint-disable-line no-await-in-loop
     }
   } else {
     process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.38.0-john.2",
+  "version": "2.38.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -13,6 +13,7 @@
     "compile": "npm run clean && npm run compile_server && npm run compile_web",
     "compile_server": "NODE_ENV=server babel -d lib/server src/",
     "compile_web": "NODE_ENV=web babel -d lib/web src/",
+    "lint": "find ./src -name \\*.\\*js | xargs npx eslint --report-unused-disable-directives",
     "prepublintOnly": "npm run lint && npm run build",
     "prepublishOnly": "npm run compile",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -66,7 +67,7 @@
     "js-yaml": "^4.1.0",
     "npm-registry-fetch": "^13.3.1",
     "parse-gitignore": "^2.0.0",
-    "read-pkg": "^8.0.0",
+    "read-pkg": "^8.1.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.5.4",
     "simple-git": "^3.19.1",
@@ -74,7 +75,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
     "npm": "^9.8.1"

package/src/bash-funcs

@@ -11,6 +11,8 @@
 DEVNULL="/dev/null"
 [ ! -z "$BUILD_TOOLS_DEBUG" ] && DEVNULL="/dev/stdout" && printf "\n***BUILD_TOOLS_DEBUG DEVNULL=>$DEVNULL\n"
 
+DTS="`date +\"%Y%m%d-%H%M%S\"`"
+
 # Simple ANSI color coded string generator.
 function color() {
   local color=

package/src/build-tools.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 
+const fs = require( 'node:fs' )
+const path = require( 'node:path' )
+
 const chalk = require( 'chalk' )
 const cliArgs = require( 'command-line-args' )
 const cliHelp = require( 'command-line-usage' )
-const fs = require( 'fs' )
 const npmRegistryFetch = require( 'npm-registry-fetch' )
-const path = require( 'path' )
 const semverLt = require( 'semver/functions/lt' )
 
 /* eslint-disable no-console */
@@ -106,7 +107,7 @@ const checkForLatest = async ( pkg = '@leverege/build-tools' ) => {
 
   try {
     const list = await npmRegistryFetch.json(
-      pkg, { '//registry.npmjs.org/:_authToken': getToken() }
+      pkg, { '//registry.npmjs.org/:_authToken' : getToken() }
     )
     return list['dist-tags'].latest
   } catch ( err ) {
@@ -118,7 +119,7 @@ const checkAndAnnounce = () => {
   checkForLatest()
     .then( ( latestVersion ) => {
       if ( semverLt( thisVersion, latestVersion ) ) {
-        console.log(chalk.white`
+        console.log( chalk.white`
   Update available ${chalk.grey( thisVersion )} \u2b62 ${chalk.green( latestVersion )}
   Run ${chalk.cyan( 'npm i -g @leverege/build-tools' )} to update
 `

package/src/firebaseServe.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 // https://github.com/google/zx
 /* eslint-disable max-len */
+/* eslint-disable no-console */
 import pkg from 'enquirer'
 import { $, fs, argv, path, chalk } from 'zx'
 

package/src/helmup.sh

@@ -7,6 +7,9 @@
 
 SHELMUP_ARGS=("$*")
 
+# make sure we have a current npmrc file
+refresh-npm-token
+
 # removed geotile-server from standard platform 3/20/22 - low usage
 PLATFORM=(
   authz-server

package/src/push-my-chart.mjs

@@ -9,9 +9,9 @@ const pushItGood = async () => {
 
   try {
     const museum = await execa( 'helm', [ pusher, 'helm', 'leverege' ] )
-    console.log( museum.stdout )
+    console.log( museum.stdout ) // eslint-disable-line no-console
   } catch ( ex ) {
-    console.log( ex.stderr )
+    console.log( ex.stderr ) // eslint-disable-line no-console
     process.exit( 1 )
   }
 }

package/src/refresh-npm-token.mjs

@@ -24,8 +24,8 @@ import execa from 'execa' // we can't use $ until we upgrade to ESM execa
 
 import { lt as semverLt } from 'semver'
 
-if ( semverLt ( process.version, '18.0.0' ) ) {
-  console.log( chalk.red( '\n\n***ERROR: must be running at least node 18\n' ) )
+if ( semverLt( process.version, '18.0.0' ) ) {
+  console.log( chalk.red( '\n\n***ERROR: must be running at least node 18\n' ) ) // eslint-disable-line no-console
   process.exit( 1 )
 }
 
@@ -107,9 +107,11 @@ try {
 
 const now = ( new Date() ).toLocaleString()
 const slackURL = 'https://hooks.slack.com/services/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'
+const execaAct = await execa( 'gcloud', [ 'config', 'get', 'account', ] )
+const account = execaAct.stdout
 const slackData = {
   // eslint-disable-next-line max-len
-  text : `--- npmrc refreshed by \`${process.env.USER}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
+  text : `--- npmrc refreshed by \`${account}\` at ${now}\n     tokens RW [\`${npmrc.token}\`] RO [\`${npmrcRo.token}\`]`,
   channel : '#dev-ops-helm',
 }
 

package/src/tag-release.mjs

@@ -3,12 +3,13 @@
 /* eslint-disable no-console */
 /* eslint-disable max-len */
 
+import path from 'node:path'
+
 import cliArgs from 'command-line-args'
 import cliHelp from 'command-line-usage'
 import { $, fs } from 'zx'
 import pkg from 'enquirer'
 import colors from 'ansi-colors'
-import path from 'path'
 import { readPackage } from 'read-pkg'
 
 const { prompt } = pkg

package/src/unleash.mjs

@@ -47,7 +47,7 @@ const npmRunner = async ( script ) => {
   if ( await isProtected() ) {
     const script = [ 'test', 'lint' ]
     for ( let i = 0; i < script.length; i++ ) {
-      await npmRunner( script[i] )
+      await npmRunner( script[i] ) // eslint-disable-line no-await-in-loop
     }
   } else {
     process.exit( 0 )