Skip to content

Commit

Permalink
dev command
Browse files Browse the repository at this point in the history
  • Loading branch information
teintinu committed Aug 15, 2021
1 parent 2b8aa5e commit 76d1ed1
Show file tree
Hide file tree
Showing 11 changed files with 304 additions and 7,694 deletions.
38 changes: 1 addition & 37 deletions cmd/dev.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
package cmd

import (
"errors"
"os"
"os/exec"
"sync"

"github.com/evanw/esbuild/pkg/api"
"github.com/spf13/cobra"
"github.com/teintinu/monoclean/internal"
)
Expand All @@ -30,36 +24,6 @@ var devCmd = &cobra.Command{
return err
}

wg := &sync.WaitGroup{}

wg.Add(2)
go devTestApps(repo, wg)
go devRunExecutables(repo, wg)

wg.Wait()
return nil
return internal.Dev(repo)
},
}

func devTestApps(repo *internal.Repository, wg *sync.WaitGroup) {
err := internal.Test(repo, internal.TestOptions{
Watch: true,
})

var exitErr *exec.ExitError
if errors.As(err, &exitErr) {
os.Exit(exitErr.ExitCode())
}
wg.Done()
}

func devRunExecutables(repo *internal.Repository, wg *sync.WaitGroup) {
for _, pkg := range repo.Packages {
internal.BundleWithEsbuild(repo, pkg, &internal.BuildOpts{
Target: api.ESNext,
Minify: false,
Mode: internal.WatchAndRun,
})
}
wg.Done()
}
10 changes: 8 additions & 2 deletions cmd/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import (
"github.com/teintinu/monoclean/internal"
)

var testOpts = internal.TestOptions{}
var testOpts = internal.TestOptions{
Colors: true,
}

func init() {
rootCmd.AddCommand(testCmd)
Expand All @@ -29,7 +31,11 @@ var testCmd = &cobra.Command{
return err
}

err := internal.Test(repo, testOpts)
jestCmd := internal.CreateJestCommand(repo, testOpts)
jestCmd.Stdin = os.Stdin
jestCmd.Stdout = os.Stdout
jestCmd.Stderr = os.Stderr
err := jestCmd.Run()
var exitErr *exec.ExitError
if errors.As(err, &exitErr) {
os.Exit(exitErr.ExitCode())
Expand Down
2,858 changes: 0 additions & 2,858 deletions examples/simple-workspace/yarn-error.log

This file was deleted.

4,784 changes: 0 additions & 4,784 deletions examples/simple-workspace/yarn.lock

This file was deleted.

5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ module github.com/teintinu/monoclean
go 1.15

require (
github.com/evanw/esbuild v0.8.49
github.com/evanw/esbuild v0.12.20 // indirect
github.com/fatih/color v1.12.0
github.com/goccy/go-yaml v1.8.8
github.com/kr/pty v1.1.8 // indirect
github.com/natefinch/atomic v0.0.0-20200526193002-18c0533a5b09
github.com/spf13/cobra v1.1.3
github.com/teintinu/gjobs v1.0.5 // indirect
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 // indirect
)
15 changes: 13 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/evanw/esbuild v0.8.49 h1:5Pq/z1C+s07oD6y2eRU2TcOdPrwL8bm/2WnZiOtMpbE=
github.com/evanw/esbuild v0.8.49/go.mod h1:y2AFBAGVelPqPodpdtxWWqe6n2jYf5FrsJbligmRmuw=
github.com/evanw/esbuild v0.12.20 h1:cDvP8vtNwlSt+ebXOKIUImWAWXk+2MSByOKEXFxc4rs=
github.com/evanw/esbuild v0.12.20/go.mod h1:y2AFBAGVelPqPodpdtxWWqe6n2jYf5FrsJbligmRmuw=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=
Expand Down Expand Up @@ -118,6 +120,8 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
Expand Down Expand Up @@ -243,6 +247,8 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand All @@ -268,11 +274,16 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 h1:V066+OYJ66oTjnhm4Yrn7SXIwSCiDQJxpBxmvqb1N1c=
golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand Down
7 changes: 7 additions & 0 deletions internal/compat.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// +build !darwin

package internal

const (
linefeedDelimiter = 13
)
67 changes: 67 additions & 0 deletions internal/dev.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package internal

import (
"regexp"
"sync"

"github.com/evanw/esbuild/pkg/api"
)

const DevPort = 37000

func Dev(repo *Repository) error {
wg := &sync.WaitGroup{}

webterm := &WebTerm{}

wg.Add(2)
go devTestApps(repo, wg, webterm)
go devRunExecutables(repo, wg, webterm)

webterm.Start(DevPort)
wg.Wait()

return nil
}

func devTestApps(repo *Repository, wg *sync.WaitGroup, webterm *WebTerm) {
jestCmd := CreateJestCommand(repo, TestOptions{
Watch: true,
Coverage: false,
Colors: true,
})
jestStdIn, jestStdOut := webterm.AddShell("/jest", "Tests", jestCmd)

go func() {
for {
ac := <-webterm.testCommandChannel
if ac == tcExecuteAllTests {
jestStdIn <- "a"
}
}
}()
rgTestSummary := regexp.MustCompile(`^.*Tests:.+(?:(\d+)\s+failed,)?.+(\d+).+passed,.+(\d+).+total.*$`)
for !webterm.closed {
line := <-jestStdOut
// Tests: 5 passed, 5 total
// Tests: 1 failed, 4 passed, 5 total
testResult := rgTestSummary.FindStringSubmatch(line)
if len(testResult[0]) > 0 {
failed := testResult[1]
passed := testResult[1]
total := testResult[1]
webterm.testNotifyChannel <- "testResult," + failed + "," + passed + "," + total
}
}
}

func devRunExecutables(repo *Repository, wg *sync.WaitGroup, webterm *WebTerm) {
for _, pkg := range repo.Packages {
BundleWithEsbuild(repo, pkg, &BuildOpts{
Target: api.ESNext,
Minify: false,
Mode: WatchAndRun,
})
}
wg.Done()
}
2 changes: 0 additions & 2 deletions internal/esbuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ func BundleWithEsbuild(repo *Repository, pkg *Package, opts *BuildOpts) (*BuildJ

if opts.Mode == WatchAndRun {
watch = &api.WatchMode{
SpinnerBusy: "building",
SpinnerIdle: []string{""},
OnRebuild: func(result api.BuildResult) {
if len(result.Errors) > 0 {
for _, msg := range result.Errors {
Expand Down
14 changes: 7 additions & 7 deletions internal/test.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package internal

import (
"os"
"os/exec"
"path"
)

type TestOptions struct {
Watch bool
Coverage bool
Colors bool
}

func Test(repo *Repository, opts TestOptions) error {
func CreateJestCommand(repo *Repository, opts TestOptions) *exec.Cmd {
bin := path.Join(repo.RootDir, "node_modules", ".bin", "jest")
var args = []string{}
if opts.Watch {
Expand All @@ -20,9 +20,9 @@ func Test(repo *Repository, opts TestOptions) error {
if opts.Coverage {
args = append(args, "--coverage")
}
jest := exec.Command(bin, args...)
jest.Stdin = os.Stdin
jest.Stdout = os.Stdout
jest.Stderr = os.Stderr
return jest.Run()
if !opts.Colors {
args = append(args, "--no-colors")
}
jestCmd := exec.Command(bin, args...)
return jestCmd
}
Loading

0 comments on commit 76d1ed1

Please sign in to comment.