Skip to content

Commit

Permalink
Merge branch 'master' into fix/sbshah97/author-name-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbshah97
sbshah97 committed Jan 7, 2024
2 parents 86b7785 + f7c1946 commit 16d1d41
Show file tree
Hide file tree
Showing 26 changed files with 146 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3

- name: Verify Changed files
uses: tj-actions/verify-changed-files@v11.1
uses: tj-actions/verify-changed-files@v17
id: verify-changed-files
with:
files: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-source-documents.yml
View file
Expand Up @@ -15,7 +15,7 @@ jobs:

- name: Verify Changed files
id: changed-files
uses: tj-actions/changed-files@v35
uses: tj-actions/changed-files@v41
with:
files: |
website/**/*.mdx
Expand Down
29 changes: 17 additions & 12 deletions v2/go.mod
View file
Expand Up @@ -10,7 +10,7 @@ require (
github.com/charmbracelet/glamour v0.5.0
github.com/flytam/filenamify v1.0.0
github.com/fsnotify/fsnotify v1.4.9
github.com/go-git/go-git/v5 v5.3.0
github.com/go-git/go-git/v5 v5.11.0
github.com/go-ole/go-ole v1.2.6
github.com/godbus/dbus/v5 v5.1.0
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
Expand All @@ -32,42 +32,45 @@ require (
github.com/pterm/pterm v0.12.49
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/samber/lo v1.38.1
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.4
github.com/tc-hib/winres v0.2.1
github.com/tidwall/sjson v1.1.7
github.com/tkrajina/go-reflector v0.5.6
github.com/wailsapp/go-webview2 v1.0.10
github.com/wailsapp/mimetype v1.4.1
github.com/wzshiming/ctc v1.2.3
golang.org/x/mod v0.12.0
golang.org/x/net v0.17.0
golang.org/x/net v0.19.0
golang.org/x/sys v0.15.0
golang.org/x/tools v0.6.0
golang.org/x/tools v0.13.0
)

require (
atomicgo.dev/cursor v0.1.1 // indirect
atomicgo.dev/keyboard v0.2.8 // indirect
bitbucket.org/creachadair/shell v0.0.7 // indirect
github.com/Microsoft/go-winio v0.4.16 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.2.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/gookit/color v1.5.2 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/jaypipes/pcidb v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/lithammer/fuzzysearch v1.1.5 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
Expand All @@ -79,16 +82,18 @@ require (
github.com/muesli/termenv v0.9.0 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/tidwall/gjson v1.9.3 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
github.com/yuin/goldmark-emoji v1.0.1 // indirect
Expand Down
125 changes: 60 additions & 65 deletions v2/go.sum
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions v2/internal/frontend/desktop/linux/single_instance.go
View file
Expand Up @@ -7,6 +7,7 @@ import (
"encoding/json"
"github.com/godbus/dbus/v5"
"github.com/wailsapp/wails/v2/pkg/options"
"log"
"os"
"strings"
)
Expand Down Expand Up @@ -55,8 +56,15 @@ func SetupSingleInstance(uniqueID string) {
data := options.SecondInstanceData{
Args: os.Args[1:],
}
data.WorkingDirectory, err = os.Getwd()
if err != nil {
log.Printf("Failed to get working directory: %v", err)
return
}

serialized, err := json.Marshal(data)
if err != nil {
log.Printf("Failed to marshal data: %v", err)
return
}

Expand Down
12 changes: 11 additions & 1 deletion v2/internal/frontend/desktop/windows/single_instance.go
View file
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc/w32"
"github.com/wailsapp/wails/v2/pkg/options"
"golang.org/x/sys/windows"
"log"
"os"
"syscall"
"unsafe"
Expand Down Expand Up @@ -51,7 +52,16 @@ func SetupSingleInstance(uniqueId string) {
data := options.SecondInstanceData{
Args: os.Args[1:],
}
serialized, _ := json.Marshal(data)
data.WorkingDirectory, err = os.Getwd()
if err != nil {
log.Printf("Failed to get working directory: %v", err)
return
}
serialized, err := json.Marshal(data)
if err != nil {
log.Printf("Failed to marshal data: %v", err)
return
}

SendMessage(hwnd, string(serialized))
// exit second instance of app after sending message
Expand Down
3 changes: 2 additions & 1 deletion website/docs/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...e/i18n/fr/docusaurus-plugin-content-docs/current/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...fr/docusaurus-plugin-content-docs/version-v2.7.0/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...e/i18n/ja/docusaurus-plugin-content-docs/current/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...ja/docusaurus-plugin-content-docs/version-v2.7.0/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...e/i18n/ko/docusaurus-plugin-content-docs/current/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...ko/docusaurus-plugin-content-docs/version-v2.7.0/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...e/i18n/pt/docusaurus-plugin-content-docs/current/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...pt/docusaurus-plugin-content-docs/version-v2.7.0/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...e/i18n/ru/docusaurus-plugin-content-docs/current/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...ru/docusaurus-plugin-content-docs/version-v2.7.0/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...e/i18n/vi/docusaurus-plugin-content-docs/current/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...n/zh-Hans/docusaurus-plugin-content-docs/current/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
3 changes: 2 additions & 1 deletion ...ns/docusaurus-plugin-content-docs/version-v2.7.0/community/showcase/tinyrdm.mdx
View file
Expand Up @@ -2,7 +2,8 @@

```mdx-code-block
<p style={{ "text-align": "center" }}>
<img src={require("@site/static/img/showcase/tiny-rdm.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm1.webp").default} />
<img src={require("@site/static/img/showcase/tiny-rdm2.webp").default} />
<br />
</p>
```
Expand Down
1 change: 1 addition & 0 deletions website/src/pages/changelog.mdx
View file
Expand Up @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed author name string to remove apostrophe. Added by [@sbshah97](https://github.com/sbshah97) in [PR](https://github.com/wailsapp/wails/pull/3151) fixing [Issue](https://github.com/wailsapp/wails/issues/3128)
- Docs for IsZoomControlEnabled and ZoomFactor. Fixed by @leaanthony in [PR](https://github.com/wailsapp/wails/pull/3137)
- Fixed `-compiler` flag for `wails build`, `wails dev` and `wails generate module`. Fixed in [PR](https://github.com/wailsapp/wails/pull/3121) by [@xtrafrancyz](https://github.com/xtrafrancyz)
- Fixed uninitialized `SecondInstanceData.WorkingDirectory` on linux and windows ([#3154](https://github.com/wailsapp/wails/pull/3154)).

## v2.7.1 - 2023-12-10

Expand Down
Binary file removed website/static/img/showcase/tiny-rdm.webp
View file
Binary file not shown.
Binary file added website/static/img/showcase/tiny-rdm1.webp
View file
Binary file not shown.
Binary file added website/static/img/showcase/tiny-rdm2.webp
View file
Binary file not shown.

0 comments on commit 16d1d41

Please sign in to comment.