Skip to content

Commit 95c0019

Browse files
author
Alex Johnson
authored
feat: upgrade plush templating dep (ignite#2935)
* maintain plushgen function * update plush version * replace plushgen * update go mod * update changelog
1 parent 3d5c64e commit 95c0019

File tree

18 files changed

+122
-64
lines changed

18 files changed

+122
-64
lines changed

changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## Unreleased
44

55
### Features
6+
67
- Add `pkg/cosmostxcollector` package with support to query and save TXs and events.
78
- Add `ignite network coordinator` command set.
89
- Add `ignite network validator` command set.
@@ -26,6 +27,7 @@
2627
- Add `--peer-address` flag to `network chain join` command.
2728
- Change nightly tag format
2829
- Add cosmos-sdk version in `version` command
30+
- [#29350](https://github.com/ignite/cli/pull/2935) Update `gobuffalo/plush` templating tool to `v4`
2931

3032
### Fixes
3133

go.mod

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ require (
2424
github.com/gobuffalo/genny v0.6.0
2525
github.com/gobuffalo/logger v1.0.6
2626
github.com/gobuffalo/packd v1.0.1
27-
github.com/gobuffalo/plush v3.8.3+incompatible
28-
github.com/gobuffalo/plushgen v0.1.2
27+
github.com/gobuffalo/plush/v4 v4.1.16
2928
github.com/goccy/go-yaml v1.9.4
3029
github.com/gogo/protobuf v1.3.3
3130
github.com/golangci/golangci-lint v1.49.0
@@ -59,7 +58,7 @@ require (
5958
github.com/vektra/mockery/v2 v2.14.0
6059
go.etcd.io/bbolt v1.3.6
6160
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
62-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
61+
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0
6362
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
6463
golang.org/x/text v0.3.7
6564
golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3
@@ -170,11 +169,11 @@ require (
170169
github.com/go-toolsmith/typep v1.0.2 // indirect
171170
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
172171
github.com/gobuffalo/envy v1.8.1 // indirect
173-
github.com/gobuffalo/flect v0.2.5 // indirect
174-
github.com/gobuffalo/github_flavored_markdown v1.1.1 // indirect
175-
github.com/gobuffalo/helpers v0.6.5 // indirect
176-
github.com/gobuffalo/tags/v3 v3.1.3 // indirect
177-
github.com/gobuffalo/validate/v3 v3.3.2 // indirect
172+
github.com/gobuffalo/flect v0.3.0 // indirect
173+
github.com/gobuffalo/github_flavored_markdown v1.1.3 // indirect
174+
github.com/gobuffalo/helpers v0.6.7 // indirect
175+
github.com/gobuffalo/tags/v3 v3.1.4 // indirect
176+
github.com/gobuffalo/validate/v3 v3.3.3 // indirect
178177
github.com/gobwas/glob v0.2.3 // indirect
179178
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
180179
github.com/gofrs/flock v0.8.1 // indirect
@@ -257,7 +256,7 @@ require (
257256
github.com/meowgorithm/babyenv v1.3.1 // indirect
258257
github.com/mgechev/revive v1.2.3 // indirect
259258
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
260-
github.com/microcosm-cc/bluemonday v1.0.16 // indirect
259+
github.com/microcosm-cc/bluemonday v1.0.20 // indirect
261260
github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect
262261
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
263262
github.com/minio/highwayhash v1.0.2 // indirect
@@ -356,7 +355,7 @@ require (
356355
golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7 // indirect
357356
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
358357
golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect
359-
golang.org/x/net v0.0.0-20220923203811-8be639271d50 // indirect
358+
golang.org/x/net v0.0.0-20221002022538-bcab6841153b // indirect
360359
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
361360
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
362361
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect

go.sum

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -724,16 +724,16 @@ github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6
724724
github.com/gobuffalo/envy v1.8.1 h1:RUr68liRvs0TS1D5qdW3mQv2SjAsu1QWMCx1tG4kDjs=
725725
github.com/gobuffalo/envy v1.8.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
726726
github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80=
727-
github.com/gobuffalo/flect v0.2.5 h1:H6vvsv2an0lalEaCDRThvtBfmg44W/QHXBCYUXf/6S4=
728-
github.com/gobuffalo/flect v0.2.5/go.mod h1:1ZyCLIbg0YD7sDkzvFdPoOydPtD8y9JQnrOROolUcM8=
727+
github.com/gobuffalo/flect v0.3.0 h1:erfPWM+K1rFNIQeRPdeEXxo8yFr/PO17lhRnS8FUrtk=
728+
github.com/gobuffalo/flect v0.3.0/go.mod h1:5pf3aGnsvqvCj50AVni7mJJF8ICxGZ8HomberC3pXLE=
729729
github.com/gobuffalo/genny v0.6.0 h1:d7c6d66ZrTHHty01hDX1/TcTWvAJQxRZl885KWX5kHY=
730730
github.com/gobuffalo/genny v0.6.0/go.mod h1:Vigx9VDiNscYpa/LwrURqGXLSIbzTfapt9+K6gF1kTA=
731731
github.com/gobuffalo/github_flavored_markdown v1.1.0/go.mod h1:TSpTKWcRTI0+v7W3x8dkSKMLJSUpuVitlptCkpeY8ic=
732-
github.com/gobuffalo/github_flavored_markdown v1.1.1 h1:kUf8ginyBOTRXcKSTPsPAqlA25vQ80+xAspLIYaxmTU=
733-
github.com/gobuffalo/github_flavored_markdown v1.1.1/go.mod h1:yU32Pen+eorS58oxh/bNZx76zUOCJwmvyV5FBrvzOKQ=
732+
github.com/gobuffalo/github_flavored_markdown v1.1.3 h1:rSMPtx9ePkFB22vJ+dH+m/EUBS8doQ3S8LeEXcdwZHk=
733+
github.com/gobuffalo/github_flavored_markdown v1.1.3/go.mod h1:IzgO5xS6hqkDmUh91BW/+Qxo/qYnvfzoz3A7uLkg77I=
734734
github.com/gobuffalo/helpers v0.5.0/go.mod h1:stpgxJ2C7T99NLyAxGUnYMM2zAtBk5NKQR0SIbd05j4=
735-
github.com/gobuffalo/helpers v0.6.5 h1:Quf1KAUae97sdDmm/QP5V9P/0XYpK+HrhnYXU+nf65M=
736-
github.com/gobuffalo/helpers v0.6.5/go.mod h1:LA4zcc89tkZsfKpJIWsXLibiqTgZQ4EvDszfxdqr9ZA=
735+
github.com/gobuffalo/helpers v0.6.7 h1:C9CedoRSfgWg2ZoIkVXgjI5kgmSpL34Z3qdnzpfNVd8=
736+
github.com/gobuffalo/helpers v0.6.7/go.mod h1:j0u1iC1VqlCaJEEVkZN8Ia3TEzfj/zoXANqyJExTMTA=
737737
github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
738738
github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
739739
github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM=
@@ -744,18 +744,16 @@ github.com/gobuffalo/packd v1.0.1 h1:U2wXfRr4E9DH8IdsDLlRFwTZTK7hLfq9qT/QHXGVe/0
744744
github.com/gobuffalo/packd v1.0.1/go.mod h1:PP2POP3p3RXGz7Jh6eYEf93S7vA2za6xM7QT85L4+VY=
745745
github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
746746
github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
747-
github.com/gobuffalo/plush v3.8.3+incompatible h1:kzvUTnFPhwyfPEsx7U7LI05/IIslZVGnAlMA1heWub8=
748747
github.com/gobuffalo/plush v3.8.3+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
749-
github.com/gobuffalo/plushgen v0.1.2 h1:s4yAgNdfNMyMQ7o+Is4f1VlH2L1tKosT+m7BF28C8H4=
750-
github.com/gobuffalo/plushgen v0.1.2/go.mod h1:3U71v6HWZpVER1nInTXeAwdoRNsRd4W8aeIa1Lyp+Bk=
751-
github.com/gobuffalo/tags v2.1.7+incompatible h1:GUxxh34f9SI4U0Pj3ZqvopO9SlzuqSf+g4ZGSPSszt4=
748+
github.com/gobuffalo/plush/v4 v4.1.16 h1:Y6jVVTLdg1BxRXDIbTJz+J8QRzEAtv5ZwYpGdIFR7VU=
749+
github.com/gobuffalo/plush/v4 v4.1.16/go.mod h1:6t7swVsarJ8qSLw1qyAH/KbrcSTwdun2ASEQkOznakg=
752750
github.com/gobuffalo/tags v2.1.7+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
753-
github.com/gobuffalo/tags/v3 v3.1.3 h1:yhq9gudiEngYtPzH1KtMUknxffQBqwNfkHKP6i4l4NE=
754-
github.com/gobuffalo/tags/v3 v3.1.3/go.mod h1:WAAjKdskZUmdi6EkNjP2SXBwBwRovHsjJsPJbBiPlKc=
751+
github.com/gobuffalo/tags/v3 v3.1.4 h1:X/ydLLPhgXV4h04Hp2xlbI2oc5MDaa7eub6zw8oHjsM=
752+
github.com/gobuffalo/tags/v3 v3.1.4/go.mod h1:ArRNo3ErlHO8BtdA0REaZxijuWnWzF6PUXngmMXd2I0=
755753
github.com/gobuffalo/uuid v2.0.5+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE=
756754
github.com/gobuffalo/validate v2.0.3+incompatible/go.mod h1:N+EtDe0J8252BgfzQUChBgfd6L93m9weay53EWFVsMM=
757-
github.com/gobuffalo/validate/v3 v3.3.2 h1:GZdJlDy6zDRXF5BnEiY+pGvGDFx95atMIWd3N3MMseE=
758-
github.com/gobuffalo/validate/v3 v3.3.2/go.mod h1:jiEEw+N7KbAP2aInFxGnfitI0g7HjXqcp5hDD6TaQDU=
755+
github.com/gobuffalo/validate/v3 v3.3.3 h1:o7wkIGSvZBYBd6ChQoLxkz2y1pfmhbI4jNJYh6PuNJ4=
756+
github.com/gobuffalo/validate/v3 v3.3.3/go.mod h1:YC7FsbJ/9hW/VjQdmXPvFqvRis4vrRYFxr69WiNZw6g=
759757
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
760758
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
761759
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
@@ -1250,8 +1248,8 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1f
12501248
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
12511249
github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
12521250
github.com/microcosm-cc/bluemonday v1.0.4/go.mod h1:8iwZnFn2CDDNZ0r6UXhF4xawGvzaqzCRa1n3/lO3W2w=
1253-
github.com/microcosm-cc/bluemonday v1.0.16 h1:kHmAq2t7WPWLjiGvzKa5o3HzSfahUKiOq7fAPUiMNIc=
1254-
github.com/microcosm-cc/bluemonday v1.0.16/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
1251+
github.com/microcosm-cc/bluemonday v1.0.20 h1:flpzsq4KU3QIYAYGV/szUat7H+GPOXR0B2JU5A1Wp8Y=
1252+
github.com/microcosm-cc/bluemonday v1.0.20/go.mod h1:yfBmMi8mxvaZut3Yytv+jTXRY8mxyjJ0/kQBTElld50=
12551253
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
12561254
github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
12571255
github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a h1:eU8j/ClY2Ty3qdHnn0TyW3ivFoPC/0F1gQZz8yTxbbE=
@@ -2015,8 +2013,9 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
20152013
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
20162014
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
20172015
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
2018-
golang.org/x/net v0.0.0-20220923203811-8be639271d50 h1:vKyz8L3zkd+xrMeIaBsQ/MNVPVFSffdaU3ZyYlBGFnI=
2019-
golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
2016+
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
2017+
golang.org/x/net v0.0.0-20221002022538-bcab6841153b h1:6e93nYa3hNqAvLr0pD4PN1fFS+gKzp2zAXqrnTCstqU=
2018+
golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
20202019
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
20212020
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
20222021
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2040,8 +2039,9 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
20402039
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
20412040
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
20422041
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
2043-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
20442042
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
2043+
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 h1:cu5kTvlzcw1Q5S9f5ip1/cpiB4nXvw1XYzFPGgzLUOY=
2044+
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
20452045
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
20462046
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
20472047
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2162,6 +2162,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
21622162
golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21632163
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21642164
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2165+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21652166
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21662167
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
21672168
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

ignite/pkg/xgenny/xgenny.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import (
66
"path/filepath"
77
"strings"
88

9+
"github.com/gobuffalo/genny"
10+
"github.com/gobuffalo/plush/v4"
11+
"github.com/pkg/errors"
12+
913
"github.com/gobuffalo/packd"
1014
)
1115

@@ -58,3 +62,16 @@ func (w Walker) walkDir(wl packd.WalkFunc, path string) error {
5862

5963
return nil
6064
}
65+
66+
// Transformer will plushify any file that has a ".plush" extension
67+
func Transformer(ctx *plush.Context) genny.Transformer {
68+
t := genny.NewTransformer(".plush", func(f genny.File) (genny.File, error) {
69+
s, err := plush.RenderR(f, ctx)
70+
if err != nil {
71+
return f, errors.Wrap(err, f.Name())
72+
}
73+
return genny.NewFileS(f.Name(), s), nil
74+
})
75+
t.StripExt = true
76+
return t
77+
}

ignite/pkg/xgenny/xgenny_test.go

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package xgenny_test
2+
3+
import (
4+
"io"
5+
"strings"
6+
"testing"
7+
8+
"github.com/gobuffalo/genny"
9+
"github.com/gobuffalo/plush/v4"
10+
"github.com/stretchr/testify/require"
11+
12+
"github.com/ignite/cli/ignite/pkg/xgenny"
13+
)
14+
15+
func Test_Transformer(t *testing.T) {
16+
r := require.New(t)
17+
18+
ctx := plush.NewContext()
19+
ctx.Set("name", "mark")
20+
f := genny.NewFile("foo.plush.txt", strings.NewReader("Hello <%= name %>"))
21+
22+
tr := xgenny.Transformer(ctx)
23+
f, err := tr.Transform(f)
24+
r.NoError(err)
25+
r.Equal("foo.txt", f.Name())
26+
27+
b, err := io.ReadAll(f)
28+
r.NoError(err)
29+
r.Equal("Hello mark", string(b))
30+
}
31+
32+
func Test_Transformer_No_Ext(t *testing.T) {
33+
r := require.New(t)
34+
35+
ctx := plush.NewContext()
36+
ctx.Set("name", "mark")
37+
f := genny.NewFile("foo.txt", strings.NewReader("Hello <%= name %>"))
38+
39+
tr := xgenny.Transformer(ctx)
40+
f, err := tr.Transform(f)
41+
r.NoError(err)
42+
r.Equal("foo.txt", f.Name())
43+
44+
b, err := io.ReadAll(f)
45+
r.NoError(err)
46+
r.Equal("Hello <%= name %>", string(b))
47+
}

ignite/templates/app/app.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import (
44
"embed"
55

66
"github.com/gobuffalo/genny"
7-
"github.com/gobuffalo/plush"
8-
"github.com/gobuffalo/plushgen"
7+
"github.com/gobuffalo/plush/v4"
98

109
"github.com/ignite/cli/ignite/pkg/cosmosgen"
1110
"github.com/ignite/cli/ignite/pkg/xgenny"
@@ -34,7 +33,7 @@ func New(opts *Options) (*genny.Generator, error) {
3433
ctx.Set("DepTools", cosmosgen.DepTools())
3534

3635
plushhelpers.ExtendPlushContext(ctx)
37-
g.Transformer(plushgen.Transformer(ctx))
36+
g.Transformer(xgenny.Transformer(ctx))
3837
g.Transformer(genny.Replace("{{appName}}", opts.AppName))
3938
g.Transformer(genny.Replace("{{binaryNamePrefix}}", opts.BinaryNamePrefix))
4039

ignite/templates/field/plushhelpers/plushhelpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package plushhelpers
22

33
import (
4-
"github.com/gobuffalo/plush"
4+
"github.com/gobuffalo/plush/v4"
55

66
"github.com/ignite/cli/ignite/pkg/xstrings"
77
"github.com/ignite/cli/ignite/templates/field"

ignite/templates/ibc/oracle.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import (
77
"strings"
88

99
"github.com/gobuffalo/genny"
10-
"github.com/gobuffalo/plush"
11-
"github.com/gobuffalo/plushgen"
10+
"github.com/gobuffalo/plush/v4"
1211

1312
"github.com/ignite/cli/ignite/pkg/gomodulepath"
1413
"github.com/ignite/cli/ignite/pkg/multiformatname"
@@ -56,7 +55,7 @@ func NewOracle(replacer placeholder.Replacer, opts *OracleOptions) (*genny.Gener
5655
ctx.Set("protoPkgName", module.ProtoPackageName(appModulePath, opts.ModuleName))
5756

5857
plushhelpers.ExtendPlushContext(ctx)
59-
g.Transformer(plushgen.Transformer(ctx))
58+
g.Transformer(xgenny.Transformer(ctx))
6059
g.Transformer(genny.Replace("{{appName}}", opts.AppName))
6160
g.Transformer(genny.Replace("{{moduleName}}", opts.ModuleName))
6261
g.Transformer(genny.Replace("{{queryName}}", opts.QueryName.Snake))

ignite/templates/ibc/packet.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import (
77
"strings"
88

99
"github.com/gobuffalo/genny"
10-
"github.com/gobuffalo/plush"
11-
"github.com/gobuffalo/plushgen"
10+
"github.com/gobuffalo/plush/v4"
1211

1312
"github.com/ignite/cli/ignite/pkg/multiformatname"
1413
"github.com/ignite/cli/ignite/pkg/placeholder"
@@ -86,7 +85,7 @@ func NewPacket(replacer placeholder.Replacer, opts *PacketOptions) (*genny.Gener
8685
ctx.Set("ackFields", opts.AckFields)
8786

8887
plushhelpers.ExtendPlushContext(ctx)
89-
g.Transformer(plushgen.Transformer(ctx))
88+
g.Transformer(xgenny.Transformer(ctx))
9089
g.Transformer(genny.Replace("{{appName}}", opts.AppName))
9190
g.Transformer(genny.Replace("{{moduleName}}", opts.ModuleName))
9291
g.Transformer(genny.Replace("{{packetName}}", opts.PacketName.Snake))

ignite/templates/message/message.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"github.com/gobuffalo/genny"
77
"github.com/gobuffalo/packd"
8-
"github.com/gobuffalo/plush"
9-
"github.com/gobuffalo/plushgen"
8+
"github.com/gobuffalo/plush/v4"
109

10+
"github.com/ignite/cli/ignite/pkg/xgenny"
1111
"github.com/ignite/cli/ignite/templates/field/plushhelpers"
1212
"github.com/ignite/cli/ignite/templates/testutil"
1313
)
@@ -35,7 +35,7 @@ func Box(box packd.Walker, opts *Options, g *genny.Generator) error {
3535
ctx.Set("ResFields", opts.ResFields)
3636

3737
plushhelpers.ExtendPlushContext(ctx)
38-
g.Transformer(plushgen.Transformer(ctx))
38+
g.Transformer(xgenny.Transformer(ctx))
3939
g.Transformer(genny.Replace("{{appName}}", opts.AppName))
4040
g.Transformer(genny.Replace("{{moduleName}}", opts.ModuleName))
4141
g.Transformer(genny.Replace("{{msgName}}", opts.MsgName.Snake))

0 commit comments

Comments
 (0)