Skip to content

Tags: alexiscolin/gno

Tags

playground2-avant-fix

Toggle playground2-avant-fix's commit message

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
fix(gnoweb): Update playground2 to allow merge with master (gnolang#6105

)

Merging this PR into the `playground2` branch will resolve conflicts and
allow to merge PR gnolang#5421 with master. My steps to make this PR:
```
git merge master
```
There were conflicts in:
```
gno.land/pkg/gnoweb/frontend/package-lock.json
gno.land/pkg/gnoweb/public/main.css
gno.land/pkg/gnoweb/client.go
```
* For `package-lock.json` and `main.css`, temporarily accept the
incoming file from master.
* For `client.go`, keep the function name [change to
`queryResponse`](https://github.com/jefft0/gno/blob/bd2c982418a04371ac6ea5b8b30f41079e5fc50d/gno.land/pkg/gnoweb/client.go#L359),
but accept the incoming change to the [comment on the next
line](https://github.com/jefft0/gno/blob/bd2c982418a04371ac6ea5b8b30f41079e5fc50d/gno.land/pkg/gnoweb/client.go#L360)
* In `gno/gno.land/pkg/gnoweb/frontend`, run `npm install` to fix
`package-lock.json`
* In `gno/gno.land/pkg/gnoweb`, run `make generate` to fix `main.css` .
This also updates some `.js` files .

This PR has a scary large number of files changed, due to the merge with
master. But if you temporarily change the target branch to `master`,
then you will see that it has the same number of files changed as PR
gnolang#5421 .

---------

Signed-off-by: Jeff Thompson <jeff@thefirst.org>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jae Kwon <53785+jaekwon@users.noreply.github.com>
Co-authored-by: moul <94029+moul@users.noreply.github.com>
Co-authored-by: Thomas <thomas.bruyelle@tendermint.com>
Co-authored-by: Morgan Bazalgette <morgan@morganbaz.com>
Co-authored-by: Lee ByeongJun <lbj199874@gmail.com>
Co-authored-by: davd-gzl <60177543+davd-gzl@users.noreply.github.com>
Co-authored-by: jinoosss <112360739+jinoosss@users.noreply.github.com>
Co-authored-by: Antoine Eddi <5222525+aeddi@users.noreply.github.com>
Co-authored-by: gfanton <8671905+gfanton@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexis Colin <alexis@jaunebleu.co>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>