Skip to content

Commit

Permalink
Update webview lib, drop launcher wrapper \o/
Browse files Browse the repository at this point in the history
  • Loading branch information
retrixe committed Nov 24, 2023
1 parent 035f1d3 commit 4d78a94
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 73 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ jobs:
go-version: ^1.21
id: go

- name: Download DLLs for Windows
run: >
C:\msys64\usr\bin\wget.exe https://github.com/webview/webview_csharp/raw/master/libs/webview.dll
https://github.com/webview/webview_csharp/raw/master/libs/WebView2Loader.dll
if: ${{ success() && matrix.os == 'windows-latest' }}

- name: Install dependencies on Ubuntu
run: |
sudo apt-get update
Expand All @@ -58,8 +52,4 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: writer-${{ runner.os }}
path: |
writer*
launcher.exe
webview.dll
WebView2Loader.dll
path: writer*
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.19

require (
github.com/sqweek/dialog v0.0.0-20200911184034-8a3d98e8211d
github.com/webview/webview v0.0.0-20200724072439-e0c01595b361
github.com/webview/webview_go v0.0.0-20230901181450-5a14030a9070
)

require github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf // indirect
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf h1:FPsprx82rdrX2j
github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I=
github.com/sqweek/dialog v0.0.0-20200911184034-8a3d98e8211d h1:Chay1rwJnXxI27H+pzu7P81BKf647un9GOoRPTdXN18=
github.com/sqweek/dialog v0.0.0-20200911184034-8a3d98e8211d/go.mod h1:/qNPSY91qTz/8TgHEMioAUc6q7+3SOybeKczHMXFcXw=
github.com/webview/webview v0.0.0-20200724072439-e0c01595b361 h1:e0+/fQY5l9NdCwPsEg9S8AgE5lFhZ/6UX+b2KkpIBFg=
github.com/webview/webview v0.0.0-20200724072439-e0c01595b361/go.mod h1:rpXAuuHgyEJb6kXcXldlkOjU6y4x+YcASKKXJNUhh0Y=
github.com/webview/webview_go v0.0.0-20230901181450-5a14030a9070 h1:imZLWyo1ondeQjqfb/eHuYgFiOAYg6ugSMCnGfPTPmg=
github.com/webview/webview_go v0.0.0-20230901181450-5a14030a9070/go.mod h1:yE65LFCeWf4kyWD5re+h4XNvOHJEXOCOuJZ4v8l5sgk=
53 changes: 0 additions & 53 deletions launcher_windows.go

This file was deleted.

2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/retrixe/writer/utils"
"github.com/sqweek/dialog"
"github.com/webview/webview"
webview "github.com/webview/webview_go"
)

// TODO: Design UI (with live warnings/errors).
Expand Down
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,10 @@
"lint": "eslint . && tsc --noEmit",
"dev": "parcel renderer/index.html & go run -ldflags=\"-s -w -X main.overrideUrl=http://localhost:1234/\" . & echo Starting...",
"start": "parcel build renderer/index.tsx && go run .",
"build": "run-script-os",
"build:default": "parcel build renderer/index.tsx --no-source-maps && yarn build:go",
"build:windows": "yarn build:default && yarn build:launcher",
"build": "parcel build renderer/index.tsx --no-source-maps && yarn build:go",
"build:go": "run-script-os",
"build:go:default": "go build -ldflags=\"-s -w\" -o writer -v",
"build:go:windows": "go build -ldflags=\"-s -w -H windowsgui\" -o writer.exe -v",
"build:launcher": "go build -tags launcher -ldflags=\"-s -w\" -o launcher.exe -v launcher_windows.go"
"build:go:windows": "go build -ldflags=\"-s -w -H windowsgui\" -o writer.exe -v"
},
"packageManager": "yarn@4.0.2",
"dependencies": {
Expand Down

0 comments on commit 4d78a94

Please sign in to comment.