summaryrefslogtreecommitdiffhomepage
path: root/cmd
diff options
context:
space:
mode:
authorJames Tucker <james@tailscale.com>2023-09-28 16:46:04 -0700
committerJames Tucker <jftucker@gmail.com>2023-09-29 14:28:45 -0700
commit87bc831730a415c4352c343ebbb37fc5d81335ea (patch)
tree08c6f909ba572a490fe1d81e7607160004ab9d7d /cmd
parent71f2c67c6b55a17f38a4b7203683e9352ef7faff (diff)
downloadtailscale-87bc831730a415c4352c343ebbb37fc5d81335ea.tar.xz
tailscale-87bc831730a415c4352c343ebbb37fc5d81335ea.zip
go.mod,cmd/tsconnect: bump esbuild
Updates #8043 Signed-off-by: James Tucker <james@tailscale.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/tsconnect/common.go11
1 files changed, 7 insertions, 4 deletions
diff --git a/cmd/tsconnect/common.go b/cmd/tsconnect/common.go
index dae8b73a2..a387c00c9 100644
--- a/cmd/tsconnect/common.go
+++ b/cmd/tsconnect/common.go
@@ -71,7 +71,7 @@ func commonSetup(dev bool) (*esbuild.BuildOptions, error) {
},
},
},
- JSXMode: esbuild.JSXModeAutomatic,
+ JSX: esbuild.JSXAutomatic,
}, nil
}
@@ -137,16 +137,19 @@ func runEsbuildServe(buildOptions esbuild.BuildOptions) {
if err != nil {
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),
Host: host,
Servedir: "./",
- }, buildOptions)
+ })
if err != nil {
log.Fatalf("Cannot start esbuild server: %v", err)
}
log.Printf("Listening on http://%s:%d\n", result.Host, result.Port)
- result.Wait()
}
func runEsbuild(buildOptions esbuild.BuildOptions) esbuild.BuildResult {