Set bundlename for single targets

Remove mergo and just use a simple hardcoded defaults approach.

.all-contributorsrc

@@ -1348,6 +1348,499 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "github-actions[bot]",
+      "name": "github-actions[bot]",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "profile": "https://github.com/apps/github-actions",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "OlegGulevskyy",
+      "name": "Oleg Gulevskyy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43781031?v=4",
+      "profile": "https://github.com/OlegGulevskyy",
+      "contributions": [
+        "code",
+        "doc",
+        "maintenance",
+        "platform"
+      ]
+    },
+    {
+      "login": "raguay",
+      "name": "Richard Guay",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2487495?v=4",
+      "profile": "http://www.customct.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "ATenderholt",
+      "name": "Adam Tenderholt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/740623?v=4",
+      "profile": "https://github.com/ATenderholt",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JulioDRF",
+      "name": "JulioDRF",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15677708?v=4",
+      "profile": "https://github.com/JulioDRF",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "scottopell",
+      "name": "Scott Opell",
+      "avatar_url": "https://avatars.githubusercontent.com/u/996472?v=4",
+      "profile": "http://scottopell.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "avengerweb",
+      "name": "Vadim Shchepotev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2055581?v=4",
+      "profile": "https://aven.dev/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "willdot",
+      "name": "Will Andrews",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4906530?v=4",
+      "profile": "https://willdot.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gwynforthewyn",
+      "name": "Gwyn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/434656?v=4",
+      "profile": "https://github.com/gwynforthewyn",
+      "contributions": [
+        "code",
+        "review",
+        "question",
+        "research"
+      ]
+    },
+    {
+      "login": "xijaja",
+      "name": "希嘉嘉",
+      "avatar_url": "https://avatars.githubusercontent.com/u/47017666?v=4",
+      "profile": "https://github.com/xijaja",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "almas1992",
+      "name": "ALMAS",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9382335?v=4",
+      "profile": "https://www.almas.cc/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "o8x",
+      "name": "Alex",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20666153?v=4",
+      "profile": "https://stdout.com.cn/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "arifali123",
+      "name": "Arif Ali",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51419655?v=4",
+      "profile": "https://github.com/arifali123",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hotafrika",
+      "name": "Artur Siarohau",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18332839?v=4",
+      "profile": "https://github.com/hotafrika",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "binyamin",
+      "name": "Binyamin Aron Green",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39805353?v=4",
+      "profile": "https://binyam.in/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bdwyertech",
+      "name": "Brian Dwyer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2973273?v=4",
+      "profile": "http://bdwyertech.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ckilb",
+      "name": "Christian Kilb",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7283097?v=4",
+      "profile": "http://www.cilb.de/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "edwargix",
+      "name": "David Florness",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22877007?v=4",
+      "profile": "https://github.com/edwargix",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "BuckeyeCoder",
+      "name": "David Walton",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95933880?v=4",
+      "profile": "https://github.com/BuckeyeCoder",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Debdut",
+      "name": "Debdut Karmakar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7561070?v=4",
+      "profile": "https://github.com/Debdut",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gotid",
+      "name": "Dieter Zhu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4010854?v=4",
+      "profile": "https://github.com/gotid",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Holmqvist1990",
+      "name": "Fredrik Holmqvist",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22743750?v=4",
+      "profile": "https://fredrikholmqvist.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "giopalma",
+      "name": "Giovanni Palma",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33783684?v=4",
+      "profile": "https://github.com/giopalma",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Nexus26404",
+      "name": "Hao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/83110373?v=4",
+      "profile": "https://github.com/Nexus26404",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "i7tsov",
+      "name": "Igor Sementsov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44977153?v=4",
+      "profile": "https://github.com/i7tsov",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "derhasi",
+      "name": "Johannes Haseitl",
+      "avatar_url": "https://avatars.githubusercontent.com/u/118502?v=4",
+      "profile": "https://github.com/derhasi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "joshbuddy",
+      "name": "Joshua Hull",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8898?v=4",
+      "profile": "https://github.com/joshbuddy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "joshm998",
+      "name": "Joshua Mangiola",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1779737?v=4",
+      "profile": "https://github.com/joshm998",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "prurigro",
+      "name": "Kevin MacMartin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1149238?v=4",
+      "profile": "https://github.com/prurigro",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "liang-li-dev",
+      "name": "Liang Li",
+      "avatar_url": "https://avatars.githubusercontent.com/u/112530363?v=4",
+      "profile": "https://github.com/liang-li-dev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "marvinhosea",
+      "name": "Marvin Collins Hosea",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7722584?v=4",
+      "profile": "https://appslab.co.ke/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mholt",
+      "name": "Matt Holt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1128849?v=4",
+      "profile": "https://matt.life/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Gurkengewuerz",
+      "name": "Niklas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10966337?v=4",
+      "profile": "https://github.com/Gurkengewuerz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Xhofe",
+      "name": "Andy Hsu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36558727?v=4",
+      "profile": "https://github.com/Xhofe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "NullCode1337",
+      "name": "NullCode",
+      "avatar_url": "https://avatars.githubusercontent.com/u/70959549?v=4",
+      "profile": "https://github.com/NullCode1337",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "oSethoum",
+      "name": "Oussama Sethoum",
+      "avatar_url": "https://avatars.githubusercontent.com/u/88779394?v=4",
+      "profile": "https://github.com/oSethoum",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ParkourLiu",
+      "name": "ParkourLiu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33681340?v=4",
+      "profile": "https://github.com/ParkourLiu",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zllovesuki",
+      "name": "Rachel Chen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/298453?v=4",
+      "profile": "https://github.com/zllovesuki",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rnice01",
+      "name": "Rob Nice",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11394384?v=4",
+      "profile": "https://github.com/rnice01",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "RyoTagami",
+      "name": "Ryo TAGAMI",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9672589?v=4",
+      "profile": "https://github.com/RyoTagami",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SamHennessy",
+      "name": "Sam Hennessy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/119867?v=4",
+      "profile": "https://github.com/SamHennessy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AlbinoDrought",
+      "name": "Sean",
+      "avatar_url": "https://avatars.githubusercontent.com/u/852873?v=4",
+      "profile": "https://albinodrought.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sgosiaco",
+      "name": "Sean Gosiaco",
+      "avatar_url": "https://avatars.githubusercontent.com/u/212341?v=4",
+      "profile": "https://github.com/sgosiaco",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SheetJSDev",
+      "name": "Eric P Sheets",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6070939?v=4",
+      "profile": "https://sheetjs.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SupianIDz",
+      "name": "Supian M",
+      "avatar_url": "https://avatars.githubusercontent.com/u/37969970?v=4",
+      "profile": "https://www.octopy.dev/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Watson-Sei",
+      "name": "Watson-Sei",
+      "avatar_url": "https://avatars.githubusercontent.com/u/55475145?v=4",
+      "profile": "https://github.com/Watson-Sei",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "shinshin86",
+      "name": "Yuki Shindo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8216064?v=4",
+      "profile": "https://shinshin86.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cuigege",
+      "name": "cuigege",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26080122?v=4",
+      "profile": "https://github.com/cuigege",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cybertramp",
+      "name": "cybertramp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30935096?v=4",
+      "profile": "https://cybertramp.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "h8gi",
+      "name": "hiroki yagi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10811057?v=4",
+      "profile": "https://github.com/h8gi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "imgbot[bot]",
+      "name": "imgbot[bot]",
+      "avatar_url": "https://avatars.githubusercontent.com/in/4706?v=4",
+      "profile": "https://github.com/apps/imgbot",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tong3jie",
+      "name": "juju",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14191774?v=4",
+      "profile": "https://github.com/tong3jie",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "meatherly",
+      "name": "Michael Eatherly",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1327960?v=4",
+      "profile": "http://meatherly.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tk103331",
+      "name": "tk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4404609?v=4",
+      "profile": "https://github.com/tk103331",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 8,

.github/workflows/build-and-test.yml

@@ -1,4 +1,4 @@
-name: Build + Test
+name: Build + Test v2
 
 on:
   push:

app.go

@@ -141,7 +141,7 @@ func (a *App) start() error {
 	// Defer the shutdown
 	defer a.shutdown()
 
-	// run the renderer
+	// Run the renderer
 	err = a.renderer.Run()
 	if err != nil {
 		return err

go.mod

@@ -19,9 +19,8 @@ require (
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
 	golang.org/x/image v0.0.0-20200430140353-33d19683fad8
-	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
-	golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
-	golang.org/x/text v0.3.0
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
+	golang.org/x/text v0.3.8
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )

go.sum

@@ -58,25 +58,40 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba h1:2DHfQOxcpWdGf5q5IzCUFPNvRX9Icf+09RvQK2VnJq0=
 github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba/go.mod h1:iLnlXG2Pakcii2CU0cbY07DRCSvpWNa7nFxtevhOChk=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/AlecAivazis/survey.v1 v1.8.4 h1:10xXXN3wgIhPheb5NI58zFgZv32Ana7P3Tl4shW+0Qc=
 gopkg.in/AlecAivazis/survey.v1 v1.8.4/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

go.work.sum

@@ -0,0 +1,33 @@
+atomicgo.dev/assert v0.0.2/go.mod h1:ut4NcI3QDdJtlmAxQULOmA13Gz6e2DWbSAS8RUOmNYQ=
+github.com/MarvinJWendt/testza v0.5.1/go.mod h1:L7csM8IBqCc0HH4TRYZSPCIRg6zJeqzM1pm3FSYZBso=
+github.com/atomicgo/cursor v0.0.1 h1:xdogsqa6YYlLfM+GyClC/Lchf7aiMerFiZQn7soTOoU=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
+github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
+github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
+github.com/klauspost/cpuid/v2 v2.2.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pkg/sftp v1.10.1 h1:VasscCm72135zRysgrJDKsntdmPN+OuU3+nnHYA9wyc=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
+github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
+mvdan.cc/editorconfig v0.2.0 h1:XL+7ys6ls/RKrkUNFQvEwIvNHh+JKx8Mj1pUV5wQxQE=

lib/ipc/message.go

@@ -55,7 +55,7 @@ func newIPCMessage(incomingMessage string, responseFunction func(*ipcResponse) e
 // hasCallbackID checks if the message can send an error back to the frontend
 func (m *ipcMessage) hasCallbackID() error {
 	if m.CallbackID == "" {
-		return fmt.Errorf("attempted to return error to message with no callback ID")
+		return fmt.Errorf("attempted to return error to message with no Callback ID")
 	}
 	return nil
 }

lib/renderer/webview.go

@@ -186,7 +186,7 @@ func (w *WebView) evalJSSync(js string) error {
 
 	go func() {
 		exit := false
-		// We are done when we receive the callback ID
+		// We are done when we receive the Callback ID
 		w.log.Debug("SyncJS: sending with ID = " + ID)
 		w.eventManager.On(ID, func(...interface{}) {
 			w.log.Debug("SyncJS: Got callback ID = " + ID)
@@ -361,7 +361,7 @@ func (w *WebView) focus() {
 
 // callback sends a callback to the frontend
 func (w *WebView) callback(data string) error {
-	callbackCMD := fmt.Sprintf("window.wails._.callback('%s');", data)
+	callbackCMD := fmt.Sprintf("window.wails._.Callback('%s');", data)
 	return w.evalJS(callbackCMD)
 }
 

runtime/js/package-lock.json

@@ -4178,13 +4178,10 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
     },
     "kind-of": {
       "version": "6.0.3",
@@ -4234,9 +4231,9 @@
       },
       "dependencies": {
         "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
           "dev": true,
           "requires": {
             "minimist": "^1.2.0"

scripts/sponsors/package.json

@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "sponsorkit": "^0.6.1"
+    "sponsorkit": "^0.8.2"
   }
 }

v2/cmd/wails/build.go

@@ -181,7 +181,10 @@ func buildApplication(f *flags.Build) error {
 			macTargets := targets.Filter(func(platform string) bool {
 				return strings.HasPrefix(platform, "darwin")
 			})
-			if macTargets.Length() == 2 {
+			switch macTargets.Length() {
+			case 1:
+				buildOptions.BundleName = fmt.Sprintf("%s.app", desiredFilename)
+			case 2:
 				buildOptions.BundleName = fmt.Sprintf("%s-%s.app", desiredFilename, buildOptions.Arch)
 			}
 		}

v2/examples/customlayout/go.mod

@@ -28,7 +28,7 @@ require (
 	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
 	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 )
 
 replace github.com/wailsapp/wails/v2 v2.1.0 => ../..

v2/examples/customlayout/go.sum

@@ -39,7 +39,7 @@ github.com/samber/lo v1.27.1 h1:sTXwkRiIFIQG+G0HeAvOEnGjqWeWtI9cg5/n51KrxPg=
 github.com/samber/lo v1.27.1/go.mod h1:it33p9UtPMS7z72fP4gw/EIfQB2eI8ke7GR2wc6+Rhg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
 github.com/tkrajina/go-reflector v0.5.5 h1:gwoQFNye30Kk7NrExj8zm3zFtrGPqOkzFMLuQZg1DtQ=
 github.com/tkrajina/go-reflector v0.5.5/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
@@ -68,8 +68,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9w
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=

v2/examples/systray/.gitignore

@@ -1,3 +0,0 @@
-build/bin
-node_modules
-frontend/wailsjs

v2/examples/systray/README.md

@@ -1,17 +0,0 @@
-# System Tray
-
-This example shows how to create a system tray using an experimental programmatic API.
-
-## Running
-
-As this example outputs text to the console, it is recommended to build using `wails build -debug`.
-
-## Supported Platforms
-
-- [x] Windows
-- [ ] macOS
-- [ ] Linux
-
-
-
-

v2/examples/systray/build/windows/info.json

@@ -1,15 +0,0 @@
-{
-  "fixed": {
-    "file_version": "{{.Info.ProductVersion}}"
-  },
-  "info": {
-    "0000": {
-      "ProductVersion": "{{.Info.ProductVersion}}",
-      "CompanyName": "{{.Info.CompanyName}}",
-      "FileDescription": "{{.Info.ProductName}}",
-      "LegalCopyright": "{{.Info.Copyright}}",
-      "ProductName": "{{.Info.ProductName}}",
-      "Comments": "{{.Info.Comments}}"
-    }
-  }
-}

v2/examples/systray/build/windows/installer/project.nsi

@@ -1,101 +0,0 @@
-Unicode true
-
-####
-## Please note: Template replacements don't work in this file. They are provided with default defines like
-## mentioned underneath.
-## If the keyword is not defined, "wails_tools.nsh" will populate them with the values from ProjectInfo. 
-## If they are defined here, "wails_tools.nsh" will not touch them. This allows to use this project.nsi manually 
-## from outside of Wails for debugging and development of the installer.
-## 
-## For development first make a wails nsis build to populate the "wails_tools.nsh":
-## > wails build --target windows/amd64 --nsis
-## Then you can call makensis on this file with specifying the path to your binary:
-## For a AMD64 only installer:
-## > makensis -DARG_WAILS_AMD64_BINARY=..\..\bin\app.exe
-## For a ARM64 only installer:
-## > makensis -DARG_WAILS_ARM64_BINARY=..\..\bin\app.exe
-## For a installer with both architectures:
-## > makensis -DARG_WAILS_AMD64_BINARY=..\..\bin\app-amd64.exe -DARG_WAILS_ARM64_BINARY=..\..\bin\app-arm64.exe
-####
-## The following information is taken from the ProjectInfo file, but they can be overwritten here. 
-####
-## !define INFO_PROJECTNAME    "MyProject" # Default "{{.Name}}"
-## !define INFO_COMPANYNAME    "MyCompany" # Default "{{.Info.CompanyName}}"
-## !define INFO_PRODUCTNAME    "MyProduct" # Default "{{.Info.ProductName}}"
-## !define INFO_PRODUCTVERSION "1.0.0"     # Default "{{.Info.ProductVersion}}"
-## !define INFO_COPYRIGHT      "Copyright" # Default "{{.Info.Copyright}}"
-###
-## !define PRODUCT_EXECUTABLE  "Application.exe"      # Default "${INFO_PROJECTNAME}.exe"
-## !define UNINST_KEY_NAME     "UninstKeyInRegistry"  # Default "${INFO_COMPANYNAME}${INFO_PRODUCTNAME}"
-####
-## !define REQUEST_EXECUTION_LEVEL "admin"            # Default "admin"  see also https://nsis.sourceforge.io/Docs/Chapter4.html
-####
-## Include the wails tools
-####
-!include "wails_tools.nsh"
-
-# The version information for this two must consist of 4 parts
-VIProductVersion "${INFO_PRODUCTVERSION}.0"
-VIFileVersion    "${INFO_PRODUCTVERSION}.0"
-
-VIAddVersionKey "CompanyName"     "${INFO_COMPANYNAME}"
-VIAddVersionKey "FileDescription" "${INFO_PRODUCTNAME} Installer"
-VIAddVersionKey "ProductVersion"  "${INFO_PRODUCTVERSION}"
-VIAddVersionKey "FileVersion"     "${INFO_PRODUCTVERSION}"
-VIAddVersionKey "LegalCopyright"  "${INFO_COPYRIGHT}"
-VIAddVersionKey "ProductName"     "${INFO_PRODUCTNAME}"
-
-!include "MUI.nsh"
-
-!define MUI_ICON "..\icon.ico"
-!define MUI_UNICON "..\icon.ico"
-# !define MUI_WELCOMEFINISHPAGE_BITMAP "resources\leftimage.bmp" #Include this to add a bitmap on the left side of the Welcome Page. Must be a size of 164x314
-!define MUI_FINISHPAGE_NOAUTOCLOSE # Wait on the INSTFILES page so the user can take a look into the details of the installation steps
-!define MUI_ABORTWARNING # This will warn the user if they exit from the installer.
-
-!insertmacro MUI_PAGE_WELCOME # Welcome to the installer page.
-# !insertmacro MUI_PAGE_LICENSE "resources\eula.txt" # Adds a EULA page to the installer
-!insertmacro MUI_PAGE_DIRECTORY # In which folder install page.
-!insertmacro MUI_PAGE_INSTFILES # Installing page.
-!insertmacro MUI_PAGE_FINISH # Finished installation page.
-
-!insertmacro MUI_UNPAGE_INSTFILES # Uinstalling page
-
-!insertmacro MUI_LANGUAGE "English" # Set the Language of the installer
-
-## The following two statements can be used to sign the installer and the uninstaller. The path to the binaries are provided in %1
-#!uninstfinalize 'signtool --file "%1"'
-#!finalize 'signtool --file "%1"'
-
-Name "${INFO_PRODUCTNAME}"
-OutFile "..\..\bin\${INFO_PROJECTNAME}-${ARCH}-installer.exe" # Name of the installer's file.
-InstallDir "$PROGRAMFILES64\${INFO_COMPANYNAME}\${INFO_PRODUCTNAME}" # Default installing folder ($PROGRAMFILES is Program Files folder).
-ShowInstDetails show # This will always show the installation details.
-
-Function .onInit
-   !insertmacro wails.checkArchitecture
-FunctionEnd
-
-Section
-    !insertmacro wails.webview2runtime
-
-    SetOutPath $INSTDIR
-    
-    !insertmacro wails.files
-
-    CreateShortcut "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}"
-    CreateShortCut "$DESKTOP\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}"
-
-    !insertmacro wails.writeUninstaller
-SectionEnd
-
-Section "uninstall" 
-    RMDir /r "$AppData\${PRODUCT_EXECUTABLE}" # Remove the WebView2 DataPath
-
-    RMDir /r $INSTDIR
-
-    Delete "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk"
-    Delete "$DESKTOP\${INFO_PRODUCTNAME}.lnk"
-
-    !insertmacro wails.deleteUninstaller
-SectionEnd

v2/examples/systray/build/windows/installer/wails_tools.nsh

@@ -1,171 +0,0 @@
-# DO NOT EDIT - Generated automatically by `wails build`
-
-!include "x64.nsh"
-!include "WinVer.nsh"
-!include "FileFunc.nsh"
-
-!ifndef INFO_PROJECTNAME
-    !define INFO_PROJECTNAME "{{.Name}}"
-!endif
-!ifndef INFO_COMPANYNAME
-    !define INFO_COMPANYNAME "{{.Info.CompanyName}}"
-!endif
-!ifndef INFO_PRODUCTNAME
-    !define INFO_PRODUCTNAME "{{.Info.ProductName}}"
-!endif
-!ifndef INFO_PRODUCTVERSION
-    !define INFO_PRODUCTVERSION "{{.Info.ProductVersion}}"
-!endif
-!ifndef INFO_COPYRIGHT
-    !define INFO_COPYRIGHT "{{.Info.Copyright}}"
-!endif
-!ifndef PRODUCT_EXECUTABLE
-    !define PRODUCT_EXECUTABLE "${INFO_PROJECTNAME}.exe"
-!endif
-!ifndef UNINST_KEY_NAME
-    !define UNINST_KEY_NAME "${INFO_COMPANYNAME}${INFO_PRODUCTNAME}"
-!endif
-!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINST_KEY_NAME}"
-
-!ifndef REQUEST_EXECUTION_LEVEL
-    !define REQUEST_EXECUTION_LEVEL "admin"
-!endif
-
-RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}"
-
-!ifdef ARG_WAILS_AMD64_BINARY
-    !define SUPPORTS_AMD64
-!endif
-
-!ifdef ARG_WAILS_ARM64_BINARY
-    !define SUPPORTS_ARM64
-!endif
-
-!ifdef SUPPORTS_AMD64
-    !ifdef SUPPORTS_ARM64
-        !define ARCH "amd64_arm64"
-    !else
-        !define ARCH "amd64"
-    !endif
-!else
-    !ifdef SUPPORTS_ARM64
-        !define ARCH "arm64"
-    !else
-        !error "Wails: Undefined ARCH, please provide at least one of ARG_WAILS_AMD64_BINARY or ARG_WAILS_ARM64_BINARY"
-    !endif
-!endif
-
-!macro wails.checkArchitecture
-    !ifndef WAILS_WIN10_REQUIRED
-        !define WAILS_WIN10_REQUIRED "This product is only supported on Windows 10 (Server 2016) and later."
-    !endif
-
-    !ifndef WAILS_ARCHITECTURE_NOT_SUPPORTED
-        !define WAILS_ARCHITECTURE_NOT_SUPPORTED "This product can't be installed on the current Windows architecture. Supports: ${ARCH}"
-    !endif
-
-    ${If} ${AtLeastWin10}
-        !ifdef SUPPORTS_AMD64
-            ${if} ${IsNativeAMD64}
-                Goto ok
-            ${EndIf}
-        !endif
-
-        !ifdef SUPPORTS_ARM64
-            ${if} ${IsNativeARM64}
-                Goto ok
-            ${EndIf}
-        !endif
-
-        IfSilent silentArch notSilentArch
-        silentArch:
-            SetErrorLevel 65
-            Abort
-        notSilentArch:
-            MessageBox MB_OK "${WAILS_ARCHITECTURE_NOT_SUPPORTED}"
-            Quit
-    ${else}
-        IfSilent silentWin notSilentWin
-        silentWin:
-            SetErrorLevel 64
-            Abort
-        notSilentWin:
-            MessageBox MB_OK "${WAILS_WIN10_REQUIRED}"
-            Quit
-    ${EndIf}
-
-    ok:
-!macroend
-
-!macro wails.files
-    !ifdef SUPPORTS_AMD64
-        ${if} ${IsNativeAMD64}
-            File "/oname=${PRODUCT_EXECUTABLE}" "${ARG_WAILS_AMD64_BINARY}"
-        ${EndIf}
-    !endif
-
-    !ifdef SUPPORTS_ARM64
-        ${if} ${IsNativeARM64}
-            File "/oname=${PRODUCT_EXECUTABLE}" "${ARG_WAILS_ARM64_BINARY}"
-        ${EndIf}
-    !endif
-!macroend
-
-!macro wails.writeUninstaller
-    WriteUninstaller "$INSTDIR\uninstall.exe"
-
-    SetRegView 64
-    WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "${INFO_COMPANYNAME}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "${INFO_PRODUCTNAME}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${INFO_PRODUCTVERSION}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXECUTABLE}"
-    WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
-    WriteRegStr HKLM "${UNINST_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
-
-    ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
-    IntFmt $0 "0x%08X" $0
-    WriteRegDWORD HKLM "${UNINST_KEY}" "EstimatedSize" "$0"
-!macroend
-
-!macro wails.deleteUninstaller
-    Delete "$INSTDIR\uninstall.exe"
-
-    SetRegView 64
-    DeleteRegKey HKLM "${UNINST_KEY}"
-!macroend
-
-# Install webview2 by launching the bootstrapper
-# See https://docs.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#online-only-deployment
-!macro wails.webview2runtime
-    !ifndef WAILS_INSTALL_WEBVIEW_DETAILPRINT
-        !define WAILS_INSTALL_WEBVIEW_DETAILPRINT "Installing: WebView2 Runtime"
-    !endif
-
-    SetRegView 64
-	# If the admin key exists and is not empty then webview2 is already installed
-	ReadRegStr $0 HKLM "SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" "pv"
-    ${If} $0 != ""
-        Goto ok
-    ${EndIf}
-
-    ${If} ${REQUEST_EXECUTION_LEVEL} == "user"
-        # If the installer is run in user level, check the user specific key exists and is not empty then webview2 is already installed
-	    ReadRegStr $0 HKCU "Software\Microsoft\EdgeUpdate\Clients{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" "pv"
-        ${If} $0 != ""
-            Goto ok
-        ${EndIf}
-     ${EndIf}
-    
-	SetDetailsPrint both
-    DetailPrint "${WAILS_INSTALL_WEBVIEW_DETAILPRINT}"
-    SetDetailsPrint listonly
-    
-    InitPluginsDir
-    CreateDirectory "$pluginsdir\webview2bootstrapper"
-    SetOutPath "$pluginsdir\webview2bootstrapper"
-    File "tmp\MicrosoftEdgeWebview2Setup.exe"
-    ExecWait '"$pluginsdir\webview2bootstrapper\MicrosoftEdgeWebview2Setup.exe" /silent /install'
-    
-    SetDetailsPrint both
-    ok:
-!macroend

v2/examples/systray/build/windows/wails.exe.manifest

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="com.wails.{{.Name}}" version="{{.Info.ProductVersion}}.0" processorArchitecture="*"/>
-    <dependency>
-        <dependentAssembly>
-            <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
-        </dependentAssembly>
-    </dependency>
-    <asmv3:application>
-        <asmv3:windowsSettings>
-            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware> <!-- fallback for Windows 7 and 8 -->
-            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitorv2,permonitor</dpiAwareness> <!-- falls back to per-monitor if per-monitor v2 is not supported -->
-        </asmv3:windowsSettings>
-    </asmv3:application>
-</assembly>