diff --git a/go.mod b/go.mod index 3f33b98..64be2ba 100644 --- a/go.mod +++ b/go.mod @@ -2,16 +2,14 @@ module github.com/gotomicro/eapi go 1.18 -replace github.com/dop251/goja v0.0.0-20230216180835-5937a312edda => github.com/link-duan/goja v0.0.0-20230301035314-075961fec17a - require ( - github.com/dop251/goja v0.0.0-20230216180835-5937a312edda - github.com/dop251/goja_nodejs v0.0.0-20230222172725-12ac04f8c000 github.com/getkin/kin-openapi v0.109.0 github.com/go-openapi/jsonpointer v0.19.5 github.com/iancoleman/strcase v0.2.0 github.com/invopop/yaml v0.1.0 github.com/knadh/koanf v1.4.4 + github.com/link-duan/goja v1.0.0 + github.com/link-duan/goja_nodejs v1.0.1 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/robertkrimen/otto v0.2.1 github.com/samber/lo v1.28.2 diff --git a/go.sum b/go.sum index b65a147..6e0aa5c 100644 --- a/go.sum +++ b/go.sum @@ -42,11 +42,8 @@ github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwu github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= -github.com/dop251/goja v0.0.0-20221118162653-d4bf6fde1b86/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM= -github.com/dop251/goja_nodejs v0.0.0-20230222172725-12ac04f8c000 h1:eJhYaEWVw87/LT0i/0cNvKyBlJ1U6qZ2SEoLEqCFzEs= -github.com/dop251/goja_nodejs v0.0.0-20230222172725-12ac04f8c000/go.mod h1:0tlktQL7yHfYEtjcRGi/eiOkbDR5XF7gyFFvbC5//E0= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -183,8 +180,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/link-duan/goja v0.0.0-20230301035314-075961fec17a h1:rBGnjcTbh+QfehzgHA13iJQA9DiBVcc2/o+Sbs5hEcI= -github.com/link-duan/goja v0.0.0-20230301035314-075961fec17a/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs= +github.com/link-duan/goja v1.0.0 h1:WgBJ9Bb8mILNspSE6K0vL/YKO7+e8suABbtASynVcsY= +github.com/link-duan/goja v1.0.0/go.mod h1:S3bockr2xYyfKf1ilMcS7mHP1jQKF63BFqjgE2M+tFY= +github.com/link-duan/goja_nodejs v1.0.1 h1:1xujlsso4m+uKuIdBNSt7N4Cwrhuno/FwHxX5yFP4G4= +github.com/link-duan/goja_nodejs v1.0.1/go.mod h1:UX6C7AHU2r/nmo0DRAIulgj7IriHuxFI5Y21niZPyl4= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= diff --git a/internal/generator/generator.go b/internal/generator/generator.go index 445aff9..ed8e0eb 100644 --- a/internal/generator/generator.go +++ b/internal/generator/generator.go @@ -6,9 +6,9 @@ import ( "fmt" "reflect" - "github.com/dop251/goja" "github.com/gotomicro/eapi/internal/jsvm" "github.com/gotomicro/eapi/spec" + "github.com/link-duan/goja" ) var VM = jsvm.New() diff --git a/internal/jsvm/vm.go b/internal/jsvm/vm.go index e1655b1..5e12243 100644 --- a/internal/jsvm/vm.go +++ b/internal/jsvm/vm.go @@ -4,10 +4,10 @@ import ( _ "embed" "fmt" - "github.com/dop251/goja" - "github.com/dop251/goja_nodejs/console" - "github.com/dop251/goja_nodejs/require" "github.com/gotomicro/eapi/spec" + "github.com/link-duan/goja" + "github.com/link-duan/goja_nodejs/console" + "github.com/link-duan/goja_nodejs/require" ) type VM struct {