Compare commits

..

No commits in common. "30f8be3d5d40102187c57310423c08793eaaf898" and "734a6ce62e17bf8e86c87e2137bcc6a7b3a4cc3f" have entirely different histories.

4 changed files with 7 additions and 34 deletions

View File

@ -1,9 +1,7 @@
package main package main
import ( import (
"fmt"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"github.com/evanw/esbuild/pkg/api" "github.com/evanw/esbuild/pkg/api"
@ -36,19 +34,6 @@ func buildAction(ctx *cli.Context) error {
api.Build(o.ESBuild.BuildOptions) api.Build(o.ESBuild.BuildOptions)
replace(o) replace(o)
if ctx.Bool("p") && o.ProductionBuildOptions.CmdPostBuild != "" {
fmt.Printf("Executing post production build command `%s`\n", o.ProductionBuildOptions.CmdPostBuild)
cmd := exec.Command("sh", "-c", o.ProductionBuildOptions.CmdPostBuild)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil {
fmt.Printf("Failed to execute post production build command `%s`: %+v\n", o.ProductionBuildOptions.CmdPostBuild, err)
os.Exit(1)
}
}
} }
return nil return nil

View File

@ -28,7 +28,7 @@ type ESBuildExtended struct {
type options struct { type options struct {
ESBuild ESBuildExtended ESBuild ESBuildExtended
Watch struct { Watch struct {
Paths []string Path string
Exclude []string Exclude []string
} }
Serve struct { Serve struct {
@ -52,9 +52,6 @@ type options struct {
From string From string
To string To string
} }
ProductionBuildOptions struct {
CmdPostBuild string
}
} }
func readCfg(cfgPath string) []options { func readCfg(cfgPath string) []options {
@ -92,7 +89,7 @@ func main() {
app := &cli.App{ app := &cli.App{
Name: "gowebbuild", Name: "gowebbuild",
Usage: "All in one tool to build web frontend projects.", Usage: "All in one tool to build web frontend projects.",
Version: "4.4.0", Version: "4.3.0",
Authors: []*cli.Author{{ Authors: []*cli.Author{{
Name: "trading-peter (https://github.com/trading-peter)", Name: "trading-peter (https://github.com/trading-peter)",
}}, }},

View File

@ -1,6 +1,6 @@
{ {
"Watch": { "Watch": {
"Paths": [ "./frontend/src" ], "Path": "./frontend/src",
"Exclude": [ "./dist" ] "Exclude": [ "./dist" ]
}, },
"Copy": [ "Copy": [
@ -45,8 +45,5 @@
"Bundle": true, "Bundle": true,
"Write": true, "Write": true,
"LogLevel": 3 "LogLevel": 3
},
"ProductionBuildOptions": {
"CmdPostBuild": "my-build-script.sh"
} }
} }

View File

@ -38,15 +38,9 @@ func watchAction(ctx *cli.Context) error {
w.Ignore(opts.Watch.Exclude...) w.Ignore(opts.Watch.Exclude...)
} }
if opts.ESBuild.Outdir != "" { if err := w.AddRecursive(opts.Watch.Path); err != nil {
w.Ignore(opts.ESBuild.Outdir) fmt.Println(err.Error())
} os.Exit(1)
for _, p := range opts.Watch.Paths {
if err := w.AddRecursive(p); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
} }
go func() { go func() {
@ -66,7 +60,7 @@ func watchAction(ctx *cli.Context) error {
} }
}() }()
fmt.Printf("Watching %d elements in %s\n", len(w.WatchedFiles()), opts.Watch.Paths) fmt.Printf("Watching %d elements in %s\n", len(w.WatchedFiles()), opts.Watch.Path)
purge(opts) purge(opts)
cp(opts) cp(opts)