Skip to content

Commit 1715c11

Browse files
committed
Upgrade to github.com/theory/jsonpath v0.11.0
Also: * Ugrade to Go v1.24.13 * Upgrade github.com/stretchr/testify to v1.11.1 * Make more explicit use of the vendored tinygo in the `Makefile`
1 parent d33043b commit 1715c11

3 files changed

Lines changed: 16 additions & 22 deletions

File tree

Makefile

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ GO ?= go
22

33
SRC_DIR := src
44
DST_DIR := pub
5-
WASM_EXEC := $(shell tinygo env TINYGOROOT)/targets/wasm_exec.js
6-
# WASM_EXEC := $(shell go env GOROOT)/misc/wasm/wasm_exec.js
5+
6+
# explicitly build the playground with _vendor/tinygo until
7+
# https://github.com/tinygo-org/tinygo/issues/4873 fixed.
78

89
playground: $(DST_DIR)/play.wasm $(DST_DIR)/index.html $(DST_DIR)/wasm_exec.js $(DST_DIR)/play.css
910

1011
ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
11-
$(DST_DIR)/play.wasm: $(SRC_DIR)/main.go
12+
$(DST_DIR)/play.wasm: $(SRC_DIR)/main.go _vendor/tinygo/bin/tinygo
1213
@mkdir -p $(@D)
13-
GOOS=js GOARCH=wasm tinygo build -no-debug -size short -o $@ $<
14+
GOOS=js GOARCH=wasm ./_vendor/tinygo/bin/tinygo build -no-debug -size short -o $@ $<
1415
# cd $(SRC_DIR); GOOS=js GOARCH=wasm go build -o $(ROOT_DIR)/$@ $$(basename "$<")
1516

1617
$(DST_DIR)/play.css: $(SRC_DIR)/play.css
@@ -21,15 +22,12 @@ $(DST_DIR)/index.html: $(SRC_DIR)/index.html
2122
mkdir -p $(@D)
2223
version=$$(grep jsonpath go.mod | awk '{print $$3}'); cat $< | sed -e "s!{{version}}!$${version}!g" > $@
2324

24-
$(DST_DIR)/wasm_exec.js: $(WASM_EXEC)
25+
$(DST_DIR)/wasm_exec.js: _vendor/tinygo/bin/tinygo
2526
mkdir -p $(@D)
26-
cp $< $@
27+
cp $(shell ./_vendor/tinygo/bin/tinygo env TINYGOROOT)/targets/wasm_exec.js $@
2728

28-
# explicitly build the playground with _vendor/tinygo until
29-
# https://github.com/tinygo-org/tinygo/issues/4873 fixed.
3029
.PHONY: run
31-
run: _vendor/tinygo
32-
env PATH="$$PWD/_vendor/tinygo/bin:$$PATH" $(MAKE) playground
30+
run: playground
3331
python3 -m http.server --directory $(DST_DIR)
3432

3533
.PHONY: brew-lint-depends # Install linting tools from Homebrew
@@ -57,11 +55,7 @@ golangci-lint: .golangci.yaml
5755
clean:
5856
rm -rf $(DST_DIR)
5957

60-
_vendor/tinygo: _vendor/tinygo0.36.0
61-
cd _vendor && ln -sF tinygo0.36.0 tinygo
62-
63-
_vendor/tinygo0.36.0:
58+
_vendor/tinygo/bin/tinygo:
6459
brew install binaryen
6560
mkdir -p _vendor
66-
curl -L https://github.com/tinygo-org/tinygo/releases/download/v0.36.0/tinygo0.36.0.darwin-arm64.tar.gz | tar zxf -
67-
mv tinygo $@
61+
cd _vendor && curl -L https://github.com/tinygo-org/tinygo/releases/download/v0.40.1/tinygo0.40.1.darwin-arm64.tar.gz | tar zxf -

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module main
22

33
go 1.24
44

5-
toolchain go1.24.9
5+
toolchain go1.24.13
66

7-
require github.com/theory/jsonpath v0.10.2
7+
require github.com/theory/jsonpath v0.11.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
44
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
5-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
6-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
7-
github.com/theory/jsonpath v0.10.2 h1:i8GeMxnD6ftNWeSeaGb/Eb8XghGjsas1eDizaQNupuE=
8-
github.com/theory/jsonpath v0.10.2/go.mod h1:ZOz+y6MxTEDcN/FOxf9AOgeHSoKHx2B+E0nD3HOtzGE=
5+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
6+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
7+
github.com/theory/jsonpath v0.11.0 h1:IlzhI/Ui8nFu50SVpnyYHzZVvI0+etEoZLR5LsZJOVc=
8+
github.com/theory/jsonpath v0.11.0/go.mod h1:vl8nfJyq9MKMbcAiKv+7N9W3jDCH8qPr0mZoZj8wRk8=
99
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
1010
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)