diff options
| author | James Tucker <james@tailscale.com> | 2023-09-28 16:46:04 -0700 |
|---|---|---|
| committer | James Tucker <jftucker@gmail.com> | 2023-09-29 14:28:45 -0700 |
| commit | 87bc831730a415c4352c343ebbb37fc5d81335ea (patch) | |
| tree | 08c6f909ba572a490fe1d81e7607160004ab9d7d | |
| parent | 71f2c67c6b55a17f38a4b7203683e9352ef7faff (diff) | |
| download | tailscale-87bc831730a415c4352c343ebbb37fc5d81335ea.tar.xz tailscale-87bc831730a415c4352c343ebbb37fc5d81335ea.zip | |
go.mod,cmd/tsconnect: bump esbuild
Updates #8043
Signed-off-by: James Tucker <james@tailscale.com>
| -rw-r--r-- | cmd/tsconnect/common.go | 11 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 |
3 files changed, 10 insertions, 5 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 { @@ -21,7 +21,7 @@ require ( github.com/dave/jennifer v1.6.1 github.com/dblohm7/wingoes v0.0.0-20230929194252-e994401fc077 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/fxamacker/cbor/v2 v2.4.0 github.com/go-json-experiment/json v0.0.0-20230908182459-f320be06fe37 @@ -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/evanw/esbuild v0.14.53 h1:9uU73SZUmP1jRQhaC6hPm9aoqFGYlPwfk7OrhG6AhpQ= 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/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= |