@storm-software/git-tools 2.131.32 → 2.131.34

package/bin/git.js

@@ -22,7 +22,7 @@ import '@inquirer/password';
 import '@inquirer/search';
 import default11 from '@inquirer/select';
 import shellescape from 'any-shell-escape';
-import chalkTemplate from 'chalk-template';
+import chalk2 from 'chalk';
 import fs, { readFile as readFile$1, writeFile } from 'node:fs/promises';
 import createBasePreset from 'conventional-changelog-conventionalcommits';
 import { readCachedProjectGraph, createProjectGraphAsync as createProjectGraphAsync$1, readProjectsConfigurationFromProjectGraph as readProjectsConfigurationFromProjectGraph$1 } from 'nx/src/project-graph/project-graph';
@@ -47,7 +47,6 @@ import axios from 'axios';
 import { homedir } from 'node:os';
 import { defaultCreateReleaseProvider, GithubRemoteReleaseClient } from 'nx/src/command-line/release/utils/remote-release-clients/github';
 import { parse } from 'yaml';
-import chalk from 'chalk';
 import { printAndFlushChanges as printAndFlushChanges$1 } from 'nx/src/command-line/release/utils/print-changes';
 import { createGitTagValues, handleDuplicateGitTags, createCommitMessageValues, isPrerelease, shouldPreferDockerVersionForReleaseGroup, ReleaseVersion, noDiffInChangelogMessage, shouldSkipVersionActions } from 'nx/src/command-line/release/utils/shared';
 import { interpolate as interpolate$1 } from 'nx/src/tasks-runner/utils';
@@ -1209,7 +1208,7 @@ async function createState(workspaceConfig, configPath) {
       if (state.config.questions.type.enum) {
         ret[key] = {
           ...state.config.questions.type.enum[key],
-          title: chalkTemplate`${state.config.questions.type.enum[key]?.emoji ? `${state.config.questions.type.enum[key]?.emoji} ` : ""}{bold ${key}} ${state.config.questions.type.enum[key]?.title && state.config.questions.type.enum[key]?.title !== key ? `- ${state.config.questions.type.enum[key]?.title}` : ""}${state.config.questions.type.enum[key]?.semverBump ? ` (version bump: ${state.config.questions.type.enum[key]?.semverBump})` : ""}`,
+          title: `${state.config.questions.type.enum[key]?.emoji ? `${state.config.questions.type.enum[key]?.emoji} ` : ""}${chalk2.bold(key)} ${state.config.questions.type.enum[key]?.title && state.config.questions.type.enum[key]?.title !== key ? `- ${state.config.questions.type.enum[key]?.title}` : ""}${state.config.questions.type.enum[key]?.semverBump ? ` (version bump: ${state.config.questions.type.enum[key]?.semverBump})` : ""}`,
           hidden: false
         };
       }
@@ -1225,7 +1224,7 @@ async function createState(workspaceConfig, configPath) {
     for (const scope of scopes) {
       if (scope === "monorepo") {
         state.config.questions.scope.enum[scope] = {
-          title: chalkTemplate`{bold monorepo} - workspace root`,
+          title: chalk2.bold("monorepo") + " - workspace root",
           description: "The base workspace package (workspace root)",
           hidden: false,
           projectRoot: "/"
@@ -1259,7 +1258,7 @@ async function createState(workspaceConfig, configPath) {
             description = packageJson.description || description;
           }
           state.config.questions.scope.enum[scope] = {
-            title: chalkTemplate`{bold ${project.name}} - ${project.root}`,
+            title: chalk2.bold(project.name) + " - " + project.root,
             description,
             hidden: false,
             projectRoot: project.root
@@ -1331,22 +1330,24 @@ async function runCommit(commitizenFile, dryRun = false) {
   if (dryRun) {
     writeInfo("Running in dry mode.", workspaceConfig);
   }
-  console.log(chalkTemplate`
-{bold.#999999 ----------------------------------------}
-
-{bold.#FFFFFF   ${brandIcon(workspaceConfig)}  Storm Software Git-Tools - Commit}
-{#CCCCCC Please provide the requested details below...}
-`);
+  console.log(
+    chalk2.bold.hex("#999999")("----------------------------------------") + "\n\n" + chalk2.bold.hex("#FFFFFF")(
+      `  ${brandIcon(workspaceConfig)}  Storm Software Git-Tools - Commit`
+    ) + "\n" + chalk2.hex("#CCCCCC")("Please provide the requested details below...")
+  );
   state.answers = await askQuestions(state);
   const message = formatCommitMessage(state, workspaceConfig);
   const commitMsgFile = joinPaths(getGitDir(), "COMMIT_EDITMSG");
-  console.log(chalkTemplate`
-{bold.#999999 ----------------------------------------}
+  console.log(
+    chalk2.bold.hex("#999999")("----------------------------------------") + `
 
-{bold.#FFFFFF Commit message} - {#DDDDDD ${message}}
-{bold.#FFFFFF Git-Commit File} - {#DDDDDD ${commitMsgFile}}
+${chalk2.bold.hex("#FFFFFF")("Commit message")} - ${chalk2.hex("#DDDDDD")(message)}
+${chalk2.bold.hex("#FFFFFF")("Git-Commit File")} - ${chalk2.hex("#DDDDDD")(
+      commitMsgFile
+    )}
 
-    `);
+    `
+  );
   await runCommitLint(workspaceConfig, { message });
   const commandItems = ["git", "commit", "-S"];
   commandItems.push(...["--file", commitMsgFile]);
@@ -1376,8 +1377,7 @@ async function askQuestions(state) {
   return state.answers;
 }
 async function askQuestion(index, question) {
-  const message = chalkTemplate`{bold ${index + 1}. ${question.title}} - ${question.description}
-`;
+  const message = `${chalk2.bold(`${index + 1}. ${question.title}`)} - ${question.description}`;
   if (question.type === "select" && question.enum && Object.keys(question.enum).length > 1) {
     return default11({
       message,
@@ -2570,7 +2570,7 @@ async function generateChangelogForProjects({
     if (interpolatedTreePath) {
       const prefix = dryRun ? "Previewing" : "Generating";
       output.log({
-        title: `${prefix} an entry in ${interpolatedTreePath} for ${chalk.white(
+        title: `${prefix} an entry in ${interpolatedTreePath} for ${chalk2.white(
           releaseVersion.gitTag
         )}`
       });