Rename exp -> v3

Merge branch 'master' into future/exp
Update clir
2026-04-22 15:26:15 -07:00 · 2023-01-18 21:34:11 +11:00 · 2023-01-18 21:27:30 +11:00 · 2023-01-18 20:57:31 +11:00 · 2023-01-18 20:19:12 +11:00 · 2023-01-18 09:31:09 +01:00
2138 changed files with 69704 additions and 53689 deletions
@@ -1,4 +1,4 @@
-name: Build + Test v2
+name: Build + Test

 on:
  push:
@@ -0,0 +1,15 @@
+name: Label sponsors
+on:
+  pull_request:
+    types: [ opened ]
+  issues:
+    types: [ opened ]
+jobs:
+  build:
+    name: is-sponsor-label
+    if: github.repository == 'wailsapp/wails'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: JasonEtco/is-sponsor-label-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,9 +1,8 @@
-name: Upload Source Documents
+name: Push Checks

 on:
  push:
    branches: [master]
-  workflow_dispatch:

 jobs:
  push_files_to_crowdin:
@@ -14,28 +13,25 @@ jobs:
      - uses: actions/checkout@v2

      - name: Verify Changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/verify-changed-files@v11.1
+        id: verify-changed-files
        with:
          files: |
            website/**/*.mdx
            website/**/*.md
            website/**/*.json

-      - name: Setup Nodejs
+      - name: Set node
+        if: steps.verify-changed-files.outputs.files_changed != 'true'
        uses: actions/setup-node@v2
        with:
-          node-version: 18.x
+          node-version: 16.x

-      - name: Setup Task
-        uses: arduino/setup-task@v1
-        with:
-          version: 3.x
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload source documents
-        if: steps.changed-files.outputs.any_changed == 'true'
+      - name: Push files
        env:
          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-        working-directory: ./website
-        run: task crowdin:push
+        run: |
+          cd website
+          corepack enable
+          pnpm install
+          pnpm run crowdin push -b master
@@ -1,4 +1,4 @@
-name: Sync Translations
+name: Sync Translated Documents

 on:
  workflow_dispatch:
@@ -10,30 +10,22 @@ jobs:
    steps:
      - uses: actions/checkout@v3

-      - name: Setup Nodejs
+      - name: Set node
        uses: actions/setup-node@v2
        with:
-          node-version: 18.x
-
-      - name: Install Task
-        uses: arduino/setup-task@v1
-        with:
-          version: 3.x
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          node-version: 16.x

      - name: Sync Translated Documents
+        run: cd scripts && chmod 755 ./sync-translated-documents.sh && ./sync-translated-documents.sh
        env:
          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-        working-directory: ./website
-        run: task crowdin:pull

      - name: Create Pull Request
        uses: peter-evans/create-pull-request@v4
        with:
-          commit-message: "docs: sync translations"
-          title: "docs: sync translations"
+          commit-message: "docs: sync documents"
+          title: "docs: sync documents"
          body: "- [x] Sync translated documents"
-          branch: chore/sync-translations
-          labels: translation
+          branch: feature/documents
          delete-branch: true
          draft: true
@@ -34,5 +34,3 @@ v2/cmd/wails/internal/commands/initialise/templates/testtemplates/

 /v3/.task
 /v3/examples/build/bin/testapp
-/websitev3/site/
-/v3/examples/plugins/bin/testapp
@@ -91,12 +91,8 @@ The installation instructions are on the [official website](https://wails.io/doc

 ## Sponsors

-
 This project is supported by these kind people / companies:
 <img src="website/static/img/sponsors.svg" style="width:100%;max-width:800px;"/>
-<p align="center">
-<img src="https://wails.io/img/sponsor/jetbrains-grayscale.webp" style="width: 100px"/>
-</p>

 ## FAQ

@@ -1,24 +0,0 @@
-# https://taskfile.dev
-
-version: "3"
-
-vars:
-  GREETING: Hello, World!
-
-tasks:
-  contributors:check:
-    cmds:
-      - npx -y all-contributors-cli check
-
-  contributors:update:
-    cmds:
-      - go run v3/tasks/contribs/main.go
-
-  contributors:build:
-    cmds:
-      - npx -y all-contributors-cli generate
-
-  release:
-    dir: v2/tools/release
-    cmds:
-      - go run release.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
@@ -18,9 +18,10 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
-	golang.org/x/image v0.5.0
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
-	golang.org/x/text v0.7.0
+	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
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )
@@ -58,40 +58,25 @@ 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-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
-golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
-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/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+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/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-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/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/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.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-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=
@@ -1,33 +0,0 @@
-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=
@@ -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
 }
