TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

go.mod,cmd/tsconnect: bump esbuild

Browse Source 
Updates #8043
Signed-off-by: James Tucker <james@tailscale.com>
This commit is contained in:
James Tucker 2023-09-28 16:46:04 -07:00 committed by James Tucker
parent 71f2c67c6b
commit 87bc831730
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/tsconnect/common.go
View File

@ -71,7 +71,7 @@ func commonSetup(dev bool) (*esbuild.BuildOptions, error) {
}, },
}, },
}, },
JSXMode: esbuild.JSXModeAutomatic, JSX: esbuild.JSXAutomatic,
}, nil }, nil
} }
@ -137,16 +137,19 @@ func runEsbuildServe(buildOptions esbuild.BuildOptions) {
if err != nil { if err != nil {
log.Fatalf("Cannot parse port: %v", err) log.Fatalf("Cannot parse port: %v", err)
} }
result, err := esbuild.Serve(esbuild.ServeOptions{ buildContext, ctxErr := esbuild.Context(buildOptions)
if ctxErr != nil {
log.Fatalf("Cannot create esbuild context: %v", err)
}
result, err := buildContext.Serve(esbuild.ServeOptions{
Port: uint16(port), Port: uint16(port),
Host: host, Host: host,
Servedir: "./", Servedir: "./",
}, buildOptions) })
if err != nil { if err != nil {
log.Fatalf("Cannot start esbuild server: %v", err) log.Fatalf("Cannot start esbuild server: %v", err)
} }
log.Printf("Listening on http://%s:%d\n", result.Host, result.Port) log.Printf("Listening on http://%s:%d\n", result.Host, result.Port)
result.Wait()
} }
func runEsbuild(buildOptions esbuild.BuildOptions) esbuild.BuildResult { func runEsbuild(buildOptions esbuild.BuildOptions) esbuild.BuildResult {

2
go.mod
View File

@ -21,7 +21,7 @@ require (
github.com/dave/jennifer v1.6.1 github.com/dave/jennifer v1.6.1
github.com/dblohm7/wingoes v0.0.0-20230929194252-e994401fc077 github.com/dblohm7/wingoes v0.0.0-20230929194252-e994401fc077
github.com/dsnet/try v0.0.3 github.com/dsnet/try v0.0.3
github.com/evanw/esbuild v0.14.53 github.com/evanw/esbuild v0.19.4
github.com/frankban/quicktest v1.14.5 github.com/frankban/quicktest v1.14.5
github.com/fxamacker/cbor/v2 v2.4.0 github.com/fxamacker/cbor/v2 v2.4.0
github.com/go-json-experiment/json v0.0.0-20230908182459-f320be06fe37 github.com/go-json-experiment/json v0.0.0-20230908182459-f320be06fe37

2
go.sum
View File

@ -262,6 +262,8 @@ github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJ
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
github.com/evanw/esbuild v0.14.53 h1:9uU73SZUmP1jRQhaC6hPm9aoqFGYlPwfk7OrhG6AhpQ= github.com/evanw/esbuild v0.14.53 h1:9uU73SZUmP1jRQhaC6hPm9aoqFGYlPwfk7OrhG6AhpQ=
github.com/evanw/esbuild v0.14.53/go.mod h1:iINY06rn799hi48UqEnaQvVfZWe6W9bET78LbvN8VWk= github.com/evanw/esbuild v0.14.53/go.mod h1:iINY06rn799hi48UqEnaQvVfZWe6W9bET78LbvN8VWk=
github.com/evanw/esbuild v0.19.4 h1:Etk+6ZCjtNxZZLEgMKSqpO0/oM0k1WYKJabaPMJ39iQ=
github.com/evanw/esbuild v0.19.4/go.mod h1:iINY06rn799hi48UqEnaQvVfZWe6W9bET78LbvN8VWk=
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=