From 1d4f2ddd9cbc3ffd48fa41ab2c039262b94f03f9 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Thu, 14 Nov 2024 20:19:39 +0400
Subject: [PATCH] chore: disable web commands (#4403)

* chore: disable web commands

* typos

* hide

* `make lint-fix`

(cherry picked from commit 686378817b9900e0c792d20d0def0868c634e6ae)

# Conflicts:
#	ignite/pkg/cosmosutil/gentx.go
---
 ignite/cmd/generate_composables.go       | 7 ++++---
 ignite/cmd/generate_hooks.go             | 7 ++++---
 ignite/cmd/generate_typescript_client.go | 5 +++--
 ignite/cmd/scaffold_react.go             | 1 +
 ignite/cmd/scaffold_vue.go               | 1 +
 ignite/pkg/cosmosutil/gentx.go           | 9 +++++++++
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ignite/cmd/generate_composables.go b/ignite/cmd/generate_composables.go
index 840b9b29b5..7518c2bd59 100644
--- a/ignite/cmd/generate_composables.go
+++ b/ignite/cmd/generate_composables.go
@@ -10,9 +10,10 @@ import (
 
 func NewGenerateComposables() *cobra.Command {
 	c := &cobra.Command{
-		Use:   "composables",
-		Short: "TypeScript frontend client and Vue 3 composables",
-		RunE:  generateComposablesHandler,
+		Hidden: true, // hidden util we have a better ts-client.
+		Use:    "composables",
+		Short:  "TypeScript frontend client and Vue 3 composables",
+		RunE:   generateComposablesHandler,
 	}
 
 	c.Flags().AddFlagSet(flagSetYes())
diff --git a/ignite/cmd/generate_hooks.go b/ignite/cmd/generate_hooks.go
index 84f570faef..35bba374e9 100644
--- a/ignite/cmd/generate_hooks.go
+++ b/ignite/cmd/generate_hooks.go
@@ -10,9 +10,10 @@ import (
 
 func NewGenerateHooks() *cobra.Command {
 	c := &cobra.Command{
-		Use:   "hooks",
-		Short: "TypeScript frontend client and React hooks",
-		RunE:  generateHooksHandler,
+		Hidden: true, // hidden util we have a better ts-client.
+		Use:    "hooks",
+		Short:  "TypeScript frontend client and React hooks",
+		RunE:   generateHooksHandler,
 	}
 
 	c.Flags().AddFlagSet(flagSetYes())
diff --git a/ignite/cmd/generate_typescript_client.go b/ignite/cmd/generate_typescript_client.go
index e58884f8c0..5c8ff989f8 100644
--- a/ignite/cmd/generate_typescript_client.go
+++ b/ignite/cmd/generate_typescript_client.go
@@ -17,8 +17,9 @@ const (
 
 func NewGenerateTSClient() *cobra.Command {
 	c := &cobra.Command{
-		Use:   "ts-client",
-		Short: "TypeScript frontend client",
+		Hidden: true, // hidden util we have a better ts-client.
+		Use:    "ts-client",
+		Short:  "TypeScript frontend client",
 		Long: `Generate a framework agnostic TypeScript client for your blockchain project.
 
 By default the TypeScript client is generated in the "ts-client/" directory. You
diff --git a/ignite/cmd/scaffold_react.go b/ignite/cmd/scaffold_react.go
index 832c156e35..3c04eb9ac1 100644
--- a/ignite/cmd/scaffold_react.go
+++ b/ignite/cmd/scaffold_react.go
@@ -11,6 +11,7 @@ import (
 // NewScaffoldReact scaffolds a React app for a chain.
 func NewScaffoldReact() *cobra.Command {
 	c := &cobra.Command{
+		Hidden:  true, // hidden util we have a better ts-client.
 		Use:     "react",
 		Short:   "React web app template",
 		Args:    cobra.NoArgs,
diff --git a/ignite/cmd/scaffold_vue.go b/ignite/cmd/scaffold_vue.go
index bb9b953306..7c095ba506 100644
--- a/ignite/cmd/scaffold_vue.go
+++ b/ignite/cmd/scaffold_vue.go
@@ -11,6 +11,7 @@ import (
 // NewScaffoldVue scaffolds a Vue.js app for a chain.
 func NewScaffoldVue() *cobra.Command {
 	c := &cobra.Command{
+		Hidden:  true, // hidden util we have a better ts-client.
 		Use:     "vue",
 		Short:   "Vue 3 web app template",
 		Args:    cobra.NoArgs,
diff --git a/ignite/pkg/cosmosutil/gentx.go b/ignite/pkg/cosmosutil/gentx.go
index 1fd3ecb53b..a09abd31d1 100644
--- a/ignite/pkg/cosmosutil/gentx.go
+++ b/ignite/pkg/cosmosutil/gentx.go
@@ -6,10 +6,19 @@ import (
 	"os"
 
 	sdkmath "cosmossdk.io/math"
+<<<<<<< HEAD
 	"github.com/cometbft/cometbft/crypto/ed25519"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/ignite/cli/v28/ignite/pkg/errors"
+=======
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/cometbft/cometbft/crypto/ed25519"
+
+	"github.com/ignite/cli/v29/ignite/pkg/errors"
+>>>>>>> 68637881 (chore: disable web commands (#4403))
 )
 
 type (