@@ -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)
 }

@@ -4178,10 +4178,13 @@
      "dev": true
    },
    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true
+      "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"
+      }
    },
    "kind-of": {
      "version": "6.0.3",
@@ -4231,9 +4234,9 @@
      },
      "dependencies": {
        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
          "dev": true,
          "requires": {
            "minimist": "^1.2.0"
@@ -10,6 +10,6 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "sponsorkit": "^0.8.2"
+    "sponsorkit": "^0.6.1"
  }
 }
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd ../website
+
+npx @crowdin/cli@latest pull -b master
@@ -2,15 +2,14 @@ package flags

 import (
 	"fmt"
+	"github.com/samber/lo"
+	"github.com/wailsapp/wails/v2/internal/project"
+	"github.com/wailsapp/wails/v2/pkg/commands/build"
 	"net"
 	"net/url"
 	"os"
 	"path/filepath"
 	"runtime"
-
-	"github.com/samber/lo"
-	"github.com/wailsapp/wails/v2/internal/project"
-	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )

 type Dev struct {
@@ -127,7 +126,6 @@ func (d *Dev) GenerateBuildOptions() *build.Options {
 		Compiler:       d.Compiler,
 		ForceBuild:     d.ForceBuild,
 		IgnoreFrontend: d.SkipFrontend,
-		SkipBindings:   d.SkipBindings,
 		Verbosity:      d.Verbosity,
 		WailsJSDir:     d.WailsJSDir,
 		RaceDetector:   d.RaceDetector,
@@ -22,7 +22,6 @@ import (
 	"github.com/wailsapp/wails/v2/cmd/wails/flags"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/gomod"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/logutils"
-	"golang.org/x/mod/semver"

 	"github.com/wailsapp/wails/v2/pkg/commands/buildtags"

@@ -37,10 +36,6 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )

-const (
-	viteMinVersion = "v3.0.0"
-)
-
 func sliceToMap(input []string) map[string]struct{} {
 	result := map[string]struct{}{}
 	for _, value := range input {
@@ -49,6 +44,31 @@ func sliceToMap(input []string) map[string]struct{} {
 	return result
 }

+type devFlags struct {
+	ldflags         string
+	compilerCommand string
+	assetDir        string
+	extensions      string
+	reloadDirs      string
+	openBrowser     bool
+	noReload        bool
+	skipBindings    bool
+	wailsjsdir      string
+	tags            string
+	verbosity       int
+	loglevel        string
+	forceBuild      bool
+	debounceMS      int
+	devServer       string
+	appargs         string
+	saveConfig      bool
+	raceDetector    bool
+
+	frontendDevServerURL string
+	skipFrontend         bool
+	noColour             bool
+}
+
 // Application runs the application in dev mode
 func Application(f *flags.Dev, logger *clilogger.CLILogger) error {

@@ -93,11 +113,10 @@ func Application(f *flags.Dev, logger *clilogger.CLILogger) error {
 		buildOptions.IgnoreApplication = false
 	}

-	legacyUseDevServerInsteadofCustomScheme := false
 	// frontend:dev:watcher command.
 	frontendDevAutoDiscovery := projectConfig.IsFrontendDevServerURLAutoDiscovery()
 	if command := projectConfig.DevWatcherCommand; command != "" {
-		closer, devServerURL, devServerViteVersion, err := runFrontendDevWatcherCommand(projectConfig.GetFrontendDir(), command, frontendDevAutoDiscovery)
+		closer, devServerURL, err := runFrontendDevWatcherCommand(projectConfig.GetFrontendDir(), command, frontendDevAutoDiscovery)
 		if err != nil {
 			return err
 		}
@@ -106,12 +125,6 @@ func Application(f *flags.Dev, logger *clilogger.CLILogger) error {
 			f.FrontendDevServerURL = devServerURL
 		}
 		defer closer()
-
-		if devServerViteVersion != "" && semver.Compare(devServerViteVersion, viteMinVersion) < 0 {
-			logutils.LogRed("Please upgrade your Vite Server to at least '%s' future Wails versions will require at least Vite '%s'", viteMinVersion, viteMinVersion)
-			time.Sleep(3 * time.Second)
-			legacyUseDevServerInsteadofCustomScheme = true
-		}
 	} else if frontendDevAutoDiscovery {
 		return fmt.Errorf("unable to auto discover frontend:dev:serverUrl without a frontend:dev:watcher command, please either set frontend:dev:watcher or remove the auto discovery from frontend:dev:serverUrl")
 	}
@@ -119,7 +132,7 @@ func Application(f *flags.Dev, logger *clilogger.CLILogger) error {
 	// Do initial build but only for the application.
 	logger.Println("Building application for development...")
 	buildOptions.IgnoreFrontend = true
-	debugBinaryProcess, appBinary, err := restartApp(buildOptions, nil, f, exitCodeChannel, legacyUseDevServerInsteadofCustomScheme)
+	debugBinaryProcess, appBinary, err := restartApp(buildOptions, nil, f, exitCodeChannel)
 	buildOptions.IgnoreFrontend = ignoreFrontend || f.FrontendDevServerURL != ""
 	if err != nil {
 		return err
@@ -165,7 +178,7 @@ func Application(f *flags.Dev, logger *clilogger.CLILogger) error {
 	}()

 	// Watch for changes and trigger restartApp()
-	debugBinaryProcess = doWatcherLoop(buildOptions, debugBinaryProcess, f, watcher, exitCodeChannel, quitChannel, f.DevServerURL(), legacyUseDevServerInsteadofCustomScheme)
+	debugBinaryProcess = doWatcherLoop(buildOptions, debugBinaryProcess, f, watcher, exitCodeChannel, quitChannel, f.DevServerURL())

 	// Kill the current program if running and remove dev binary
 	if err := killProcessAndCleanupBinary(debugBinaryProcess, appBinary); err != nil {
@@ -214,7 +227,7 @@ func runCommand(dir string, exitOnError bool, command string, args ...string) er
 }

 // runFrontendDevWatcherCommand will run the `frontend:dev:watcher` command if it was given, ex- `npm run dev`
-func runFrontendDevWatcherCommand(frontendDirectory string, devCommand string, discoverViteServerURL bool) (func(), string, string, error) {
+func runFrontendDevWatcherCommand(frontendDirectory string, devCommand string, discoverViteServerURL bool) (func(), string, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	scanner := NewStdoutScanner()
 	cmdSlice := strings.Split(devCommand, " ")
@@ -226,7 +239,7 @@ func runFrontendDevWatcherCommand(frontendDirectory string, devCommand string, d

 	if err := cmd.Start(); err != nil {
 		cancel()
-		return nil, "", "", fmt.Errorf("unable to start frontend DevWatcher: %w", err)
+		return nil, "", fmt.Errorf("unable to start frontend DevWatcher: %w", err)
 	}

 	var viteServerURL string
@@ -236,19 +249,10 @@ func runFrontendDevWatcherCommand(frontendDirectory string, devCommand string, d
 			viteServerURL = serverURL
 		case <-time.After(time.Second * 10):
 			cancel()
-			return nil, "", "", errors.New("failed to find Vite server URL")
+			return nil, "", errors.New("failed to find Vite server URL")
 		}
 	}

-	viteVersion := ""
-	select {
-	case version := <-scanner.ViteServerVersionC:
-		viteVersion = version
-
-	case <-time.After(time.Second * 5):
-		// That's fine, then most probably it was not vite that was running
-	}
-
 	logutils.LogGreen("Running frontend DevWatcher command: '%s'", devCommand)
 	var wg sync.WaitGroup
 	wg.Add(1)
@@ -276,11 +280,11 @@ func runFrontendDevWatcherCommand(frontendDirectory string, devCommand string, d
 		}
 		cancel()
 		wg.Wait()
-	}, viteServerURL, viteVersion, nil
+	}, viteServerURL, nil
 }

 // restartApp does the actual rebuilding of the application when files change
-func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process, f *flags.Dev, exitCodeChannel chan int, legacyUseDevServerInsteadofCustomScheme bool) (*process.Process, string, error) {
+func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process, f *flags.Dev, exitCodeChannel chan int) (*process.Process, string, error) {

 	appBinary, err := build.Build(buildOptions)
 	println()
@@ -318,9 +322,6 @@ func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process
 	os.Setenv("assetdir", f.AssetDir)
 	os.Setenv("devserver", f.DevServer)
 	os.Setenv("frontenddevserverurl", f.FrontendDevServerURL)
-	if legacyUseDevServerInsteadofCustomScheme {
-		os.Setenv("legacyusedevsererinsteadofcustomscheme", "true")
-	}

 	// Start up new binary with correct args
 	newProcess := process.NewProcess(appBinary, args...)
@@ -340,7 +341,7 @@ func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process
 }

 // doWatcherLoop is the main watch loop that runs while dev is active
-func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Process, f *flags.Dev, watcher *fsnotify.Watcher, exitCodeChannel chan int, quitChannel chan os.Signal, devServerURL *url.URL, legacyUseDevServerInsteadofCustomScheme bool) *process.Process {
+func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Process, f *flags.Dev, watcher *fsnotify.Watcher, exitCodeChannel chan int, quitChannel chan os.Signal, devServerURL *url.URL) *process.Process {
 	// Main Loop
 	var extensionsThatTriggerARebuild = sliceToMap(strings.Split(f.Extensions, ","))
 	var dirsThatTriggerAReload []string
@@ -446,7 +447,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 				rebuild = false
 				logutils.LogGreen("[Rebuild triggered] files updated")
 				// Try and build the app
-				newBinaryProcess, _, err := restartApp(buildOptions, debugBinaryProcess, f, exitCodeChannel, legacyUseDevServerInsteadofCustomScheme)
+				newBinaryProcess, _, err := restartApp(buildOptions, debugBinaryProcess, f, exitCodeChannel)
 				if err != nil {
 					logutils.LogRed("Error during build: %s", err.Error())
 					continue
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lea Anthony	d24d82f86d	Rename exp -> v3	2023-01-18 21:34:11 +11:00
Lea Anthony	81e9223124	Merge branch 'master' into future/exp	2023-01-18 21:27:30 +11:00
Lea Anthony	2374bb7e0e	Update clir	2023-01-18 20:57:31 +11:00
Lea Anthony	4c42ef9710	Create generate bindings command	2023-01-18 20:19:12 +11:00
stffabi	b4d64678b5	Basic integration of the assetserver	2023-01-18 09:31:09 +01:00
Lea Anthony	a4f729a6a0	Rename parser package. Fix linting issues Add README.md	2023-01-18 08:22:31 +11:00
Lea Anthony	8e593e9c35	Start of TS models generation support	2023-01-17 18:57:35 +11:00
Lea Anthony	0a09363db7	Support struct discovery over multiple files	2023-01-17 07:45:41 +11:00
Lea Anthony	b0b96c9838	Support struct discovery in methods	2023-01-16 20:30:05 +11:00
Lea Anthony	8bbf5ff3f1	Recursive bound model discovery implemented	2023-01-15 20:25:42 +11:00
Lea Anthony	572fbc9705	Initial parsing to discover bound struct names	2023-01-13 17:35:43 +11:00
Lea Anthony	f371b513d1	Fix name of Window menu in role	2023-01-13 17:33:54 +11:00
Lea Anthony	e5d3803fc1	Initial runtime builds Added Taskfile for fast runtime builds	2023-01-08 21:06:31 +11:00
Lea Anthony	06a0377963	Fix frameless Add rounded corners for frameless Create NSWindow subclass Add pre-post build hooks	2023-01-07 11:26:46 +11:00
Lea Anthony	62a5509390	Do not display internal tasks when using `wails task list`	2023-01-06 20:20:40 +11:00
Lea Anthony	54805d99a0	Remove `New` from Dialog methods	2023-01-06 20:19:20 +11:00
Lea Anthony	d1e2ee452f	Integrate Task	2023-01-05 15:02:08 +11:00
Lea Anthony	b5127d95ff	Add EnableFraudulentWebsiteWarnings feature Co-authored-by: stffabi <stffabi@users.noreply.github.com>	2023-01-04 20:12:28 +11:00
Lea Anthony	174a31b49a	Add `run` command for running tasks in a `Taskfile.yml` Add `generate` command for generating assets Add build example	2023-01-04 20:01:13 +11:00
Lea Anthony	746b4dfc04	Fix sizes bug Remove redundant menu package	2023-01-03 05:43:56 +11:00
Lea Anthony	e5da0eb5f8	Add icon generation Add syso generation Add tests	2023-01-02 21:23:44 +11:00
Lea Anthony	f4044ebcd9	Add icon tool	2023-01-02 08:23:29 +11:00
Lea Anthony	bc7d8295ba	Refactor window -> webviewwindow	2023-01-02 05:48:52 +11:00
Lea Anthony	71fb7fadff	Merge branch 'chore/move_assetserver_to_pkg' into future/exp	2022-12-31 13:08:34 +11:00
Lea Anthony	be240795e2	Refactor assetserver into pkg	2022-12-31 11:01:24 +11:00
Lea Anthony	cf5def05a6	Refactor application API to use options by default. Updated examples.	2022-12-31 10:38:36 +11:00
Lea Anthony	ad802a3ad0	Frameless support applicationShouldTerminateAfterLastWindowClosed support	2022-12-30 14:14:28 +11:00
Lea Anthony	287039a8f3	Task experiment	2022-12-28 19:17:38 +11:00
Lea Anthony	ad1d104d85	Add screen support Co-authored-by: Oleg Gulevskyy <43781031+oleggulevskyy@users.noreply.github.com>	2022-12-28 14:09:13 +11:00
Lea Anthony	92af7455ad	Support Show/Hide window Better demo window.Run() -> window.Show()	2022-12-27 21:15:43 +11:00
Lea Anthony	b6b6acf1d9	Remove debug printfs	2022-12-27 15:31:24 +11:00
Lea Anthony	5187641e25	Remove C.toggleFullscreen	2022-12-27 15:29:57 +11:00
Lea Anthony	41779866c4	Disable fullscreen button if there are size constraints	2022-12-27 13:42:57 +11:00
Lea Anthony	f800222781	Allow SetSize to adjust min/max constraints	2022-12-27 09:38:00 +11:00
Lea Anthony	0c364b2813	Fix sizing of window/contentrect Fix set min/max size Ignore SetSize when in fullscreen Disable size constraints when going fullscreen	2022-12-27 09:23:54 +11:00
Lea Anthony	7dbb8c1377	Improve Minimise, Maximise Add Restore setAutoenablesItems:NO	2022-12-26 20:21:51 +11:00
Lea Anthony	6a0c101b08	Fix dialog ID issue Use map instead of uint for dialog IDs	2022-12-24 20:40:34 +11:00
Lea Anthony	f240f2100c	Refactor mainthread dispatch	2022-12-24 15:35:04 +11:00
Lea Anthony	2b91ced1b7	Support SetPosition Optimise event listener callbacks	2022-12-24 13:38:48 +11:00
Lea Anthony	b7f1defbf3	NavigateToURL -> SetURL Fixed typo in colour Removed EnableDevTools	2022-12-23 23:18:28 +11:00
Lea Anthony	2946a0aa25	GetCurrentWindow -> CurrentWindow	2022-12-23 19:55:54 +11:00
Lea Anthony	b043126031	Add open file dialog filters Add clipboard Fix mouse event handling	2022-12-23 07:34:12 +11:00
Lea Anthony	4d58b56d54	Improve dialogs	2022-12-21 21:30:26 +11:00
Lea Anthony	025e8d7645	Add SaveFileDialog Add Toolbar Styles Add Invisible Titlebar option with drag support	2022-12-20 21:49:19 +11:00
Lea Anthony	e7abe1c606	Add Webview navigation events Add HTML/JS/CSS in config Add RenderHTML() Tidy up window delegate	2022-12-19 21:17:50 +11:00
Lea Anthony	ea1f086289	OpenDialog attach to window & multiple files selection	2022-12-19 08:26:59 +11:00
Lea Anthony	b1e8f2f887	Start of file dialogs	2022-12-18 23:06:31 +11:00
Lea Anthony	45adc49683	Add application icon support Add message dialog support Add default icons Add png to byte slice task Fixed kitchen sink	2022-12-18 13:06:03 +11:00
Lea Anthony	2409984aab	Add application about dialog Add application icon support	2022-12-18 00:40:53 +11:00
Lea Anthony	8f9eeb8055	Improve menu demo	2022-12-17 20:49:58 +11:00
Lea Anthony	a8d5f185c2	Fix resizing bug Refactor some application setters	2022-12-17 20:49:46 +11:00
Lea Anthony	bbb418f98f	Fix submenu radio processing	2022-12-17 20:49:04 +11:00
Lea Anthony	f8eb680559	Add Window & Help menus Fix min/max sizing	2022-12-17 19:56:29 +11:00
Lea Anthony	da5fa806d7	Add Zoom In/Out & Actual size roles	2022-12-16 21:28:16 +11:00
Lea Anthony	88f6a3d1b9	Refactor and support more roles	2022-12-16 21:09:31 +11:00
Lea Anthony	475880c0a8	Add services, hide, hideothers, unhide role Add application.Name() refactor roles Add app menu role	2022-12-16 21:06:49 +11:00
Lea Anthony	faf418eac0	Add global reference for application Add default application meu for Mac Add window example Fix invalid accelerator error logging	2022-12-15 21:21:19 +11:00
Lea Anthony	f35b8dfec5	Refactor Application Add SetActivationPolicy Added labels to menus	2022-12-15 18:06:09 +11:00
Lea Anthony	14fcfb8348	Refactor event types	2022-12-15 18:03:01 +11:00
Lea Anthony	f84c4aca72	Refactor message processing functions	2022-12-15 08:01:49 +11:00
Lea Anthony	dad7798da9	New Systray example	2022-12-15 08:01:21 +11:00
Lea Anthony	79af667b7a	Support Menu Accelerators	2022-12-15 08:00:49 +11:00
Lea Anthony	d84cb5b190	Fix enabled menuitem	2022-12-14 19:15:58 +11:00
Lea Anthony	7c18f25508	Support radio menuitems Support systemtray destroy()	2022-12-14 19:03:27 +11:00
Lea Anthony	085de606ee	Support submenus	2022-12-14 08:48:17 +11:00
Lea Anthony	c7ac90def4	Support template icons	2022-12-14 08:26:52 +11:00
Lea Anthony	bb36ce61bc	Refactor dispatching	2022-12-14 07:52:10 +11:00
Lea Anthony	a35a876094	Add support for system tray + menus	2022-12-13 21:54:12 +11:00
Lea Anthony	f38c6c6d1c	Add Fatal()	2022-12-11 20:05:00 +11:00
Lea Anthony	f6a16950f2	Add Window methods Width(), Height(), Size() + Position() Fix main thread locking issue Add Window aliases	2022-12-11 19:57:20 +11:00
Lea Anthony	ddb2f63f7b	Support Window aliases	2022-12-11 14:39:53 +11:00
Lea Anthony	bf8e541221	Support Window events Convert events to uint Rename system events to application events	2022-12-11 13:01:38 +11:00
Lea Anthony	4a2cf597c2	Fix resizable	2022-12-11 11:26:21 +11:00
Lea Anthony	27370559d3	Refactor Is* methods Add more events	2022-12-11 11:09:52 +11:00
Lea Anthony	a134bfac42	Add Center Add more events	2022-12-10 22:34:15 +11:00
Lea Anthony	d5e21d5003	Fix race condition in closing window during navigating Add sane defaults	2022-12-09 08:22:17 +11:00
Lea Anthony	85abb1122f	Add main thread dispatching Make `window.Run` operate on main thread	2022-12-09 07:47:47 +11:00
Lea Anthony	0257362a86	Support per-window message dispatching	2022-12-08 23:06:27 +11:00
Lea Anthony	1872672d0c	Support appearance	2022-12-08 18:20:04 +11:00
Lea Anthony	644655662e	Support toolbar config	2022-12-08 18:09:02 +11:00
Lea Anthony	508bbb4fb4	Support Min/Max/Fullscreen, BackgroundColour	2022-12-08 17:25:39 +11:00
Lea Anthony	cb9df61a98	Support MacBackdrop type Fix devtools window error	2022-12-08 07:47:04 +11:00
Lea Anthony	ab976e56af	Support ExecJS	2022-12-07 23:58:45 +11:00
Lea Anthony	df1cc2ee0b	Support EnableDevTools	2022-12-07 23:52:16 +11:00
Lea Anthony	af6daa273e	Support min/max window size	2022-12-07 23:44:19 +11:00
Lea Anthony	05803fb5d5	Add more Window API	2022-12-07 23:30:20 +11:00
Lea Anthony	5a37091bb0	Initial play around	2022-12-07 21:55:09 +11:00