From 5bbb17583549d4456f54415e95e8465e76305dd6 Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Thu, 13 Jun 2024 20:22:28 -0300
Subject: [PATCH] rename cli to cli.cjs to match generate-blueprint for easier
 maintenace

---
 .github/actions/compare-base/action.yml        | 2 +-
 .github/actions/setup/action.yml               | 2 +-
 cli/{khipster.js => cli.cjs}                   | 0
 package-lock.json                              | 2 +-
 package.json                                   | 2 +-
 test-integration/scripts/00-init-env.sh        | 2 +-
 test-integration/scripts/11-generate-config.sh | 2 +-
 test-integration/scripts/14-jhipster-info.sh   | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename cli/{khipster.js => cli.cjs} (100%)

diff --git a/.github/actions/compare-base/action.yml b/.github/actions/compare-base/action.yml
index a0a562ba9..67f136d34 100644
--- a/.github/actions/compare-base/action.yml
+++ b/.github/actions/compare-base/action.yml
@@ -43,7 +43,7 @@ runs:
               git checkout @~1
               git log
               npm install
-              cp "${{ github.workspace }}/jhipster-kotlin"/cli/khipster.js cli/
+              cp "${{ github.workspace }}/jhipster-kotlin"/cli/cli.cjs cli/
           shell: bash
         - name: 'MERGE: merge base config'
           id: base-config
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index d20efdf99..04ce23a53 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -91,7 +91,7 @@ inputs:
     executable:
         description: 'Executable'
         required: false
-        default: khipster.js
+        default: cli.cjs
 outputs:
     java-version:
         description: 'Java version'
diff --git a/cli/khipster.js b/cli/cli.cjs
similarity index 100%
rename from cli/khipster.js
rename to cli/cli.cjs
diff --git a/package-lock.json b/package-lock.json
index 5a6f404ef..8a8ad50c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
                 "yeoman-generator": "5.7.0"
             },
             "bin": {
-                "khipster": "cli/khipster.js"
+                "khipster": "cli/cli.cjs"
             },
             "devDependencies": {
                 "chai": "4.3.6",
diff --git a/package.json b/package.json
index ea3deb2d9..70b889b53 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "./esm/generators/*": "./generators/*/esm.mjs"
     },
     "bin": {
-        "khipster": "cli/khipster.js"
+        "khipster": "cli/cli.cjs"
     },
     "files": [
         "cli",
diff --git a/test-integration/scripts/00-init-env.sh b/test-integration/scripts/00-init-env.sh
index 1d55046cd..ae1f69662 100755
--- a/test-integration/scripts/00-init-env.sh
+++ b/test-integration/scripts/00-init-env.sh
@@ -81,7 +81,7 @@ if [[ "$KHI_FOLDER_APP" == "" ]]; then
 fi
 
 if [[ "$KHI_CLI" == "" ]]; then
-    KHI_CLI=khipster.js
+    KHI_CLI=cli.cjs
 fi
 
 # set correct OpenJDK version
diff --git a/test-integration/scripts/11-generate-config.sh b/test-integration/scripts/11-generate-config.sh
index 1eb8a6d69..2b95ea090 100755
--- a/test-integration/scripts/11-generate-config.sh
+++ b/test-integration/scripts/11-generate-config.sh
@@ -189,7 +189,7 @@ fi
 # Generate jdl entities
 #-------------------------------------------------------------------------------
 if [[ "$JHI_JDL_ENTITY" != "" && "$JHI_JDL_ENTITY" != "none" ]]; then
-    khipster.js --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$JHI_JDL_ENTITY.jdl --json-only
+    cli.cjs --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$JHI_JDL_ENTITY.jdl --json-only
 fi
 
 #-------------------------------------------------------------------------------
diff --git a/test-integration/scripts/14-jhipster-info.sh b/test-integration/scripts/14-jhipster-info.sh
index cb3d1f898..683e4c281 100755
--- a/test-integration/scripts/14-jhipster-info.sh
+++ b/test-integration/scripts/14-jhipster-info.sh
@@ -4,4 +4,4 @@ set -e
 source $(dirname $0)/00-init-env.sh
 
 cd "$KHI_FOLDER_APP"
-khipster.js info
+cli.cjs info