ump 3.5.7 → 4.0.0

package/lib/commands.js

@@ -164,28 +164,33 @@ const commands = {
           throw new Error('Skipping execution');
         }
 
-        // if (lines.length) {
-        //   console.log(lines);
-        //   utils.error(`Git working directory not clean:\n\t${lines.join('\n\t')}`);
-        // }
+        if (lines.length) {
+          console.log(lines);
+          utils.error(`Git working directory not clean:\n\t${lines.join('\n\t')}`);
+        }
 
         try {
-          const ret = await peach(releaseSteps.slice(-1), (command) => {
+          const ret = await peach(releaseSteps, (command) => {
             return exec(command)
             .then(() => {
               log.color(`Executed ${command}`, 'cyan');
             })
             .catch(async(err) => {
-              console.log('npm publish?', command.includes('npm publish'));
-              console.log('npm error code EOTP?', err.message.includes('npm error code EOTP'));
-              console.log('has1PasswordVars?', has1PasswordVars());
+              if (command.includes('npm publish') && err.message.includes('npm error code EOTP')) {
+                if (has1PasswordVars()) {
+                  const flags = getFlags(opts.publishFlags);
+                  const oneTimePassword = await getTotp();
+
+                  log.color('npm publish command failed with EOTP error', 'red');
+                  log.color('Trying again with one-time password', 'cyan');
 
-              if (command.includes('npm publish') && err.message.includes('npm error code EOTP') && has1PasswordVars()) {
-                const flags = getFlags(opts.publishFlags);
-                const oneTimePassword = await getTotp();
+                  return exec(`npm publish${flags} --otp=${oneTimePassword}`);
+                }
 
-                return exec(`npm publish${flags} --otp=${oneTimePassword}`);
+                log.color('One-time password is not set', 'red');
+                log.color('Try using the --otp option to provide a one-time password', 'cyan');
               }
+
               utils.error(err);
             });
           });

package/lib/log.js

@@ -1,8 +1,8 @@
-import chalk from 'chalk';
+import {styleText} from 'node:util';
 
 const log = {
   color: function(str, color) {
-    const txt = color ? chalk[color](str) : str;
+    const txt = color ? styleText(color, str) : str;
 
     console.log(txt);
   },
@@ -10,9 +10,9 @@ const log = {
     const files = opts.files.join(', ');
 
     console.log('');
-    console.log(chalk.bold('SET FILES:\t'), chalk.yellow(files));
-    console.log(chalk.bold('OLD VERSION:\t'), chalk.yellow(opts.version));
-    console.log(chalk.bold('NEW VERSION:\t'), chalk.yellow(opts.newVersion));
+    console.log(styleText('bold', 'SET FILES:\t'), styleText('yellow', files));
+    console.log(styleText('bold', 'OLD VERSION:\t'), styleText('yellow', opts.version));
+    console.log(styleText('bold', 'NEW VERSION:\t'), styleText('yellow', opts.newVersion));
   },
   tasks: function(tasks) {
     console.log('\nAbout to execute the following:');
@@ -21,7 +21,7 @@ const log = {
     });
   },
   keyValue: function(key, value) {
-    console.log(chalk.dim(key), value);
+    console.log(styleText('dim', key), value);
   },
 };
 

package/lib/utils.js

@@ -4,7 +4,7 @@ import path from 'path';
 import fs from 'fs';
 import util from 'util';
 import {globSync} from 'glob';
-import chalk from 'chalk';
+import {styleText} from 'node:util';
 import rc from 'rc';
 import semver from 'semver';
 import {config} from './config.js';
@@ -118,10 +118,10 @@ const utils = {
 
     // Special case for no releaseType (user just types "ump")
     if (isErr === 'noRelease') {
-      console.log(chalk.yellow(chalk.bold('\nCURRENT VERSION:'), opts.version));
+      console.log(styleText(['yellow', 'bold'], '\nCURRENT VERSION:'));
     } else if (isErr) {
       // All other errors
-      console.log(chalk.red(`\n${config.messages[isErr]}` || config.messages[def]));
+      console.log(styleText('red', `\n${config.messages[isErr]}` || config.messages[def]));
 
       ['releaseType', 'sourceFile', 'version'].forEach((item) => {
         log.keyValue(item, opts[item]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ump",
   "title": "ump",
-  "version": "3.5.7",
+  "version": "4.0.0",
   "description": "Bump without the B",
   "scripts": {
     "test": "npm run test:clean && npm run test:pre && npm run test:run",
@@ -25,18 +25,17 @@
     "url": "https://karlswedberg.com/"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=20.12.0"
   },
   "dependencies": {
     "@1password/sdk": "^0.3.1",
-    "@inquirer/confirm": "^6.0.3",
-    "@inquirer/select": "^5.0.3",
-    "chalk": "^5.6.2",
+    "@inquirer/confirm": "^6.0.4",
+    "@inquirer/select": "^5.0.4",
     "fs-extra": "^11.3.2",
     "git-config": "^0.0.7",
-    "glob": "^13.0.0",
+    "glob": "^13.0.1",
     "rc": "^1.2.8",
-    "semver": "^7.7.3",
+    "semver": "^7.7.4",
     "update-notifier": "^7.3.1",
     "yargs": "^18.0.0"
   },
@@ -44,7 +43,7 @@
     "@types/mocha": "^10.0.10",
     "chai": "^6.2.1",
     "eslint": "^9.39.2",
-    "eslint-config-kswedberg": "^7.2.2",
+    "eslint-config-kswedberg": "^7.2.3",
     "mocha": "^11.7.5"
   },
   "license": "MIT"