[v2] v2.0.0-beta.3

[website] update IDE flag
[v2] fix module version in templates. Refactor ide flag
2026-04-04 14:12:40 -07:00 · 2021-09-29 20:24:56 +10:00 · 2021-09-29 20:19:14 +10:00 · 2021-09-29 20:15:26 +10:00 · 2021-09-29 18:06:47 +10:00 · 2021-09-29 01:06:28 -06:00
53 changed files with 193 additions and 91 deletions
--- a/.github/workflows/latest-pre.yml
+++ b/.github/workflows/latest-pre.yml
@@ -15,11 +15,11 @@ jobs:
        os: [ubuntu-latest, windows-latest, macOS-latest]
    steps:

-      - name: Set up Go 1.16
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16
-        id: go
+    - name: Set up Go 1.16
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.16
+      id: go

    - name: Check out code into the Go module directory
      uses: actions/checkout@v1
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -13,11 +13,11 @@ jobs:
        os: [ubuntu-latest, windows-latest, macOS-latest]
    steps:

-      - name: Set up Go 1.16
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16
-        id: go
+    - name: Set up Go 1.16
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.16
+      id: go

    - name: Check out code into the Go module directory
      uses: actions/checkout@v1
@@ -29,4 +29,4 @@ jobs:
      run: go build -v ./cmd/wails

    - name: Test
-      run: ./wails version
+      run: ./wails version
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,11 +15,11 @@ jobs:
        os: [ubuntu-latest, windows-latest, macOS-latest]
    steps:

-      - name: Set up Go 1.16
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16
-        id: go
+    - name: Set up Go 1.16
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.16
+      id: go

    - name: Check out code into the Go module directory
      uses: actions/checkout@v1
@@ -31,4 +31,4 @@ jobs:
      run: go build -v ./cmd/wails

    - name: Test
