Merge branch 'plugins'

# Conflicts:
#	cmd_publish.go

Author: gschier

build.go

@@ -0,0 +1,31 @@
+package yaakcli
+
+import (
+	"github.com/evanw/esbuild/pkg/api"
+	"github.com/pterm/pterm"
+	"path/filepath"
+)
+
+func ESLintBuildOptions(pluginDir string) api.BuildOptions {
+	srcPath := filepath.Join(pluginDir, "src", "index.ts")
+	outPath := filepath.Join(pluginDir, "build", "index.js")
+	return api.BuildOptions{
+		EntryPoints: []string{srcPath},
+		Outfile:     outPath,
+		Platform:    api.PlatformNode,
+		Bundle:      true, // Inline dependencies
+		Write:       true, // Write to disk
+		Format:      api.FormatCommonJS,
+		LogLevel:    api.LogLevelInfo,
+	}
+}
+
+func BuildPlugin(dir string) {
+	if !fileExists(filepath.Join(dir, "package.json")) {
+		ExitError("./package.json does not exist. Ensure that you are in a plugin directory.")
+	}
+
+	pterm.Info.Printf("Building plugin %s...\n", dir)
+
+	api.Build(ESLintBuildOptions(dir))
+}

cmd_build.go

@@ -1,25 +1,24 @@
 package yaakcli
 
 import (
-	"fmt"
-	"github.com/evanw/esbuild/pkg/api"
 	"github.com/spf13/cobra"
+	"os"
+	"path/filepath"
 )
 
 var buildCmd = &cobra.Command{
 	Use:   "build entrypoint",
 	Short: "Transpile code into a runnable plugin bundle",
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		if !fileExists("./package.json") {
-			ExitError("./package.json does not exist. Ensure that you are in a plugin directory?")
-		}
-
-		srcPath := "./src/index.ts"
-		fmt.Printf("Building %s...\n", srcPath)
+		pluginDir, err := os.Getwd()
+		CheckError(err)
 
-		result := api.Build(ESLintBuildOptions([]string{srcPath}))
-		for _, o := range result.OutputFiles {
-			fmt.Printf("Compiled to: %s\n", o.Path)
+		if len(args) > 0 {
+			pluginDir, err = filepath.Abs(args[0])
+			CheckError(err)
 		}
+
+		BuildPlugin(pluginDir)
 	},
 }

cmd_dev.go

@@ -5,6 +5,7 @@ import (
 	"github.com/evanw/esbuild/pkg/api"
 	"github.com/spf13/cobra"
 	"os"
+	"path/filepath"
 )
 
 var devCmd = &cobra.Command{
@@ -16,16 +17,23 @@ var devCmd = &cobra.Command{
 			ExitError("./package.json does not exist. Ensure that you are in a plugin directory?")
 		}
 
-		srcPath := "./src/index.ts"
-		ctx, errors := api.Context(ESLintBuildOptions([]string{srcPath}))
+		pluginDir, err := os.Getwd()
+		CheckError(err)
+
+		if len(args) > 0 {
+			pluginDir, err = filepath.Abs(args[0])
+			CheckError(err)
+		}
+
+		fmt.Printf("Watching %s...\n", pluginDir)
+
+		ctx, errors := api.Context(ESLintBuildOptions(pluginDir))
 		if errors != nil {
 			println("Failed to create esbuild context")
 			os.Exit(1)
 		}
 
-		fmt.Printf("Watching %s...\n", srcPath)
-
-		err := ctx.Watch(api.WatchOptions{})
+		err = ctx.Watch(api.WatchOptions{})
 		CheckError(err)
 
 		// Returning from main() exits immediately in Go.

cmd_publish.go

@@ -16,7 +16,7 @@ var publishCmd = &cobra.Command{
 	Short: "Publish a Yaak plugin version to the plugin registry",
 	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		spinner, _ := pterm.DefaultSpinner.WithDelay(1 * time.Second).Start("Publishing plugin...")
+		pterm.Info.Println("Building plugin...")
 
 		pluginDir, err := os.Getwd()
 		CheckError(err)
@@ -26,6 +26,10 @@ var publishCmd = &cobra.Command{
 			CheckError(err)
 		}
 
+		BuildPlugin(pluginDir)
+
+		spinner, _ := pterm.DefaultSpinner.WithDelay(1 * time.Second).Start("Publishing plugin...")
+
 		zipPipeReader, zipPipeWriter := io.Pipe()
 
 		zipWriter := zip.NewWriter(zipPipeWriter)