Merge pull request #11 from DSGT-DLP/pnpm

Pnpm
DSGT-DLP · Nov 1, 2023 · 160b391 · 160b391
2 parents 1d4a279 + b49009a
commit 160b391
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 16 deletions.
diff --git a/cmd/frontend/add/add.go b/cmd/frontend/add/add.go
@@ -17,9 +17,13 @@ var AddCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		bash_args := []string{"add", args[0]}
 		if cmd.Flag("dev").Value.String() == "true" {
-			bash_args = append(bash_args, "--dev")
+			bash_args = append(bash_args, "-D")
+		}
+		if cmd.Flag("yarn").Value.String() == "true" {
+			frontend.ExecBashCmd("yarn", bash_args...)
+		} else {
+			frontend.ExecBashCmd("pnpm", bash_args...)
 		}
-		frontend.ExecBashCmd("yarn", bash_args...)
 	},
 }
 

diff --git a/cmd/frontend/frontend.go b/cmd/frontend/frontend.go
@@ -21,6 +21,7 @@ var FrontendCmd = &cobra.Command{
 
 func init() {
 	cmd.RootCmd.AddCommand(FrontendCmd)
+	FrontendCmd.PersistentFlags().Bool("yarn", false, "Uses yarn instead of pnpm")
 }
 
 func ExecBashCmd(name string, args ...string) string {

diff --git a/cmd/frontend/install/install.go b/cmd/frontend/install/install.go
@@ -19,7 +19,11 @@ var InstallCmd = &cobra.Command{
 		if cmd.Flag("force").Value.String() == "true" {
 			bash_args = append(bash_args, "--force")
 		}
-		frontend.ExecBashCmd("yarn", bash_args...)
+		if cmd.Flag("yarn").Value.String() == "true" {
+			frontend.ExecBashCmd("yarn", bash_args...)
+		} else {
+			frontend.ExecBashCmd("pnpm", bash_args...)
+		}
 	},
 }
 

diff --git a/cmd/frontend/remove/remove.go b/cmd/frontend/remove/remove.go
@@ -17,9 +17,13 @@ var RemoveCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		bash_args := []string{"remove", args[0]}
 		if cmd.Flag("dev").Value.String() == "true" {
-			bash_args = append(bash_args, "--dev")
+			bash_args = append(bash_args, "-D")
+		}
+		if cmd.Flag("yarn").Value.String() == "true" {
+			frontend.ExecBashCmd("yarn", bash_args...)
+		} else {
+			frontend.ExecBashCmd("pnpm", bash_args...)
 		}
-		frontend.ExecBashCmd("yarn", bash_args...)
 	},
 }
 

diff --git a/cmd/frontend/start/start.go b/cmd/frontend/start/start.go
@@ -17,7 +17,12 @@ var StartCmd = &cobra.Command{
 	Long:  `Starts an instance of the nextjs frontend in the terminal`,
 	Args:  cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
-		frontend.ExecBashCmd("yarn", "next", "dev", "-p", fmt.Sprintf("%v", cmd.Flag("port").Value))
+		if cmd.Flag("yarn").Value.String() == "true" {
+			frontend.ExecBashCmd("yarn", "start", "-p", fmt.Sprintf("%v", cmd.Flag("port").Value))
+		} else {
+			frontend.ExecBashCmd("pnpm", "start", "-p", fmt.Sprintf("%v", cmd.Flag("port").Value))
+		}
+
 	},
 }
 

diff --git a/cmd/serverless/core/add/add.go b/cmd/serverless/core/add/add.go
@@ -17,9 +17,14 @@ var AddCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		bash_args := []string{"add", args[0]}
 		if cmd.Flag("dev").Value.String() == "true" {
-			bash_args = append(bash_args, "--dev")
+			bash_args = append(bash_args, "-D")
 		}
