Revert "v2.0.0-beta.23"

This reverts commit fa380105f4.

README.md

@@ -107,8 +107,8 @@ Click [here](https://wails.io) if you are interested in trying out v2 Beta for W
 This project is supported by these kind people / companies:
 
 <p align="center">
-  <a href="https://www.easywebadv.it/" style="width:150px;">
+  <a href="https://www.easywebadv.it/" style="width:100px;">
-    <img src="website/static/img/easyweb.png" width="150"/>
+    <img src="website/static/img/easyweb.png" width="100"/>
   </a>
 </p>
 <br/>
@@ -195,9 +195,6 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/taigrr" style="width:45px">
   <img src="https://github.com/taigrr.png?size=45" width="45"/>
 </a>
-<a href="https://github.com/charlie-dee" style="width:55px">
-  <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
-</a>
 
 <span id="nav-6"></span>
 

README.zh-Hans.md

@@ -111,7 +111,7 @@
 
 <p align="center">
   <a href="https://www.easywebadv.it/" style="width:100px;">
-    <img src="website/static/img/easyweb.png" width="120"/>
+    <img src="website/static/img/easyweb.png" width="100"/>
   </a>
 </p>
 <br/>
@@ -198,9 +198,6 @@
 <a href="https://github.com/taigrr" style="width:45px">
   <img src="https://github.com/taigrr.png?size=45" width="45"/>
 </a>
-<a href="https://github.com/charlie-dee" style="width:55px">
-  <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
-</a>
 
 <span id="nav-6"></span>
 

v2/cmd/wails/internal/commands/build/build.go

@@ -38,9 +38,6 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	compilerCommand := "go"
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
 
-	skipModTidy := false
-	command.BoolFlag("m", "Skip mod tidy before compile", &skipModTidy)
-
 	compress := false
 	command.BoolFlag("upx", "Compress final binary with UPX (if installed)", &compress)
 
@@ -170,7 +167,6 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			Pack:                !noPackage,
 			LDFlags:             ldflags,
 			Compiler:            compilerCommand,
-			SkipModTidy:         skipModTidy,
 			Verbosity:           verbosity,
 			ForceBuild:          forceBuild,
 			IgnoreFrontend:      skipFrontend,

v2/cmd/wails/internal/version.go

@@ -1,3 +1,3 @@
 package internal
 
-var Version = "v2.0.0-beta.23"
+var Version = "v2.0.0-beta.22"

v2/internal/frontend/desktop/darwin/WailsContext.h

@@ -12,7 +12,6 @@
 #import <WebKit/WebKit.h>
 
 #if __has_include(<UniformTypeIdentifiers/UTType.h>)
-#define USE_NEW_FILTERS
 #import <UniformTypeIdentifiers/UTType.h>
 #endif
 

v2/internal/frontend/desktop/darwin/WailsContext.m

@@ -500,14 +500,10 @@
 #ifdef USE_NEW_FILTERS
                 NSMutableArray *contentTypes = [[NSMutableArray new] autorelease];
                 for (NSString *filter in filterList) {
-                    if (@available(macOS 11.0, *)) {
+                    UTType *t = [UTType typeWithFilenameExtension:filter];
-                        UTType *t = [UTType typeWithFilenameExtension:filter];
+                    [contentTypes addObject:t];
-                        [contentTypes addObject:t];
-                    }
                 }
-            if (@available(macOS 11.0, *)) {
                 [dialog setAllowedContentTypes:contentTypes];
-            }
 #else
                 [dialog setAllowedFileTypes:filterList];
 #endif
@@ -566,7 +562,7 @@
     }
 
     // Filters - semicolon delimited list of file extensions
