Update contributors

* Add support for Crux Linux (http://crux.nu)

* Update linuxdb.yaml

fix typo

* Update linux.go

fixed comment typo

* Update linuxdb.yaml

fixed more typos

Co-authored-by: Lea Anthony <lea.anthony@gmail.com>

CONTRIBUTORS.md

@@ -39,4 +39,7 @@ Wails is what it is because of the time and effort given by these great people.
   * [Kyle](https://github.com/kmuchmore)
   * [Balakrishna Prasad Ganne](https://github.com/aayush420)
   * [Charaf Rezrazi](https://github.com/Rezrazi)
-  * [misitebao](https://github.com/misitebao)
+  * [misitebao](https://github.com/misitebao)
+  * [Elie Grenon](https://github.com/DrunkenPoney)
+  * [SophieAu](https://github.com/SophieAu)
+  * [Alexander Matviychuk](https://github.com/alexmat)

README.md

@@ -147,7 +147,12 @@ This project was mainly coded to the following albums:
 
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_large)
 
-## Special Thank You
+## Special Thanks
+
+<p align="center" style="text-align: center">
+   A *huge* thanks to <a href="https://pace.dev"><img src="pace.jpeg"/> Pace</a> for sponsoring the project and helping the efforts to get Wails ported to Apple Silicon!<br/><br/>
+   If you are looking for a Project Management tool that's powerful but quick and easy to use, check them out!<br/><br/>
+</p>
 
 <p align="center" style="text-align: center">
    A special thank you to JetBrains for donating licenses to us!<br/><br/>

cmd/linux.go

@@ -67,6 +67,8 @@ const (
 	Ctlos
 	// EndeavourOS linux distribution
 	EndeavourOS
+	// Crux linux distribution
+	Crux
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -175,6 +177,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Solus
 	case "endeavouros":
 		result.Distribution = EndeavourOS
+	case "crux":
+		result.Distribution = Crux
 	default:
 		result.Distribution = Unknown
 	}
@@ -255,6 +259,17 @@ func RpmInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
+// PrtGetInstalled uses prt-get to see if a package is installed
+func PrtGetInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	prtget := program.FindProgram("prt-get")
+	if prtget == nil {
+		return false, fmt.Errorf("cannot check dependencies: prt-get not found")
+	}
+	_, _, exitCode, _ := prtget.Run("isinst", packageName)
+	return exitCode == 0, nil
+}
+
 // RequestSupportForDistribution promts the user to submit a request to support their
 // currently unsupported distribution
 func RequestSupportForDistribution(distroInfo *DistroInfo) error {

cmd/linuxdb.yaml

@@ -307,3 +307,22 @@ distributions:
           gccversioncommand: *gccdumpfullversion
           programs: *opensusedefaultprograms
           libraries: *opensusedefaultlibraries
+  crux:
+      id: crux
+      releases:
+        default:
+          version: default
+          name: Crux Linux
+          gccversioncommand: *gccdumpversion
+          programs:
+            - name: gcc
+              help: Please install with `sudo prt-get depinst gcc-c++ make` and try again
+            - name: pkg-config
+              help: Please install with `sudo prt-get depinst pkg-config` and try again
+            - name: npm
+              help: Please install with `sudo prt-get depinst nodejs` and try again
+          libraries:
+            - name: gtk3
+              help: Please install with `sudo prt-get depinst gtk3` and try again
+            - name: webkitgtk
+              help: Please install with `sudo prt-get depinst webkitgtk` and try again

cmd/semver.go

@@ -24,11 +24,19 @@ func NewSemanticVersion(version string) (*SemanticVersion, error) {
 
 // IsRelease returns true if it's a release version
 func (s *SemanticVersion) IsRelease() bool {
+	// Limit to v1
+	if s.Version.Major() != 1 {
+		return false
+	}
 	return len(s.Version.Prerelease()) == 0 && len(s.Version.Metadata()) == 0
 }
 
 // IsPreRelease returns true if it's a prerelease version
 func (s *SemanticVersion) IsPreRelease() bool {
+	// Limit to v1
+	if s.Version.Major() != 1 {
+		return false
+	}
 	return len(s.Version.Prerelease()) > 0
 }
 

cmd/semver_test.go

@@ -0,0 +1,65 @@
+package cmd
+
+import (
+	"testing"
+)
+
+func TestSemanticVersion_IsPreRelease(t *testing.T) {
+	tests := []struct {
+		name    string
+		version string
+		want    bool
+	}{
+		{"v1.6.7-pre0", "v1.6.7-pre0", true},
+		{"v2.6.7+pre0", "v2.6.7+pre0", false},
+		{"v2.6.7", "v2.6.7", false},
+		{"v2.0.0+alpha.1", "v2.0.0+alpha.1", false},
+		{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
+		{"v1.6.7", "v1.6.7", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			semanticversion, err := NewSemanticVersion(tt.version)
+			if err != nil {
+				t.Errorf("Invalid semantic version: %s", semanticversion)
+				return
+			}
+			s := &SemanticVersion{
+				Version: semanticversion.Version,
+			}
+			if got := s.IsPreRelease(); got != tt.want {
+				t.Errorf("IsPreRelease() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestSemanticVersion_IsRelease(t *testing.T) {
+	tests := []struct {
+		name    string
+		version string
+		want    bool
+	}{
+		{"v1.6.7", "v1.6.7", true},
+		{"v2.6.7-pre0", "v2.6.7-pre0", false},
+		{"v2.6.7", "v2.6.7", false},
+		{"v2.6.7+release", "v2.6.7+release", false},
+		{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
+		{"v1.6.7-pre0", "v1.6.7-pre0", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			semanticversion, err := NewSemanticVersion(tt.version)
+			if err != nil {
+				t.Errorf("Invalid semantic version: %s", semanticversion)
+				return
+			}
+			s := &SemanticVersion{
+				Version: semanticversion.Version,
+			}
+			if got := s.IsRelease(); got != tt.want {
+				t.Errorf("IsRelease() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

cmd/system.go

@@ -286,6 +286,8 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = XbpsInstalled
 		case Solus:
 			libraryChecker = EOpkgInstalled
+		case Crux:
+			libraryChecker = PrtGetInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}

cmd/templates/svelte/frontend/rollup.config.js

@@ -80,7 +80,6 @@ export default {
 				{
 				  targets: '> 0.25%, not dead, IE 11',
 				  modules: false,
-				  spec: true, 
 				  useBuiltIns: 'usage',
 				  forceAllTransforms: true,
 				  corejs: 3,

cmd/templates/vue3-full/frontend/package.json.template

@@ -19,16 +19,16 @@
     "@types/mocha": "^8.0.3",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
-    "@vue/cli-plugin-eslint": "~4.5.6",
+    "@vue/cli-plugin-eslint": "~4.5.9",
-    "@vue/cli-plugin-router": "~4.5.6",
+    "@vue/cli-plugin-router": "~4.5.9",
-    "@vue/cli-plugin-typescript": "~4.5.6",
+    "@vue/cli-plugin-typescript": "~4.5.9",
-    "@vue/cli-plugin-unit-mocha": "~4.5.6",
+    "@vue/cli-plugin-unit-mocha": "~4.5.9",
-    "@vue/cli-service": "~4.5.6",
+    "@vue/cli-service": "~4.5.9",
     "@vue/compiler-sfc": "^3.0.0",
-    "@vue/eslint-config-typescript": "^5.1.0",
+    "@vue/eslint-config-typescript": "^7.0.0",
     "@vue/test-utils": "^2.0.0-0",
     "chai": "^4.2.0",
-    "eslint": "^7.10.0",
+    "eslint": "<7.0.0",
     "eslint-plugin-vue": "^7.0.0",
     "node-sass": "^4.14.1",
     "sass-loader": "^10.0.2",

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.10.0"
+const Version = "v1.12.0-pre4"

config.go

@@ -1,7 +1,6 @@
 package wails
 
 import (
-	"fmt"
 	"net/url"
 	"strings"
 
@@ -140,10 +139,6 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		}
 	}
 
-	println("****************************************************")
-	fmt.Printf("%+v\n", result)
-	println("****************************************************")
-
 	return result, nil
 }
 

lib/event/manager.go

@@ -18,6 +18,7 @@ type Manager struct {
 	log            *logger.CustomLogger
 	renderer       interfaces.Renderer // Messages will be dispatched to the frontend
 	wg             sync.WaitGroup
+	mu             sync.Mutex
 }
 
 // NewManager creates a new event manager with a 100 event buffer
@@ -42,12 +43,12 @@ func (e *Manager) PushEvent(eventData *messages.EventData) {
 // means it does not expire (default).
 type eventListener struct {
 	callback func(...interface{}) // Function to call with emitted event data
-	counter  int                  // Expire after counter callbacks. 0 = infinite
+	counter  uint                 // Expire after counter callbacks. 0 = infinite
 	expired  bool                 // Indicates if the listener has expired
 }
 
 // Creates a new event listener from the given callback function
-func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter int) error {
+func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter uint) error {
 
 	// Sanity check inputs
 	if callback == nil {
@@ -75,7 +76,30 @@ func (e *Manager) addEventListener(eventName string, callback func(...interface{
 // On adds a listener for the given event
 func (e *Manager) On(eventName string, callback func(...interface{})) {
 	// Add a persistent eventListener (counter = 0)
-	e.addEventListener(eventName, callback, 0)
+	err := e.addEventListener(eventName, callback, 0)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
+}
+
+// Once adds a listener for the given event that will auto remove
+// after one callback
+func (e *Manager) Once(eventName string, callback func(...interface{})) {
+	// Add a persistent eventListener (counter = 0)
+	err := e.addEventListener(eventName, callback, 1)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
+}
+
+// OnMultiple adds a listener for the given event that will trigger
+// at most <counter> times.
+func (e *Manager) OnMultiple(eventName string, callback func(...interface{}), counter uint) {
+	// Add a persistent eventListener (counter = 0)
+	err := e.addEventListener(eventName, callback, counter)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
 }
 
 // Emit broadcasts the given event to the subscribed listeners
@@ -108,20 +132,24 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 				})
 
 				// Notify renderer
-				e.renderer.NotifyEvent(event)
+				err := e.renderer.NotifyEvent(event)
+				if err != nil {
+					e.log.Error(err.Error())
+				}
 
-				// Notify Go listeners
+				e.mu.Lock()
-				var listenersToRemove []*eventListener
 
 				// Iterate listeners
 				for _, listener := range e.listeners[event.Name] {
 
-					// Call listener, perhaps with data
+					if !listener.expired {
-					if event.Data == nil {
+						// Call listener, perhaps with data
-						go listener.callback()
+						if event.Data == nil {
-					} else {
+							go listener.callback()
-						unpacked := event.Data.([]interface{})
+						} else {
-						go listener.callback(unpacked...)
+							unpacked := event.Data.([]interface{})
+							go listener.callback(unpacked...)
+						}
 					}
 
 					// Update listen counter
@@ -133,15 +161,8 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 					}
 				}
 
-				// Remove expired listeners in place
+				e.mu.Unlock()
-				if len(listenersToRemove) > 0 {
+
-					listeners := e.listeners[event.Name][:0]
-					for _, listener := range listeners {
-						if !listener.expired {
-							listeners = append(listeners, listener)
-						}
-					}
-				}
 			case <-e.quitChannel:
 				e.running = false
 			}

lib/interfaces/eventmanager.go

@@ -6,6 +6,8 @@ import "github.com/wailsapp/wails/lib/messages"
 type EventManager interface {
 	PushEvent(*messages.EventData)
 	Emit(eventName string, optionalData ...interface{})
+	OnMultiple(eventName string, callback func(...interface{}), counter uint)
+	Once(eventName string, callback func(...interface{}))
 	On(eventName string, callback func(...interface{}))
 	Start(Renderer)
 	Shutdown()

lib/renderer/webview/webview.go

@@ -353,7 +353,9 @@ func _webviewDispatchGoCallback(index unsafe.Pointer) {
 	f = fns[uintptr(index)]
 	delete(fns, uintptr(index))
 	m.Unlock()
-	f()
+	if f != nil {
+		f()
+	}
 }
 
 //export _webviewExternalInvokeCallback
@@ -369,5 +371,7 @@ func _webviewExternalInvokeCallback(w unsafe.Pointer, data unsafe.Pointer) {
 		}
 	}
 	m.Unlock()
-	cb(wv, C.GoString((*C.char)(data)))
+	if cb != nil {
+		cb(wv, C.GoString((*C.char)(data)))
+	}
 }

lib/renderer/webview/webview.h

@@ -364,6 +364,7 @@ struct webview_priv
           webkit_web_view_get_settings(WEBKIT_WEB_VIEW(w->priv.webview));
       webkit_settings_set_enable_write_console_messages_to_stdout(settings, true);
       webkit_settings_set_enable_developer_extras(settings, true);
+      webkit_settings_set_hardware_acceleration_policy(settings, WEBKIT_HARDWARE_ACCELERATION_POLICY_ALWAYS);
     }
     else
     {

runtime/events.go

@@ -19,6 +19,16 @@ func (r *Events) On(eventName string, callback func(optionalData ...interface{})
 	r.eventManager.On(eventName, callback)
 }
 
+// Once pass through
+func (r *Events) Once(eventName string, callback func(optionalData ...interface{})) {
+	r.eventManager.Once(eventName, callback)
+}
+
+// OnMultiple pass through
+func (r *Events) OnMultiple(eventName string, callback func(optionalData ...interface{}), counter uint) {
+	r.eventManager.OnMultiple(eventName, callback, counter)
+}
+
 // Emit pass through
 func (r *Events) Emit(eventName string, optionalData ...interface{}) {
 	r.eventManager.Emit(eventName, optionalData...)

runtime/js/package-lock.json

@@ -3959,9 +3959,9 @@
       "dev": true
     },
     "ini": {
-      "version": "1.3.5",
+      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
     "interpret": {

runtime/js/runtime/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@wailsapp/runtime",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -130,9 +130,9 @@
       "dev": true
     },
     "ini": {
-      "version": "1.3.5",
+      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
     "invert-kv": {