-		core.ExecBashCmd("yarn", bash_args...)
+		if cmd.Flag("yarn").Value.String() == "true" {
+			core.ExecBashCmd("yarn", bash_args...)
+		} else {
+			core.ExecBashCmd("pnpm", bash_args...)
+		}
+
 	},
 }
 

diff --git a/cmd/serverless/core/remove/remove.go b/cmd/serverless/core/remove/remove.go
@@ -17,9 +17,14 @@ var RemoveCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		bash_args := []string{"remove", args[0]}
 		if cmd.Flag("dev").Value.String() == "true" {
-			bash_args = append(bash_args, "--dev")
+			bash_args = append(bash_args, "-D")
 		}
-		core.ExecBashCmd("yarn", bash_args...)
+		if cmd.Flag("yarn").Value.String() == "true" {
+			core.ExecBashCmd("yarn", bash_args...)
+		} else {
+			core.ExecBashCmd("pnpm", bash_args...)
+		}
+
 	},
 }
 

diff --git a/cmd/serverless/functions/add/add.go b/cmd/serverless/functions/add/add.go
@@ -17,9 +17,14 @@ var AddCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		bash_args := []string{"add", args[0]}
 		if cmd.Flag("dev").Value.String() == "true" {
-			bash_args = append(bash_args, "--dev")
+			bash_args = append(bash_args, "-D")
 		}
-		functions.ExecBashCmd("yarn", bash_args...)
+		if cmd.Flag("yarn").Value.String() == "true" {
+			functions.ExecBashCmd("yarn", bash_args...)
+		} else {
+			functions.ExecBashCmd("pnpm", bash_args...)
+		}
+
 	},
 }
 

diff --git a/cmd/serverless/functions/remove/remove.go b/cmd/serverless/functions/remove/remove.go
@@ -17,9 +17,14 @@ var RemoveCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		bash_args := []string{"remove", args[0]}
 		if cmd.Flag("dev").Value.String() == "true" {
-			bash_args = append(bash_args, "--dev")
+			bash_args = append(bash_args, "-D")
 		}
-		functions.ExecBashCmd("yarn", bash_args...)
+		if cmd.Flag("yarn").Value.String() == "true" {
+			functions.ExecBashCmd("yarn", bash_args...)
+		} else {
+			functions.ExecBashCmd("pnpm", bash_args...)
+		}
+
 	},
 }
 

diff --git a/cmd/serverless/install/install.go b/cmd/serverless/install/install.go
@@ -19,7 +19,11 @@ var InstallCmd = &cobra.Command{
 		if cmd.Flag("force").Value.String() == "true" {
 			bash_args = append(bash_args, "--force")
 		}
-		serverless.ExecBashCmd("yarn", bash_args...)
+		if cmd.Flag("yarn").Value.String() == "true" {
+			serverless.ExecBashCmd("yarn", bash_args...)
+		} else {
+			serverless.ExecBashCmd("pnpm", bash_args...)
+		}
 	},
 }
 

diff --git a/cmd/serverless/serverless.go b/cmd/serverless/serverless.go
@@ -20,6 +20,7 @@ var ServerlessCmd = &cobra.Command{
 
 func init() {
 	cmd.RootCmd.AddCommand(ServerlessCmd)
+	cmd.RootCmd.PersistentFlags().Bool("yarn", false, "Uses yarn instead of pnpm")
 }
 
 func ExecBashCmd(name string, args ...string) string {

diff --git a/cmd/serverless/start/start.go b/cmd/serverless/start/start.go
@@ -15,7 +15,11 @@ var StartCmd = &cobra.Command{
 	Long:  `Starts SST's Live Lambda Development environment in the terminal`,
 	Args:  cobra.ExactArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
-		serverless.ExecBashCmd("yarn", "sst", "dev")
+		if cmd.Flag("yarn").Value.String() == "true" {
+			serverless.ExecBashCmd("yarn", "sst", "dev")
+		} else {
+			serverless.ExecBashCmd("pnpm", "sst", "dev")
+		}
 	},
 }