-      run: ./wails version
+      run: ./wails version
--- a/README.md
+++ b/README.md
@@ -26,6 +26,8 @@ make this easy for you by handling project creation, compilation and bundling. A

 The official docs can be found at [https://wails.app](https://wails.app).

+Click [here](https://wails.io) if you are interested in trying out v2 Beta for Windows.
+
 <span id="nav-2"></span>

 ## Contents
--- a/v2/cmd/wails/internal/commands/generate/template/base/go.mod.tmpl
+++ b/v2/cmd/wails/internal/commands/generate/template/base/go.mod.tmpl
@@ -2,7 +2,7 @@ module changeme

 go 1.17

-require github.com/wailsapp/wails/v2 v2.0.0-beta.0
+require github.com/wailsapp/wails/v2 {{.WailsVersion}}

 require (
 github.com/andybalholm/brotli v1.0.2 // indirect
@@ -35,4 +35,4 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 )

-// replace github.com/wailsapp/wails/v2 v2.0.0-beta.0 => {{.WailsDirectory}}
+// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}
--- a/v2/cmd/wails/internal/commands/generate/template/template.go
+++ b/v2/cmd/wails/internal/commands/generate/template/template.go
@@ -81,16 +81,18 @@ func AddSubCommand(app *clir.Cli, parent *clir.Command, w io.Writer) {
 		}

 		type templateData struct {
-			Name        string
-			Description string
-			TemplateDir string
+			Name         string
+			Description  string
+			TemplateDir  string
+			WailsVersion string
 		}

 		println("Extracting base template files...")

 		err = g.Extract(templateDir, &templateData{
-			Name:        name,
-			TemplateDir: templateDir,
+			Name:         name,
+			TemplateDir:  templateDir,
+			WailsVersion: app.Version(),
 		})
 		if err != nil {
 			return err
--- a/v2/cmd/wails/internal/commands/initialise/initialise.go
+++ b/v2/cmd/wails/internal/commands/initialise/initialise.go
@@ -2,6 +2,8 @@ package initialise

 import (
 	"fmt"
+	"github.com/flytam/filenamify"
+	"github.com/leaanthony/slicer"
 	"io"
 	"strings"
 	"time"
@@ -46,8 +48,8 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	}

 	// VSCode project files
-	vscode := false
-	command.BoolFlag("vscode", "Generate VSCode project files", &vscode)
+	ide := ""
+	command.StringFlag("ide", "Generate IDE project files", &ide)

 	// List templates
 	list := false
@@ -75,6 +77,15 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			return nil
 		}

+		// Validate IDE option
+		supportedIDEs := slicer.String([]string{"vscode"})
+		ide = strings.ToLower(ide)
+		if ide != "" {
+			if !supportedIDEs.Contains(ide) {
+				return fmt.Errorf("ide '%s' not supported. Valid values: %s", ide, supportedIDEs.Join(" "))
+			}
+		}
+
 		if !quiet {
 			app.PrintBanner()
 		}
@@ -83,14 +94,23 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		logger.Println(task)
 		logger.Println(strings.Repeat("-", len(task)))

+		projectFilename, err := filenamify.Filenamify(projectName, filenamify.Options{
+			Replacement: "_",
+			MaxLength:   255,
+		})
+		if err != nil {
+			return err
+		}
 		// Create Template Options
 		options := &templates.Options{
-			ProjectName:    projectName,
-			TargetDir:      projectDirectory,
-			TemplateName:   templateName,
-			Logger:         logger,
-			GenerateVSCode: vscode,
-			InitGit:        initGit,
+			ProjectName:         projectName,
+			TargetDir:           projectDirectory,
+			TemplateName:        templateName,
+			Logger:              logger,
+			IDE:                 ide,
+			InitGit:             initGit,
+			ProjectNameFilename: projectFilename,
+			WailsVersion:        app.Version(),
 		}

 		// Try to discover author details from git config
@@ -135,9 +155,14 @@ func initProject(options *templates.Options) error {
 	options.Logger.Println("Project Template:  " + options.TemplateName)
 	options.Logger.Println("Template Support:  " + template.HelpURL)

-	if options.GenerateVSCode {
+	// IDE message
+	switch options.IDE {
+	case "vscode":
 		options.Logger.Println("VSCode config files generated.")
+	case "goland":
+		options.Logger.Println("Goland config files generated.")
 	}
+
 	if options.InitGit {
 		options.Logger.Println("Git repository initialised.")
 	}
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/gitignore.txt
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/gitignore.txt
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/modules.xml
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="ProjectModuleManager">
+        <modules>
+            <module fileurl="file://$PROJECT_DIR$/.idea/{{.ProjectNameFilename}}.iml"
+                    filepath="$PROJECT_DIR$/.idea/{{.ProjectNameFilename}}.iml"/>
+        </modules>
+    </component>
+</project>
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/name.tmpl
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/name.tmpl
@@ -0,0 +1 @@
+{{.ProjectName}}
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/projectname.iml
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/projectname.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates.go
+++ b/v2/cmd/wails/internal/commands/initialise/templates/templates.go
@@ -51,13 +51,15 @@ type Options struct {
 	BinaryName          string
 	TargetDir           string
 	Logger              *clilogger.CLILogger
-	GenerateVSCode      bool
 	PathToDesktopBinary string
 	PathToServerBinary  string
 	InitGit             bool
 	AuthorName          string
 	AuthorEmail         string
 	AssetDir            string
+	IDE                 string
+	ProjectNameFilename string // The project name but as a valid filename
+	WailsVersion        string
 }

 // Template holds data relating to a template
@@ -248,6 +250,7 @@ func Install(options *Options) (bool, *Template, error) {
 		WailsDirectory: localWailsDirectory,
 		AuthorEmail:    options.AuthorEmail,
 		AuthorName:     options.AuthorName,
+		WailsVersion:   options.WailsVersion,
 	}

 	// Create a formatted name and email combo.
@@ -317,17 +320,39 @@ func OutputList(logger *clilogger.CLILogger) error {

 func generateIDEFiles(options *Options) error {

-	if options.GenerateVSCode {
+	switch options.IDE {
+	case "vscode":
 		return generateVSCodeFiles(options)
+	case "goland":
+		return generateGolandFiles(options)
+	}
+
+	return nil
+}
+
+func generateGolandFiles(options *Options) error {
+	targetDir := filepath.Join(options.TargetDir, ".idea")
+	renameFiles := map[string]string{
+		"projectname.iml": options.ProjectNameFilename + ".iml",
+		"gitignore.txt":   ".gitignore",
+		"name":            ".name",
+	}
+	err := installIDEFiles("goland", targetDir, options, renameFiles)
+	if err != nil {
+		return errors.Wrap(err, "generating Goland IDE files")
 	}

 	return nil
 }

 func generateVSCodeFiles(options *Options) error {
-
 	targetDir := filepath.Join(options.TargetDir, ".vscode")
-	source, err := debme.FS(ides, "ides/vscode")
+	return installIDEFiles("vscode", targetDir, options, nil)
+
+}
+
+func installIDEFiles(ideName string, targetDir string, options *Options, renameFiles map[string]string) error {
+	source, err := debme.FS(ides, "ides/"+ideName)
 	if err != nil {
 		return err
 	}
@@ -335,6 +360,10 @@ func generateVSCodeFiles(options *Options) error {
 	// Use gosod to install the template
 	installer := gosod.New(source)

+	if renameFiles != nil {
+		installer.RenameFiles(renameFiles)
+	}
+
 	binaryName := filepath.Base(options.TargetDir)
 	if runtime.GOOS == "windows" {
 		// yay windows
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.mod.tmpl
+++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.mod.tmpl
@@ -2,7 +2,7 @@ module changeme

 go 1.17

-require github.com/wailsapp/wails/v2 v2.0.0-beta.0
+require github.com/wailsapp/wails/v2 {{.WailsVersion}}

 require (
 github.com/andybalholm/brotli v1.0.2 // indirect
@@ -35,4 +35,4 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 )

-// replace github.com/wailsapp/wails/v2 v2.0.0-beta.0 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.sum
+++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.sum
@@ -58,8 +58,9 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 h1:pdFFlHXY9tZXmJz+tRSm1DzYEH4ebha7cffmm607bMU=
 github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
@@ -82,8 +83,8 @@ github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQ
 github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
 github.com/leaanthony/go-common-file-dialog v1.0.3 h1:O0uGjKnWtdEADGrkg+TyAAbZylykMwwx/MNEXn9fp+Y=
 github.com/leaanthony/go-common-file-dialog v1.0.3/go.mod h1:TGhEc9eSJgRsupZ+iH1ZgAOnEo9zp05cRH2j08RPrF0=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 h1:nK/JTPyJi5QRqYjVZjXgtN4/dhg2qtngoLxLDVn429k=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd h1:6m4zZ/esiByaDbzgdvDxjsOaIDgtuG1q2cyhjAi6uAg=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
 github.com/leaanthony/gosod v1.0.2/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
 github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
@@ -146,6 +147,8 @@ github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfY
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/wailsapp/wails/v2 v2.0.0-beta.2 h1:T17fV+EsjPpl4ZWVOEJ94qkCLhBJ0L6qtLkp4eA9C5M=
+github.com/wailsapp/wails/v2 v2.0.0-beta.2/go.mod h1:V1CwD423vqoHslofcQpZ49Q7H1eDIKFCS7paSVBBNLw=
 github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28=
 github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
@@ -193,8 +196,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -222,4 +225,4 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl
+++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl
@@ -2,7 +2,7 @@ module changeme

 go 1.17

-require github.com/wailsapp/wails/v2 v2.0.0-beta.0
+require github.com/wailsapp/wails/v2 {{.WailsVersion}}

 require (
 github.com/andybalholm/brotli v1.0.2 // indirect
@@ -35,4 +35,4 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 )

-// replace github.com/wailsapp/wails/v2 v2.0.0-beta.0 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.sum
+++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.sum
@@ -58,8 +58,9 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 h1:pdFFlHXY9tZXmJz+tRSm1DzYEH4ebha7cffmm607bMU=
 github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
@@ -82,8 +83,8 @@ github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQ
 github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
 github.com/leaanthony/go-common-file-dialog v1.0.3 h1:O0uGjKnWtdEADGrkg+TyAAbZylykMwwx/MNEXn9fp+Y=
 github.com/leaanthony/go-common-file-dialog v1.0.3/go.mod h1:TGhEc9eSJgRsupZ+iH1ZgAOnEo9zp05cRH2j08RPrF0=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 h1:nK/JTPyJi5QRqYjVZjXgtN4/dhg2qtngoLxLDVn429k=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd h1:6m4zZ/esiByaDbzgdvDxjsOaIDgtuG1q2cyhjAi6uAg=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
 github.com/leaanthony/gosod v1.0.2/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
 github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
@@ -146,6 +147,8 @@ github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfY
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/wailsapp/wails/v2 v2.0.0-beta.2 h1:T17fV+EsjPpl4ZWVOEJ94qkCLhBJ0L6qtLkp4eA9C5M=
+github.com/wailsapp/wails/v2 v2.0.0-beta.2/go.mod h1:V1CwD423vqoHslofcQpZ49Q7H1eDIKFCS7paSVBBNLw=
 github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28=
 github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
@@ -193,8 +196,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
--- a/v2/cmd/wails/internal/commands/update/update.go
+++ b/v2/cmd/wails/internal/commands/update/update.go
@@ -86,7 +86,7 @@ func updateToVersion(logger *clilogger.CLILogger, targetVersion *github.Semantic

 	// Early exit
 	if targetVersionString == currentVersion {
-		logger.Println("Looks like you're up to date!")
+		logger.Println("\nLooks like you're up to date!")
 		return nil
 	}

--- a/v2/cmd/wails/version.go
+++ b/v2/cmd/wails/version.go
@@ -1,3 +1,3 @@
 package main

-var version = "v2.0.0-beta.0"
+var version = "v2.0.0-beta.3"
--- a/v2/go.mod
+++ b/v2/go.mod
@@ -5,6 +5,7 @@ go 1.17
 require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/fatih/structtag v1.2.0
+	github.com/flytam/filenamify v1.0.0
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/gabriel-vasile/mimetype v1.3.1
 	github.com/go-git/go-billy/v5 v5.2.0 // indirect
@@ -20,8 +21,8 @@ require (
 	github.com/leaanthony/debme v1.2.1
 	github.com/leaanthony/go-ansi-parser v1.0.1
 	github.com/leaanthony/go-common-file-dialog v1.0.3
-	github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934
-	github.com/leaanthony/gosod v1.0.2
+	github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd
+	github.com/leaanthony/gosod v1.0.3
 	github.com/leaanthony/idgen v1.0.0
 	github.com/leaanthony/slicer v1.5.0
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7
@@ -42,7 +43,7 @@ require (
 	github.com/ztrue/tracerr v0.3.0
 	golang.org/x/mod v0.4.1 // indirect
 	golang.org/x/net v0.0.0-20210510120150-4163338589ed
-	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6
 	golang.org/x/tools v0.1.0
 	nhooyr.io/websocket v1.8.6
 )
@@ -56,7 +57,7 @@ require (
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 // 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/klauspost/compress v1.12.2 // indirect
 	github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e // indirect
--- a/v2/go.sum
+++ b/v2/go.sum
@@ -22,6 +22,8 @@ github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab/go.mod h1:smsv/
 github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/flytam/filenamify v1.0.0 h1:ewx6BY2dj7U6h2zGPJmt33q/BjkSf/YsY/woQvnUNIs=
+github.com/flytam/filenamify v1.0.0/go.mod h1:Dzf9kVycwcsBlr2ATg6uxjqiFgKGH+5SKFuhdeP5zu8=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
@@ -84,8 +86,9 @@ github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmA
 github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 h1:pdFFlHXY9tZXmJz+tRSm1DzYEH4ebha7cffmm607bMU=
 github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -106,17 +109,16 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leaanthony/clir v1.0.4 h1:Dov2y9zWJmZr7CjaCe86lKa4b5CSxskGAt2yBkoDyiU=
 github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/debme v1.1.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc=
 github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4=
 github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
 github.com/leaanthony/go-common-file-dialog v1.0.3 h1:O0uGjKnWtdEADGrkg+TyAAbZylykMwwx/MNEXn9fp+Y=
 github.com/leaanthony/go-common-file-dialog v1.0.3/go.mod h1:TGhEc9eSJgRsupZ+iH1ZgAOnEo9zp05cRH2j08RPrF0=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 h1:nK/JTPyJi5QRqYjVZjXgtN4/dhg2qtngoLxLDVn429k=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
-github.com/leaanthony/gosod v1.0.2 h1:LtjqaIoHuoXiQXbzMPq0isjNfltSyHKhWeiU/JbmP0w=
-github.com/leaanthony/gosod v1.0.2/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd h1:6m4zZ/esiByaDbzgdvDxjsOaIDgtuG1q2cyhjAi6uAg=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
+github.com/leaanthony/gosod v1.0.3 h1:Fnt+/B6NjQOVuCWOKYRREZnjGyvg+mEhd1nkkA04aTQ=
+github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4=
 github.com/leaanthony/idgen v1.0.0 h1:IZreR+JGEzFV4yeVuBZA25gM0keUoFy+RDUldncQ+Jw=
 github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
@@ -255,8 +257,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
--- a/v2/internal/ffenestri/windows/wv2runtime/browser.go
+++ b/v2/internal/ffenestri/windows/wv2runtime/browser.go
@@ -8,7 +8,7 @@ import (
 )

 func doInstallationStrategy(installStatus installationStatus) error {
-	confirmed, err := webview2runtime.Confirm("This application requires the WebView2 runtime. Press OK to open the download page. Minimum version required: "+minimumRuntimeVersion, "Missing Requirements")
+	confirmed, err := webview2runtime.Confirm("This application requires the WebView2 runtime. Press OK to open the download page. Minimum version required: "+MinimumRuntimeVersion, "Missing Requirements")
 	if err != nil {
 		return err
 	}
--- a/v2/internal/frontend/assetserver/mimecache.go
+++ b/v2/internal/frontend/assetserver/mimecache.go
@@ -5,8 +5,9 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
+
+	"github.com/gabriel-vasile/mimetype"
 )
-import "github.com/gabriel-vasile/mimetype"

 var (
 	cache = map[string]string{}
@@ -33,6 +34,10 @@ func GetMimetype(filename string, data []byte) string {
 		result = strings.Replace(result, "text/plain", "text/css", 1)
 	}

+	if filepath.Ext(filename) == ".js" && strings.HasPrefix(result, "text/plain") {
+		result = strings.Replace(result, "text/plain", "application/javascript", 1)
+	}
+
 	if result == "" {
 		result = "application/octet-stream"
 	}
--- a/v2/internal/frontend/assetserver/mimecache_test.go
+++ b/v2/internal/frontend/assetserver/mimecache_test.go
@@ -14,6 +14,7 @@ func TestGetMimetype(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 		{"css", args{"test.css", []byte("body{margin:0;padding:0;background-color:#d579b2}#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;color:#2c3e50;background-color:#ededed}#nav{padding:30px}#nav a{font-weight:700;color:#2c\n3e50}#nav a.router-link-exact-active{color:#42b983}.hello[data-v-4e26ad49]{margin:10px 0}")}, "text/css; charset=utf-8"},
+		{"js", args{"test.js", []byte("let foo = 'bar'; console.log(foo);")}, "application/javascript; charset=utf-8"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
--- a/v2/internal/frontend/desktop/darwin/browser.go
+++ b/v2/internal/frontend/desktop/darwin/browser.go
@@ -1,3 +1,5 @@
+//go:build darwin
+
 package darwin

 import (
--- a/v2/internal/frontend/desktop/darwin/dialog.go
+++ b/v2/internal/frontend/desktop/darwin/dialog.go
@@ -2,7 +2,6 @@

 package darwin

-import "C"
 import (
 	"github.com/wailsapp/wails/v2/internal/frontend"
 )
--- a/v2/internal/frontend/desktop/windows/dialog.go
+++ b/v2/internal/frontend/desktop/windows/dialog.go
@@ -2,7 +2,6 @@

 package windows

-import "C"
 import (
 	"github.com/leaanthony/go-common-file-dialog/cfd"
 	"github.com/wailsapp/wails/v2/internal/frontend"
--- a/website/blog/2021-09-27-v2-beta1-release-notes.mdx
+++ b/website/blog/2021-09-27-v2-beta1-release-notes.mdx
@@ -153,7 +153,7 @@ community can create!

 Wails v2 represents a new foundation for the project. 
 The aim of this release is to get feedback on the new approach, and to iron out any bugs before a full release. 
-Your input would be most welcome. Please direct any feedback to the [v2 Beta](https://github.com/wailsapp/wails/discussions) 
+Your input would be most welcome. Please direct any feedback to the [v2 Beta](https://github.com/wailsapp/wails/discussions/828)
 discussion board.

 There were many twists and turns, pivots and u-turns to get to this point. This was due partly to early technical decisions 
--- a/website/docs/community/links.mdx
+++ b/website/docs/community/links.mdx
@@ -12,7 +12,7 @@ to submit links.
 - [Gophers Slack Channel](https://gophers.slack.com/messages/CJ4P9F7MZ/)
 - [Gophers Slack Channel Invite](https://invite.slack.golangbridge.org/)
 - [Github Issues](https://github.com/wailsapp/wails/issues)
- - [v2 Beta Discussion Board](https://github.com/wailsapp/wails/discussions)
+ - [v2 Beta Discussion Board](https://github.com/wailsapp/wails/discussions/828)

 ## Social Media

--- a/website/docs/community/showcase/encrypteasy.mdx
+++ b/website/docs/community/showcase/encrypteasy.mdx
@@ -2,7 +2,7 @@
 # EncryptEasy

 <p style={{"text-align": "center"}}>
-   <img src="encrypteasy.jpg"></img><br/>
+   <img src="/img/showcase/encrypteasy.jpg"></img><br/>
 </p>

 **[EncryptEasy](https://www.encrypteasy.app) is a simple and easy to use PGP encryption tool, managing all your and your contacts keys. Encryption should be simple. Developed with Wails.**
--- a/website/docs/community/showcase/filehound.mdx
+++ b/website/docs/community/showcase/filehound.mdx
@@ -2,7 +2,7 @@
 # FileHound Export Utility

 <p style={{"text-align": "center"}}>
-   <img src="filehound.jpg"></img><br/>
+   <img src="/img/showcase/filehound.jpg"></img><br/>
 </p>


--- a/website/docs/community/showcase/mollywallet.mdx
+++ b/website/docs/community/showcase/mollywallet.mdx
@@ -2,7 +2,7 @@
 # Molley Wallet

 <p style={{"text-align": "center"}}>
-   <img src="mollywallet.png"></img><br/>
+   <img src="/img/showcase/mollywallet.png"></img><br/>
 </p>

 [Molly Wallet](https://github.com/grvlle/constellation_wallet/) the official $DAG wallet of the Constellation Network. It'll let users interact with the Hypergraph Network in various ways, not limited to producing $DAG transactions.
--- a/website/docs/community/showcase/optimus.mdx
+++ b/website/docs/community/showcase/optimus.mdx
@@ -2,7 +2,7 @@
 # Optimus

 <p style={{"text-align": "center"}}>
-   <img src="optimus.png"></img><br/>
+   <img src="/img/showcase/optimus.png"></img><br/>
 </p>

 [Optimus](https://github.com/splode/optimus) is a desktop image optimization application. It supports conversion and compression between WebP, JPEG, and PNG image formats.
--- a/website/docs/community/showcase/portfall.mdx
+++ b/website/docs/community/showcase/portfall.mdx
@@ -2,7 +2,7 @@
 # Portfall

 <p style={{"text-align": "center"}}>
-   <img src="portfall.gif"></img><br/>
+   <img src="/img/showcase/portfall.gif"></img><br/>
 </p>

 [Portfall](https://github.com/rekon-oss/portfall) - A desktop k8s port-forwarding portal for easy access to all your cluster UIs
--- a/website/docs/community/showcase/surge.mdx
+++ b/website/docs/community/showcase/surge.mdx
@@ -2,7 +2,7 @@
 # Surge

 <p style={{"text-align": "center"}}>
-   <img src="surge.png"></img><br/>
+   <img src="/img/showcase/surge.png"></img><br/>
 </p>

 [Surge](https://surge.rule110.io/) is a p2p filesharing app designed to utilize blockchain technologies to enable 100% anonymous file transfers. Surge is end-to-end encrypted, decentralized and open source.
--- a/website/docs/community/showcase/wally.mdx
+++ b/website/docs/community/showcase/wally.mdx
@@ -2,7 +2,7 @@
 # Wally

 <p style={{"text-align": "center"}}>
-   <img src="wally.png"></img><br/>
+   <img src="/img/showcase/wally.png"></img><br/>
 </p>

 [Wally](https://ergodox-ez.com/pages/wally) is the official firmware flasher for [Ergodox](https://ergodox-ez.com/) keyboards. It looks great and is a fantastic example of what you can achieve with Wails: the ability to combine the power of Go and the rich graphical tools of the web development world.
--- a/website/docs/community/showcase/wombat.mdx
+++ b/website/docs/community/showcase/wombat.mdx
@@ -2,7 +2,7 @@
 # Wombat

 <p style={{"text-align": "center"}}>
-   <img src="wombat.png"></img><br/>
+   <img src="/img/showcase/wombat.png"></img><br/>
 </p>


--- a/website/docs/gettingstarted/installation.mdx
+++ b/website/docs/gettingstarted/installation.mdx
@@ -64,7 +64,7 @@ import TabItem from '@theme/TabItem';

 ## Installing Wails

-Run `go get github.com/wailsapp/wails/v2/cmd/wails` to install the Wails CLI.
+Run `go install github.com/wailsapp/wails/v2/cmd/wails@v2.0.0-beta.2` to install the Wails CLI.

 ## System Check

--- a/website/docs/guides/ides.mdx
+++ b/website/docs/guides/ides.mdx
@@ -12,7 +12,7 @@ Currently, we support [Visual Studio Code](https://code.visualstudio.com/) but a
    <img src="/img/vscode.png" style={{"width": "75%"}}></img>
 </p>

-When generating a project using the `-vscode` flag, IDE files will be created alongside the other project files.
+When generating a project using the `-ide vscode` flags, IDE files will be created alongside the other project files.
 These files are placed into the `.vscode` directory and provide the correct configuration for debugging your application.

 The 2 files generated are `tasks.json` and `launch.json`. Below are the files generated for the default vanilla project:
--- a/website/docs/reference/cli.mdx
+++ b/website/docs/reference/cli.mdx
@@ -20,11 +20,11 @@ The Wails CLI has a number of commands that are used for managing your projects.
 |  -l                  | List available project templates       |                            |
 |  -q                  | Suppress output to console             |                            |
 |  -t "template name"  | The project template to use. This can be the name of a default template or a URL to a remote template hosted on github.            | vanilla                    |
-|  -vscode             | Generate VSCode project files          |                            |
+|  -ide             | Generate IDE project files          |                            |
 |  -f                  | Force build application                | false                      |

 Example:
-  `wails init -n test -d mytestproject -g -vscode -q`
+  `wails init -n test -d mytestproject -g -ide vscode -q`

 This will generate a a project called "test" in the "mytestproject" directory, initialise git,
 generate vscode project files and do so silently.
--- a/website/docs/stats.mdx
+++ b/website/docs/stats.mdx
@@ -17,7 +17,7 @@ If you have any concerns or suggestions, please raise them in the projects githu

 export const NewComponent = () => (
        <div>
-            <iframe plausible-embed="true" src="https://plausible.io/share/beta.wails.io?auth=wJa_HtqinG_eosqMjP-T1&embed=true&theme=system" scrolling="no" frameBorder={0} loading="lazy" style={{width: '1px', minWidth: '100%', height: '1600px'}} />
+            <iframe plausible-embed="true" src="https://plausible.io/share/wails.io?auth=Ll6cPlScOwOi_wgwZwMBn&embed=true&theme=system" scrolling="no" frameBorder={0} loading="lazy" style={{width: '1px', minWidth: '100%', height: '1600px'}} />
        </div>
 );

--- a/website/i18n/zh-Hans/docusaurus-plugin-content-blog/2021-09-27-v2-beta1-release-notes.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-blog/2021-09-27-v2-beta1-release-notes.mdx
@@ -28,7 +28,7 @@ Windows 的唯一选择是 IE11 渲染器。许多错误报告都因为受到它
 - 用于控制应用程序窗口的运行时方法
 - 现代化的原生对话框

-Wails v2 代表了该项目的新基础。此版本的目的是获得有关新方式的反馈，并在完整版本发布之前解决所有错误。欢迎提出您的意见。请直接反馈到 [v2 测试版](https://github.com/wailsapp/wails/discussions)讨论板。
+Wails v2 代表了该项目的新基础。此版本的目的是获得有关新方式的反馈，并在完整版本发布之前解决所有错误。欢迎提出您的意见。请直接反馈到 [v2 测试版](https://github.com/wailsapp/wails/discussions/828)讨论板。

 为了达到这一点，经历了许多曲折和坎坷。部分原因是早期的技术决策需要改变，另一部分原因是我们花时间构建的一些核心问题的变通方式已经在上游得到了解决:Go 的 embed 特性就是一个很好的例子。幸运的是，一切都刚刚好，今天我们有了我们所能拥有的最好的解决方案。我相信等待是值得的 - 这在两个月前是完全不可能的。

--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/about.md
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/about.md
@@ -1,5 +1,7 @@
 ---
-title: 关于 sidebar_position: 1
+title: 关于
+
+sidebar_position: 1
 ---

 # 关于
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/links.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/links.mdx
@@ -11,7 +11,7 @@ sidebar_position: 2
 - [Gophers Slack Channel](https://gophers.slack.com/messages/CJ4P9F7MZ/)
 - [Gophers Slack Channel Invite](https://invite.slack.golangbridge.org/)
 - [Github Issues](https://github.com/wailsapp/wails/issues)
- [v2 Beta Discussion Board](https://github.com/wailsapp/wails/discussions)
+- [v2 Beta Discussion Board](https://github.com/wailsapp/wails/discussions/828)

 ## 社交媒体

--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/gettingstarted/installation.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/gettingstarted/installation.mdx
@@ -64,7 +64,7 @@ import TabItem from "@theme/TabItem";

 ## 安装 Wails

-运行 `go get github.com/wailsapp/wails/v2/cmd/wails` 安装 Wails CLI。
+运行 `go install github.com/wailsapp/wails/v2/cmd/wails@v2.0.0-beta.1` 安装 Wails CLI。

 ## 系统检查

--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/cli.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/cli.mdx
@@ -21,11 +21,11 @@ Wails CLI 有许多用于管理项目的命令。所有命令都以此方式运
 | -l                 | 可用项目模板列表                                                    |         |
 | -q                 | 禁止输出到控制台                                                    |         |
 | -t "template name" | 要使用的项目模板。这可能是在 github 上托管的远程模板的 URL 的名称。 | vanilla |
-| -vscode            | 生成 VSCode 项目文件                                                |         |
+| -ide            | 生成 IDE 项目文件                                                |         |
 | -f                 | 强制构建应用                                                        | false   |

 示例：
-`wails init -n test -d mytestproject -g -vscode -q`
+`wails init -n test -d mytestproject -g -ide vscode -q`

 这将在 "mytestproject" 目录生成一个名为 "test" 的项目，初始化 git，生成 vscode 项目文件并静默执行。

--- a/website/docs/community/showcase/encrypteasy.jpg
+++ b/website/docs/community/showcase/encrypteasy.jpg
--- a/website/docs/community/showcase/filehound.jpg
+++ b/website/docs/community/showcase/filehound.jpg
--- a/website/docs/community/showcase/mollywallet.png
+++ b/website/docs/community/showcase/mollywallet.png
--- a/website/docs/community/showcase/optimus.png
+++ b/website/docs/community/showcase/optimus.png
--- a/website/docs/community/showcase/portfall.gif
+++ b/website/docs/community/showcase/portfall.gif
--- a/website/docs/community/showcase/surge.png
+++ b/website/docs/community/showcase/surge.png
--- a/website/docs/community/showcase/wally.png
+++ b/website/docs/community/showcase/wally.png
--- a/website/docs/community/showcase/wombat.png
+++ b/website/docs/community/showcase/wombat.png
Author	SHA1	Message	Date
Lea Anthony	49b1acc147	[v2] v2.0.0-beta.3	2021-09-29 20:24:56 +10:00
Lea Anthony	0ee3015c7d	[website] update IDE flag	2021-09-29 20:19:14 +10:00
Lea Anthony	4aa1464b48	[v2] fix module version in templates. Refactor ide flag	2021-09-29 20:15:26 +10:00
Lea Anthony	7b52995c86	Merge pull request #833 from codydbentley/add-js-to-mimecache Added JS case to mimecache	2021-09-29 18:06:47 +10:00
Cody Bentley	23c1ebfac9	Corrected obsolete 'text/javascript' mime to 'application/javascript'	2021-09-29 01:06:28 -06:00
Cody Bentley	3de31613a1	Added JS case to mimecache	2021-09-29 00:50:49 -06:00
Lea Anthony	9a54f289c4	[v2] v2.0.0-beta.2	2021-09-29 07:25:02 +10:00
Lea Anthony	4a740e6186	[v2] Fix: Remove random C imports	2021-09-28 20:00:42 +10:00
Lea Anthony	34e622455f	[v2] Fix: empty content responses	2021-09-28 19:56:08 +10:00
Lea Anthony	b13d8ef9fa	[mac] Guard browser.go	2021-09-28 19:44:12 +10:00
Lea Anthony	4898bfdf9c	Update release.yml	2021-09-28 06:40:17 +10:00
Lea Anthony	28ff364faa	Update pr.yml	2021-09-28 06:39:39 +10:00
Lea Anthony	f254cb086a	Update latest-pre.yml	2021-09-28 06:32:05 +10:00
Lea Anthony	15615eb450	Merge pull request #830 from LanguageAgnostic/master Fix browser.go - minimum version	2021-09-28 05:55:39 +10:00
Soheib El-Harrache	37987b3827	Fix browser.go Fixed minimum version variable	2021-09-27 15:12:37 -04:00
Lea Anthony	48cf60ac7c	[docs] Fix showcase	2021-09-27 23:59:43 +10:00
Lea Anthony	368195e5bd	[v2] Fix stats page	2021-09-27 22:05:18 +10:00
Lea Anthony	97765c77e5	[v2] Update README	2021-09-27 21:30:57 +10:00
Lea Anthony	962ad1ea81	[v2] Fix weird chinese character bug	2021-09-27 21:26:56 +10:00
Lea Anthony	eba822da0b	[v2] Update discussion board links	2021-09-27 21:22:26 +10:00
Lea Anthony	7b052e7a2d	[v2] Update install guide	2021-09-27 21:19:05 +10:00
Lea Anthony	481eaa5ade	[v2] beta.1	2021-09-27 21:13:54 +10:00
Lea Anthony	cf8e2ee195	Merge branch 'v2-alpha'	2021-09-27 21:06:09 +10:00