-    if( filters != nil && [filters length] > 0) {
+    if( filters != nil ) {
         filters = [filters stringByReplacingOccurrencesOfString:@"*." withString:@""];
         filters = [filters stringByReplacingOccurrencesOfString:@" " withString:@""];
         NSArray *filterList = [filters componentsSeparatedByString:@";"];

v2/internal/frontend/desktop/darwin/main.m

@@ -32,8 +32,7 @@ void processCallback(int callbackID) {
 void processURLRequest(void *ctx, const char* url) {
     NSLog(@"processURLRequest called");
     const char myByteArray[] = { 0x3c,0x68,0x31,0x3e,0x48,0x65,0x6c,0x6c,0x6f,0x20,0x57,0x6f,0x72,0x6c,0x64,0x21,0x3c,0x2f,0x68,0x31,0x3e };
-    // void *inctx, const char *url, int statusCode, const char *contentType, void* data, int datalength
+    ProcessURLResponse(ctx, url, "text/html", (void*)myByteArray, 21);
-    ProcessURLResponse(ctx, url, 200, "text/html", (void*)myByteArray, 21);
 }
 
 unsigned char _Users_username_Pictures_SaltBae_png[] = {

v2/pkg/commands/build/base.go

@@ -3,15 +3,13 @@ package build
 import (
 	"bytes"
 	"fmt"
+	"github.com/wailsapp/wails/v2/internal/system"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"strconv"
 	"strings"
 
-	"github.com/wailsapp/wails/v2/internal/system"
-
 	"github.com/leaanthony/gosod"
 	wailsRuntime "github.com/wailsapp/wails/v2/internal/frontend/runtime"
 	"github.com/wailsapp/wails/v2/internal/frontend/runtime/wrapper"
@@ -198,17 +196,15 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 
 	verbose := options.Verbosity == VERBOSE
 	// Run go mod tidy first
-	if !options.SkipModTidy {
+	cmd := exec.Command(options.Compiler, "mod", "tidy")
-		cmd := exec.Command(options.Compiler, "mod", "tidy")
+	cmd.Stderr = os.Stderr
-		cmd.Stderr = os.Stderr
+	if verbose {
-		if verbose {
+		println("")
-			println("")
+		cmd.Stdout = os.Stdout
-			cmd.Stdout = os.Stdout
+	}
-		}
+	err = cmd.Run()
-		err = cmd.Run()
+	if err != nil {
-		if err != nil {
+		return err
-			return err
-		}
 	}
 
 	// Default go build command
@@ -282,7 +278,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 	options.CompiledBinary = compiledBinary
 
 	// Create the command
-	cmd := exec.Command(options.Compiler, commands.AsSlice()...)
+	cmd = exec.Command(options.Compiler, commands.AsSlice()...)
 	cmd.Stderr = os.Stderr
 	if verbose {
 		println("  Build command:", commands.Join(" "))
@@ -324,18 +320,13 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 			return "1"
 		})
 		if options.Platform == "darwin" {
-			// Determine version so we can link to newer frameworks
+			// Determine verison
-			// Why doesn't CGO have this option?!?!
 			info, err := system.GetInfo()
 			if err != nil {
 				return err
 			}
 			versionSplit := strings.Split(info.OS.Version, ".")
-			majorVersion, err := strconv.Atoi(versionSplit[0])
+			addUTIFramework := versionSplit[0] == "11"
-			if err != nil {
-				return err
-			}
-			addUTIFramework := majorVersion >= 11
 			// Set the minimum Mac SDK to 10.13
 			cmd.Env = upsertEnv(cmd.Env, "CGO_LDFLAGS", func(v string) string {
 				if v != "" {

v2/pkg/commands/build/build.go

@@ -37,7 +37,6 @@ type Options struct {
 	Platform            string               // The platform to build for
 	Arch                string               // The architecture to build for
 	Compiler            string               // The compiler command to use
-	SkipModTidy         bool                 //  Skip mod tidy before compile
 	IgnoreFrontend      bool                 // Indicates if the frontend does not need building
 	OutputFile          string               // Override the output filename
 	BuildDirectory      string               // Directory to use for building the application

website/docs/community/showcase/riftshare.mdx

@@ -1,19 +0,0 @@
-
-# RiftShare
-
-<p style={{"text-align": "center"}}>
-   <img src="/img/showcase/riftshare-main.webp"></img><br/>
-</p>
-
-Easy, Secure, and Free file sharing for everyone. Learn more at [Riftshare.app](https://riftshare.app)
-
-## Features
-
-* Easy secure file sharing between computers both in the local network and through the internet
-* Supports sending files or directories securely through the [magic wormhole protocol](https://magic-wormhole.readthedocs.io/en/latest/)
-* Compatible with all other apps using magic wormhole (magic-wormhole or wormhole-william CLI, wormhole-gui, etc.)
-* Automatic zipping of multiple selected files to send at once
-* Full animations, progress bar, and cancellation support for sending and receiving
-* Native OS File Selection
-* Open files in one click once received
-* Auto Update - don't worry about having the latest release!

website/docs/credits.mdx

@@ -16,7 +16,7 @@ sidebar_position: 99
     __html: `
 <p align="center">
   <a href="https://www.easywebadv.it/" style="width:100px;">
-    <img src="/img/easyweb.png" width="200"/>
+    <img src="/img/easyweb.png" width="100"/>
   </a>
 </p>
 <br/>
@@ -103,9 +103,6 @@ sidebar_position: 99
 <a href="https://github.com/taigrr" style="width:45px">
   <img src="https://github.com/taigrr.png?size=45" width="45"/>
 </a>
-<a href="https://github.com/charlie-dee" style="width:55px">
-  <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
-</a>
 `,
   }}
 />

website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/credits.mdx

@@ -96,9 +96,6 @@ sidebar_position: 99
 <a href="https://github.com/taigrr" style="width:45px">
   <img src="https://github.com/taigrr.png?size=45" width="45"/>
 </a>
-<a href="https://github.com/charlie-dee" style="width:55px">
-  <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
-</a>
 `,
   }}
 />