Remove all systray related for v2. (#2329)

Possible fix for #2265. Close systray separately after the application ran.

v2/examples/systray/.gitignore

@@ -1,3 +0,0 @@
-build/bin
-node_modules
-frontend/wailsjs

v2/examples/systray/README.md

@@ -1,17 +0,0 @@
-# System Tray
-
-This example shows how to create a system tray using an experimental programmatic API.
-
-## Running
-
-As this example outputs text to the console, it is recommended to build using `wails build -debug`.
-
-## Supported Platforms
-
-- [x] Windows
-- [ ] macOS
-- [ ] Linux
-
-
-
-

v2/examples/systray/build/darwin/Info.plist

@@ -1,27 +0,0 @@
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleName</key>
-        <string>{{.Info.ProductName}}</string>
-        <key>CFBundleExecutable</key>
-        <string>{{.Name}}</string>
-        <key>CFBundleIdentifier</key>
-        <string>com.wails.{{.Name}}</string>
-        <key>CFBundleVersion</key>
-        <string>{{.Info.ProductVersion}}</string>
-        <key>CFBundleGetInfoString</key>
-        <string>{{.Info.Comments}}</string>
-        <key>CFBundleShortVersionString</key>
-        <string>{{.Info.ProductVersion}}</string>
-        <key>CFBundleIconFile</key>
-        <string>iconfile</string>
-        <key>LSMinimumSystemVersion</key>
-        <string>10.13.0</string>
-        <key>NSHighResolutionCapable</key>
-        <string>true</string>
-        <key>NSHumanReadableCopyright</key>
-        <string>{{.Info.Copyright}}</string>
-    </dict>
-</plist>

v2/examples/systray/build/windows/info.json

@@ -1,15 +0,0 @@
-{
-  "fixed": {
-    "file_version": "{{.Info.ProductVersion}}"
-  },
-  "info": {
-    "0000": {
-      "ProductVersion": "{{.Info.ProductVersion}}",
-      "CompanyName": "{{.Info.CompanyName}}",
-      "FileDescription": "{{.Info.ProductName}}",
-      "LegalCopyright": "{{.Info.Copyright}}",
-      "ProductName": "{{.Info.ProductName}}",
-      "Comments": "{{.Info.Comments}}"
-    }
-  }
-}

v2/examples/systray/build/windows/installer/project.nsi

@@ -1,101 +0,0 @@
-Unicode true
-
-####
-## Please note: Template replacements don't work in this file. They are provided with default defines like
-## mentioned underneath.
-## If the keyword is not defined, "wails_tools.nsh" will populate them with the values from ProjectInfo. 
-## If they are defined here, "wails_tools.nsh" will not touch them. This allows to use this project.nsi manually 
-## from outside of Wails for debugging and development of the installer.
-## 
-## For development first make a wails nsis build to populate the "wails_tools.nsh":
-## > wails build --target windows/amd64 --nsis
-## Then you can call makensis on this file with specifying the path to your binary:
-## For a AMD64 only installer:
-## > makensis -DARG_WAILS_AMD64_BINARY=..\..\bin\app.exe
-## For a ARM64 only installer:
-## > makensis -DARG_WAILS_ARM64_BINARY=..\..\bin\app.exe
-## For a installer with both architectures:
-## > makensis -DARG_WAILS_AMD64_BINARY=..\..\bin\app-amd64.exe -DARG_WAILS_ARM64_BINARY=..\..\bin\app-arm64.exe
-####
-## The following information is taken from the ProjectInfo file, but they can be overwritten here. 
-####
-## !define INFO_PROJECTNAME    "MyProject" # Default "{{.Name}}"
-## !define INFO_COMPANYNAME    "MyCompany" # Default "{{.Info.CompanyName}}"
-## !define INFO_PRODUCTNAME    "MyProduct" # Default "{{.Info.ProductName}}"
-## !define INFO_PRODUCTVERSION "1.0.0"     # Default "{{.Info.ProductVersion}}"
-## !define INFO_COPYRIGHT      "Copyright" # Default "{{.Info.Copyright}}"
-###
-## !define PRODUCT_EXECUTABLE  "Application.exe"      # Default "${INFO_PROJECTNAME}.exe"
-## !define UNINST_KEY_NAME     "UninstKeyInRegistry"  # Default "${INFO_COMPANYNAME}${INFO_PRODUCTNAME}"
-####
-## !define REQUEST_EXECUTION_LEVEL "admin"            # Default "admin"  see also https://nsis.sourceforge.io/Docs/Chapter4.html
-####
-## Include the wails tools
-####
-!include "wails_tools.nsh"
-
-# The version information for this two must consist of 4 parts
-VIProductVersion "${INFO_PRODUCTVERSION}.0"
-VIFileVersion    "${INFO_PRODUCTVERSION}.0"
-
-VIAddVersionKey "CompanyName"     "${INFO_COMPANYNAME}"
-VIAddVersionKey "FileDescription" "${INFO_PRODUCTNAME} Installer"
-VIAddVersionKey "ProductVersion"  "${INFO_PRODUCTVERSION}"
-VIAddVersionKey "FileVersion"     "${INFO_PRODUCTVERSION}"
-VIAddVersionKey "LegalCopyright"  "${INFO_COPYRIGHT}"
-VIAddVersionKey "ProductName"     "${INFO_PRODUCTNAME}"
-
-!include "MUI.nsh"
-
-!define MUI_ICON "..\icon.ico"
-!define MUI_UNICON "..\icon.ico"
-# !define MUI_WELCOMEFINISHPAGE_BITMAP "resources\leftimage.bmp" #Include this to add a bitmap on the left side of the Welcome Page. Must be a size of 164x314
-!define MUI_FINISHPAGE_NOAUTOCLOSE # Wait on the INSTFILES page so the user can take a look into the details of the installation steps
-!define MUI_ABORTWARNING # This will warn the user if they exit from the installer.
-
-!insertmacro MUI_PAGE_WELCOME # Welcome to the installer page.
-# !insertmacro MUI_PAGE_LICENSE "resources\eula.txt" # Adds a EULA page to the installer
-!insertmacro MUI_PAGE_DIRECTORY # In which folder install page.
-!insertmacro MUI_PAGE_INSTFILES # Installing page.
-!insertmacro MUI_PAGE_FINISH # Finished installation page.
-
-!insertmacro MUI_UNPAGE_INSTFILES # Uinstalling page
-
-!insertmacro MUI_LANGUAGE "English" # Set the Language of the installer
-
-## The following two statements can be used to sign the installer and the uninstaller. The path to the binaries are provided in %1
-#!uninstfinalize 'signtool --file "%1"'
-#!finalize 'signtool --file "%1"'
-
-Name "${INFO_PRODUCTNAME}"
-OutFile "..\..\bin\${INFO_PROJECTNAME}-${ARCH}-installer.exe" # Name of the installer's file.
-InstallDir "$PROGRAMFILES64\${INFO_COMPANYNAME}\${INFO_PRODUCTNAME}" # Default installing folder ($PROGRAMFILES is Program Files folder).
-ShowInstDetails show # This will always show the installation details.
-
-Function .onInit
-   !insertmacro wails.checkArchitecture
-FunctionEnd
-
-Section
-    !insertmacro wails.webview2runtime
-
-    SetOutPath $INSTDIR
-    
-    !insertmacro wails.files
-
-    CreateShortcut "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}"
-    CreateShortCut "$DESKTOP\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}"
-
-    !insertmacro wails.writeUninstaller
-SectionEnd
-
-Section "uninstall" 
-    RMDir /r "$AppData\${PRODUCT_EXECUTABLE}" # Remove the WebView2 DataPath
-
-    RMDir /r $INSTDIR
-
-    Delete "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk"
-    Delete "$DESKTOP\${INFO_PRODUCTNAME}.lnk"
-
-    !insertmacro wails.deleteUninstaller
-SectionEnd

v2/examples/systray/build/windows/installer/wails_tools.nsh

@@ -1,171 +0,0 @@
-# DO NOT EDIT - Generated automatically by `wails build`
-
-!include "x64.nsh"
-!include "WinVer.nsh"
-!include "FileFunc.nsh"
-
-!ifndef INFO_PROJECTNAME
-    !define INFO_PROJECTNAME "{{.Name}}"
-!endif
-!ifndef INFO_COMPANYNAME
-    !define INFO_COMPANYNAME "{{.Info.CompanyName}}"
-!endif
-!ifndef INFO_PRODUCTNAME
-    !define INFO_PRODUCTNAME "{{.Info.ProductName}}"
-!endif
-!ifndef INFO_PRODUCTVERSION
-    !define INFO_PRODUCTVERSION "{{.Info.ProductVersion}}"
-!endif
-!ifndef INFO_COPYRIGHT
-    !define INFO_COPYRIGHT "{{.Info.Copyright}}"
-!endif
-!ifndef PRODUCT_EXECUTABLE
-    !define PRODUCT_EXECUTABLE "${INFO_PROJECTNAME}.exe"
-!endif
-!ifndef UNINST_KEY_NAME
-    !define UNINST_KEY_NAME "${INFO_COMPANYNAME}${INFO_PRODUCTNAME}"
-!endif
-!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINST_KEY_NAME}"
-
-!ifndef REQUEST_EXECUTION_LEVEL
-    !define REQUEST_EXECUTION_LEVEL "admin"
-!endif
-
-RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}"
-
-!ifdef ARG_WAILS_AMD64_BINARY
-    !define SUPPORTS_AMD64
-!endif
-
-!ifdef ARG_WAILS_ARM64_BINARY
-    !define SUPPORTS_ARM64
-!endif
-
-!ifdef SUPPORTS_AMD64
-    !ifdef SUPPORTS_ARM64
-        !define ARCH "amd64_arm64"
-    !else
-        !define ARCH "amd64"
-    !endif
-!else
-    !ifdef SUPPORTS_ARM64
-        !define ARCH "arm64"
-    !else
-        !error "Wails: Undefined ARCH, please provide at least one of ARG_WAILS_AMD64_BINARY or ARG_WAILS_ARM64_BINARY"
-    !endif
-!endif
-
-!macro wails.checkArchitecture
-    !ifndef WAILS_WIN10_REQUIRED
-        !define WAILS_WIN10_REQUIRED "This product is only supported on Windows 10 (Server 2016) and later."
-    !endif
-
-    !ifndef WAILS_ARCHITECTURE_NOT_SUPPORTED
-        !define WAILS_ARCHITECTURE_NOT_SUPPORTED "This product can't be installed on the current Windows architecture. Supports: ${ARCH}"
-    !endif
-
-    ${If} ${AtLeastWin10}
-        !ifdef SUPPORTS_AMD64
-            ${if} ${IsNativeAMD64}
-                Goto ok
-            ${EndIf}
-        !endif
-
-        !ifdef SUPPORTS_ARM64
-            ${if} ${IsNativeARM64}
-                Goto ok
-            ${EndIf}
-        !endif
-
-        IfSilent silentArch notSilentArch
-        silentArch:
-            SetErrorLevel 65
-            Abort
-        notSilentArch:
-            MessageBox MB_OK "${WAILS_ARCHITECTURE_NOT_SUPPORTED}"
-            Quit
-    ${else}
-        IfSilent silentWin notSilentWin
-        silentWin:
-            SetErrorLevel 64
-            Abort
-        notSilentWin:
-            MessageBox MB_OK "${WAILS_WIN10_REQUIRED}"
-            Quit
-    ${EndIf}
-
-    ok:
-!macroend
-
-!macro wails.files
-    !ifdef SUPPORTS_AMD64
-        ${if} ${IsNativeAMD64}
-            File "/oname=${PRODUCT_EXECUTABLE}" "${ARG_WAILS_AMD64_BINARY}"
-        ${EndIf}
-    !endif
-
-    !ifdef SUPPORTS_ARM64
-        ${if} ${IsNativeARM64}
-            File "/oname=${PRODUCT_EXECUTABLE}" "${ARG_WAILS_ARM64_BINARY}"
-        ${EndIf}
-    !endif
-!macroend
-
-!macro wails.writeUninstaller
-    WriteUninstaller "$INSTDIR\uninstall.exe"
-
-    SetRegView 64
-    WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "${INFO_COMPANYNAME}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "${INFO_PRODUCTNAME}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${INFO_PRODUCTVERSION}"
-    WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXECUTABLE}"
-    WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
-    WriteRegStr HKLM "${UNINST_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
-
-    ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
-    IntFmt $0 "0x%08X" $0
-    WriteRegDWORD HKLM "${UNINST_KEY}" "EstimatedSize" "$0"
-!macroend
-
-!macro wails.deleteUninstaller
-    Delete "$INSTDIR\uninstall.exe"
-
-    SetRegView 64
-    DeleteRegKey HKLM "${UNINST_KEY}"
-!macroend
-
-# Install webview2 by launching the bootstrapper
-# See https://docs.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#online-only-deployment
-!macro wails.webview2runtime
-    !ifndef WAILS_INSTALL_WEBVIEW_DETAILPRINT
-        !define WAILS_INSTALL_WEBVIEW_DETAILPRINT "Installing: WebView2 Runtime"
-    !endif
-
-    SetRegView 64
-	# If the admin key exists and is not empty then webview2 is already installed
-	ReadRegStr $0 HKLM "SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" "pv"
-    ${If} $0 != ""
-        Goto ok
-    ${EndIf}
-
-    ${If} ${REQUEST_EXECUTION_LEVEL} == "user"
-        # If the installer is run in user level, check the user specific key exists and is not empty then webview2 is already installed
-	    ReadRegStr $0 HKCU "Software\Microsoft\EdgeUpdate\Clients{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" "pv"
-        ${If} $0 != ""
-            Goto ok
-        ${EndIf}
-     ${EndIf}
-    
-	SetDetailsPrint both
-    DetailPrint "${WAILS_INSTALL_WEBVIEW_DETAILPRINT}"
-    SetDetailsPrint listonly
-    
-    InitPluginsDir
-    CreateDirectory "$pluginsdir\webview2bootstrapper"
-    SetOutPath "$pluginsdir\webview2bootstrapper"
-    File "tmp\MicrosoftEdgeWebview2Setup.exe"
-    ExecWait '"$pluginsdir\webview2bootstrapper\MicrosoftEdgeWebview2Setup.exe" /silent /install'
-    
-    SetDetailsPrint both
-    ok:
-!macroend

v2/examples/systray/build/windows/wails.exe.manifest

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="com.wails.{{.Name}}" version="{{.Info.ProductVersion}}.0" processorArchitecture="*"/>
-    <dependency>
-        <dependentAssembly>
-            <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
-        </dependentAssembly>
-    </dependency>
-    <asmv3:application>
-        <asmv3:windowsSettings>
-            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware> <!-- fallback for Windows 7 and 8 -->
-            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitorv2,permonitor</dpiAwareness> <!-- falls back to per-monitor if per-monitor v2 is not supported -->
-        </asmv3:windowsSettings>
-    </asmv3:application>
-</assembly>

v2/examples/systray/frontend/index.html

@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8"/>
-    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
-    <title>Systray Example</title>
-    <style>
-        html {
-            background-color: rgba(27, 38, 54, 0.75);
-            text-align: center;
-            color: white;
-        }
-
-
-        @font-face {
-            font-family: "Nunito";
-            font-style: normal;
-            font-weight: 400;
-            src: local(""),
-            url("../../common/fonts/nunito-v16-latin-regular.woff2") format("woff2");
-        }
-
-        body {
-            margin: 0;
-            color: white;
-            font-family: "Nunito", sans-serif;
-        }
-
-        .logo {
-            display: block;
-            width: 50%;
-            height: 50%;
-            background-position: center;
-            background-repeat: no-repeat;
-            background-image: url("../../common/images/logo-universal.png");
-            background-size: 100% 100%;
-            background-origin: content-box;
-        }
-
-        #app {
-            height: 100vh;
-            text-align: center;
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-content: center;
-            align-items: center;
-        }
-
-
-    </style>
-</head>
-<body>
-<div id="app">
-    <div class="logo"></div>
-    <p>Systray Example</p>
-</div>
-</body>
-</html>

v2/examples/systray/frontend/package-lock.json

@@ -1,852 +0,0 @@
-{
-  "name": "frontend",
-  "version": "0.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "frontend",
-      "version": "0.0.0",
-      "devDependencies": {
-        "vite": "^2.9.9"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
-      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
-      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/linux-loong64": "0.14.54",
-        "esbuild-android-64": "0.14.54",
-        "esbuild-android-arm64": "0.14.54",
-        "esbuild-darwin-64": "0.14.54",
-        "esbuild-darwin-arm64": "0.14.54",
-        "esbuild-freebsd-64": "0.14.54",
-        "esbuild-freebsd-arm64": "0.14.54",
-        "esbuild-linux-32": "0.14.54",
-        "esbuild-linux-64": "0.14.54",
-        "esbuild-linux-arm": "0.14.54",
-        "esbuild-linux-arm64": "0.14.54",
-        "esbuild-linux-mips64le": "0.14.54",
-        "esbuild-linux-ppc64le": "0.14.54",
-        "esbuild-linux-riscv64": "0.14.54",
-        "esbuild-linux-s390x": "0.14.54",
-        "esbuild-netbsd-64": "0.14.54",
-        "esbuild-openbsd-64": "0.14.54",
-        "esbuild-sunos-64": "0.14.54",
-        "esbuild-windows-32": "0.14.54",
-        "esbuild-windows-64": "0.14.54",
-        "esbuild-windows-arm64": "0.14.54"
-      }
-    },
-    "node_modules/esbuild-android-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
-      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
-      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
-      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
-      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
-      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
-      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
-      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
-      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
-      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
-      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
-      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
-      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-riscv64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
-      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-s390x": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
-      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
-      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
-      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
-      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
-      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
-      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
-      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/postcss": {
-      "version": "8.4.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-      "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "2.77.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.3.tgz",
-      "integrity": "sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==",
-      "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/vite": {
-      "version": "2.9.15",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.15.tgz",
-      "integrity": "sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.14.27",
-        "postcss": "^8.4.13",
-        "resolve": "^1.22.0",
-        "rollup": ">=2.59.0 <2.78.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": ">=12.2.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      },
-      "peerDependencies": {
-        "less": "*",
-        "sass": "*",
-        "stylus": "*"
-      },
-      "peerDependenciesMeta": {
-        "less": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        }
-      }
-    }
-  },
-  "dependencies": {
-    "@esbuild/linux-loong64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
-      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
-      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
-      "dev": true,
-      "requires": {
-        "@esbuild/linux-loong64": "0.14.54",
-        "esbuild-android-64": "0.14.54",
-        "esbuild-android-arm64": "0.14.54",
-        "esbuild-darwin-64": "0.14.54",
-        "esbuild-darwin-arm64": "0.14.54",
-        "esbuild-freebsd-64": "0.14.54",
-        "esbuild-freebsd-arm64": "0.14.54",
-        "esbuild-linux-32": "0.14.54",
-        "esbuild-linux-64": "0.14.54",
-        "esbuild-linux-arm": "0.14.54",
-        "esbuild-linux-arm64": "0.14.54",
-        "esbuild-linux-mips64le": "0.14.54",
-        "esbuild-linux-ppc64le": "0.14.54",
-        "esbuild-linux-riscv64": "0.14.54",
-        "esbuild-linux-s390x": "0.14.54",
-        "esbuild-netbsd-64": "0.14.54",
-        "esbuild-openbsd-64": "0.14.54",
-        "esbuild-sunos-64": "0.14.54",
-        "esbuild-windows-32": "0.14.54",
-        "esbuild-windows-64": "0.14.54",
-        "esbuild-windows-arm64": "0.14.54"
-      }
-    },
-    "esbuild-android-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
-      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-android-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
-      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
-      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-darwin-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
-      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
-      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-freebsd-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
-      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
-      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
-      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
-      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
-      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-mips64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
-      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-ppc64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
-      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-riscv64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
-      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-s390x": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
-      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-netbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
-      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-openbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
-      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-sunos-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
-      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
-      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
-      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-windows-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
-      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
-      "dev": true,
-      "optional": true
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "postcss": {
-      "version": "8.4.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-      "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
-      "dev": true,
-      "requires": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      }
-    },
-    "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "rollup": {
-      "version": "2.77.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.3.tgz",
-      "integrity": "sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==",
-      "dev": true,
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "vite": {
-      "version": "2.9.15",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.15.tgz",
-      "integrity": "sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ==",
-      "dev": true,
-      "requires": {
-        "esbuild": "^0.14.27",
-        "fsevents": "~2.3.2",
-        "postcss": "^8.4.13",
-        "resolve": "^1.22.0",
-        "rollup": ">=2.59.0 <2.78.0"
-      }
-    }
-  }
-}

v2/examples/systray/frontend/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "frontend",
-  "private": true,
-  "version": "0.0.0",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "vite": "^2.9.9"
-  }
-}

v2/examples/systray/go.mod

@@ -1,34 +0,0 @@
-module github.com/wailsapp/examples/systray
-
-go 1.18
-
-require github.com/wailsapp/wails/v2 v2.2.0
-
-require (
-	github.com/bep/debounce v1.2.1 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/google/uuid v1.1.2 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
-	github.com/labstack/echo/v4 v4.9.0 // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
-	github.com/leaanthony/gosod v1.0.3 // indirect
-	github.com/leaanthony/slicer v1.5.0 // indirect
-	github.com/mattn/go-colorable v0.1.11 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/samber/lo v1.27.1 // indirect
-	github.com/tkrajina/go-reflector v0.5.5 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	github.com/wailsapp/mimetype v1.4.1 // indirect
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
-	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
-	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
-	golang.org/x/text v0.3.7 // indirect
-)
-
-replace github.com/wailsapp/wails/v2 v2.2.0 => ../..

v2/examples/systray/go.sum

@@ -1,79 +0,0 @@
-github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
-github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-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/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/labstack/echo/v4 v4.9.0 h1:wPOF1CE6gvt/kmbMR4dGzWvHMPT+sAEUJOwOTtvITVY=
-github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
-github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o=
-github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
-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/gosod v1.0.3 h1:Fnt+/B6NjQOVuCWOKYRREZnjGyvg+mEhd1nkkA04aTQ=
-github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4=
-github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
-github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
-github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
-github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 h1:acNfDZXmm28D2Yg/c3ALnZStzNaZMSagpbr96vY6Zjc=
-github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/samber/lo v1.27.1 h1:sTXwkRiIFIQG+G0HeAvOEnGjqWeWtI9cg5/n51KrxPg=
-github.com/samber/lo v1.27.1/go.mod h1:it33p9UtPMS7z72fP4gw/EIfQB2eI8ke7GR2wc6+Rhg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
-github.com/tkrajina/go-reflector v0.5.5 h1:gwoQFNye30Kk7NrExj8zm3zFtrGPqOkzFMLuQZg1DtQ=
-github.com/tkrajina/go-reflector v0.5.5/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
-github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
-golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

v2/examples/systray/main.go

@@ -1,217 +0,0 @@
-package main
-
-import (
-	"context"
-	"embed"
-	"fmt"
-	"time"
-
-	"github.com/wailsapp/wails/v2/pkg/application"
-	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/options"
-	"github.com/wailsapp/wails/v2/pkg/options/windows"
-	"github.com/wailsapp/wails/v2/pkg/runtime"
-)
-
-//go:embed all:frontend/dist
-var assets embed.FS
-
-//go:embed iconLightMode.png
-var lightModeIcon []byte
-
-//go:embed iconDarkMode.png
-var darkModeIcon []byte
-
-func main() {
-
-	var runtimeContext context.Context
-
-	// Create a new Wails application using the current options
-	mainApp := application.NewWithOptions(&options.App{
-		Assets:            assets,
-		StartHidden:       true,
-		HideWindowOnClose: true,
-		OnStartup: func(ctx context.Context) {
-			runtimeContext = ctx
-		},
-		Windows: &windows.Options{
-			BackdropType:         windows.Acrylic,
-			WindowIsTranslucent:  true,
-			WebviewIsTransparent: true,
-			DisableWindowIcon:    true,
-		},
-	})
-
-	// ------------------------------------
-	// Create a systray for the application
-	// Currently we only support PNG for icons
-
-	var systray *application.SystemTray
-	var showWindow = func() {
-		// Show the window
-		// In a future version of this API, it will be possible to
-		// create windows programmatically and be able to show/hide
-		// them from the systray with something like:
-		//
-		// myWindow := mainApp.NewWindow(...)
-		// mainApp.NewSystemTray(&options.SystemTray{
-		//   OnLeftClick: func() {
-		//      myWindow.SetVisibility(!myWindow.IsVisible())
-		//   }
-		// })
-		runtime.Show(runtimeContext)
-	}
-	systray = mainApp.NewSystemTray(&options.SystemTray{
-		// This is the icon used when the system in using light mode
-		LightModeIcon: &options.SystemTrayIcon{
-			Data: lightModeIcon,
-		},
-		// This is the icon used when the system in using dark mode
-		DarkModeIcon: &options.SystemTrayIcon{
-			Data: darkModeIcon,
-		},
-		Tooltip:     "Systray Example",
-		OnLeftClick: showWindow,
-		OnMenuClose: func() {
-			// Add the left click call after 500ms
-			// We do this because the left click fires right
-			// after the menu closes, and we don't want to show
-			// the window on menu close.
-			go func() {
-				time.Sleep(500 * time.Millisecond)
-				systray.OnLeftClick(showWindow)
-			}()
-		},
-		OnMenuOpen: func() {
-			// Remove the left click callback
-			systray.OnLeftClick(func() {})
-		},
-	})
-
-	// ---------------------------------------------------
-	// Menu items are created in the order they are added.
-	// This is a contrived example to show what can be done
-	// with menus.
-
-	// This is a menuitem we will show/hide at runtime
-	visibleNotVisible := menu.Label("visible?").Show()
-
-	counter := 0
-	icons := [][]byte{lightModeIcon, darkModeIcon}
-	iconCounter := 0
-
-	disabledEnabledMenu := menu.Label("disabled").Disable().OnClick(func(c *menu.CallbackData) {
-		println("Disabled item clicked!")
-	})
-
-	// This checkbox menuitem will print the current checked state to the console when clicked.
-	// When a checkbox item is clicked, the state of the `Checked` variable is toggled.
-	// The UI automatically reflects the current state, even if this item is used multiple times.
-	mycheckbox := menu.Label("checked").SetChecked(true).OnClick(func(c *menu.CallbackData) {
-		println("My checked state is: ", c.MenuItem.Checked)
-	})
-
-	// This radio callback will be used by all the radio items.
-	// The CallbackData has a pointer back to the menuitem, so we can determine
-	// which item was selected
-	radioCallback := func(data *menu.CallbackData) {
-		println("Radio item clicked:", data.MenuItem.Label)
-	}
-
-	// We create 3 radio items , with the first being selected. They all share a callback.
-	radio1 := menu.Radio("Radio 1", true, nil, radioCallback)
-	radio2 := menu.Radio("Radio 2", false, nil, radioCallback)
-	radio3 := menu.Radio("Radio 3", false, nil, radioCallback)
-
-	// Now we set the menu of the systray.
-	// This would likely be created in a different function/file
-	systray.SetMenu(menu.NewMenuFromItems(
-
-		visibleNotVisible,
-		// This menu item changes its label when clicked.
-		menu.Label("Click Me!").OnClick(func(c *menu.CallbackData) {
-			counter++
-			c.MenuItem.SetLabel(fmt.Sprintf("Clicked %d times", counter))
-			systray.Update()
-		}),
-
-		// We add a checkbox
-		menu.Separator(),
-		mycheckbox,
-
-		// Next we create 2 radio groups containing the same menu items.
-		// It is perfectly fine to reuse radio item groups - the state and UI will
-		// stay in sync. Warning: Using the same radio item in different groups will
-		// lead to unspecified behaviour!
-		menu.Separator(),
-		radio1,
-		radio2,
-		radio3,
-
-		menu.Separator(),
-		mycheckbox,
-
-		menu.Label("Toggle items!").OnClick(func(c *menu.CallbackData) {
-
-			iconCounter++
-
-			// Swap light and dark mode icons
-			systray.SetIcons(&options.SystemTrayIcon{
-				Data: icons[iconCounter%2],
-			}, &options.SystemTrayIcon{
-				Data: icons[(iconCounter+1)%2],
-			})
-
-			// Do some toggling
-			if iconCounter%2 == 0 {
-				visibleNotVisible.Show()
-				disabledEnabledMenu.Disable()
-			} else {
-				visibleNotVisible.Hide()
-				disabledEnabledMenu.Enable()
-			}
-
-			// Update the menu
-			err := systray.Update()
-			if err != nil {
-				panic(err)
-			}
-		}),
-
-		// We create a checkbox item that is initially unchecked.
-		menu.Label("unchecked").SetChecked(false).OnClick(func(c *menu.CallbackData) {
-			println("My checked state is: ", c.MenuItem.Checked)
-			systray.SetTooltip("My updated tooltip!")
-		}),
-
-		// This menu item will toggle between enabled and disabled each time the "Toggle items!" menu
-		// option is selected
-		disabledEnabledMenu,
-
-		// We now add a submenu, reusing the checkbox item and submenu we created earlier
-		menu.SubMenu("submenu", menu.NewMenuFromItems(
-			mycheckbox,
-			menu.Label("submenu item").OnClick(func(data *menu.CallbackData) {
-				println("submenu item clicked")
-			}),
-			menu.Separator(),
-			radio1,
-			radio2,
-			radio3,
-		)),
-		menu.Separator(),
-		menu.Label("quit").OnClick(func(_ *menu.CallbackData) {
-			println("Quitting application")
-			mainApp.Quit()
-		}),
-	))
-
-	println("Check out the system tray!")
-
-	// Now we run the application
-	err := mainApp.Run()
-
-	if err != nil {
-		println("Error:", err.Error())
-	}
-}

v2/examples/systray/wails.json

@@ -1,12 +0,0 @@
-{
-  "name": "systray",
-  "outputfilename": "systray",
-  "frontend:install": "npm install",
-  "frontend:build": "npm run build",
-  "frontend:dev:watcher": "npm run dev",
-  "frontend:dev:serverUrl": "auto",
-  "author": {
-    "name": "Lea Anthony",
-    "email": "lea.anthony@gmail.com"
-  }
-}

v2/internal/platform/systray.go

@@ -1,31 +0,0 @@
-package platform
-
-import (
-	"github.com/wailsapp/wails/v2/internal/platform/systray"
-	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-import "github.com/samber/lo"
-
-type SysTray interface {
-	// SetTitle sets the title of the tray menu
-	SetTitle(title string)
-	SetTooltip(tooltip string) error
-	Show() error
-	Hide() error
-	Run() error
-	Close()
-	SetMenu(menu *menu.Menu) error
-	SetIcons(lightModeIcon, darkModeIcon *options.SystemTrayIcon) error
-	Update() error
-	OnLeftClick(func())
-	OnRightClick(func())
-	OnLeftDoubleClick(func())
-	OnRightDoubleClick(func())
-	OnMenuClose(func())
-	OnMenuOpen(func())
-}
-
-func NewSysTray() SysTray {
-	return lo.Must(systray.New())
-}

v2/internal/platform/systray/menu_windows.go

@@ -1,222 +0,0 @@
-//go:build windows
-
-package systray
-
-import (
-	"errors"
-	"fmt"
-	platformMenu "github.com/wailsapp/wails/v2/internal/platform/menu"
-	"github.com/wailsapp/wails/v2/internal/platform/win32"
-	"github.com/wailsapp/wails/v2/pkg/menu"
-)
-
-type RadioGroupMember struct {
-	ID       int
-	MenuItem *menu.MenuItem
-}
-
-type RadioGroup []*RadioGroupMember
-
-func (r *RadioGroup) Add(id int, item *menu.MenuItem) {
-	*r = append(*r, &RadioGroupMember{
-		ID:       id,
-		MenuItem: item,
-	})
-}
-
-func (r *RadioGroup) Bounds() (int, int) {
-	p := *r
-	return p[0].ID, p[len(p)-1].ID
-}
-
-func (r *RadioGroup) MenuID(item *menu.MenuItem) int {
-	for _, member := range *r {
-		if member.MenuItem == item {
-			return member.ID
-		}
-	}
-	panic("RadioGroup.MenuID: item not found:")
-}
-
-type PopupMenu struct {
-	menu          win32.PopupMenu
-	parent        win32.HWND
-	menuMapping   map[int]*menu.MenuItem
-	checkboxItems map[*menu.MenuItem][]int
-	radioGroups   map[*menu.MenuItem][]*RadioGroup
-	menuData      *menu.Menu
-	currentMenuID int
-	onMenuClose   func()
-	onMenuOpen    func()
-}
-
-func (p *PopupMenu) buildMenu(parentMenu win32.PopupMenu, inputMenu *menu.Menu) error {
-	var currentRadioGroup RadioGroup
-	for _, item := range inputMenu.Items {
-		if item.Hidden {
-			continue
-		}
-		var ret bool
-		p.currentMenuID++
-		itemID := p.currentMenuID
-		p.menuMapping[itemID] = item
-
-		flags := win32.MF_STRING
-		if item.Disabled {
-			flags = flags | win32.MF_GRAYED
-		}
-		if item.Checked {
-			flags = flags | win32.MF_CHECKED
-		}
-		//if item.BarBreak {
-		//	flags = flags | win32.MF_MENUBARBREAK
-		//}
-		if item.IsSeparator() {
-			flags = flags | win32.MF_SEPARATOR
-		}
-
-		if item.IsCheckbox() {
-			p.checkboxItems[item] = append(p.checkboxItems[item], itemID)
-		}
-		if item.IsRadio() {
-			currentRadioGroup.Add(itemID, item)
-		} else {
-			if len(currentRadioGroup) > 0 {
-				for _, radioMember := range currentRadioGroup {
-					currentRadioGroup := currentRadioGroup
-					p.radioGroups[radioMember.MenuItem] = append(p.radioGroups[radioMember.MenuItem], &currentRadioGroup)
-				}
-				currentRadioGroup = RadioGroup{}
-			}
-		}
-
-		if item.SubMenu != nil {
-			flags = flags | win32.MF_POPUP
-			submenu := win32.CreatePopupMenu()
-			err := p.buildMenu(submenu, item.SubMenu)
-			if err != nil {
-				return err
-			}
-			itemID = int(submenu)
-		}
-
-		var menuText = item.Label
-		if item.Accelerator != nil {
-			shortcut := win32.AcceleratorToShortcut(item.Accelerator)
-			menuText = fmt.Sprintf("%s\t%s", menuText, shortcut)
-			// Popup Menus don't appear to support accelerators and I'm not
-			// sure they make sense either
-		}
-
-		ret = parentMenu.Append(uintptr(flags), uintptr(itemID), menuText)
-		if ret == false {
-			return errors.New("AppendMenu failed")
-		}
-	}
-	if len(currentRadioGroup) > 0 {
-		for _, radioMember := range currentRadioGroup {
-			currentRadioGroup := currentRadioGroup
-			p.radioGroups[radioMember.MenuItem] = append(p.radioGroups[radioMember.MenuItem], &currentRadioGroup)
-		}
-		currentRadioGroup = RadioGroup{}
-	}
-	return nil
-}
-
-func (p *PopupMenu) Update() error {
-	p.menu = win32.CreatePopupMenu()
-	p.menuMapping = make(map[int]*menu.MenuItem)
-	p.currentMenuID = win32.MenuItemMsgID
-	err := p.buildMenu(p.menu, p.menuData)
-	if err != nil {
-		return err
-	}
-	p.updateRadioGroups()
-	return nil
-}
-
-func NewPopupMenu(parent win32.HWND, inputMenu *menu.Menu) (*PopupMenu, error) {
-	result := &PopupMenu{
-		parent:        parent,
-		menuData:      inputMenu,
-		checkboxItems: make(map[*menu.MenuItem][]int),
-		radioGroups:   make(map[*menu.MenuItem][]*RadioGroup),
-	}
-	err := result.Update()
-	platformMenu.MenuManager.AddMenu(inputMenu, result.UpdateMenuItem)
-	return result, err
-}
-
-func (p *PopupMenu) ShowAtCursor() error {
-	x, y, ok := win32.GetCursorPos()
-	if ok == false {
-		return errors.New("GetCursorPos failed")
-	}
-
-	if win32.SetForegroundWindow(p.parent) == false {
-		return errors.New("SetForegroundWindow failed")
-	}
-
-	if p.onMenuOpen != nil {
-		p.onMenuOpen()
-	}
-
-	if p.menu.Track(win32.TPM_LEFTALIGN, x, y-5, p.parent) == false {
-		return errors.New("TrackPopupMenu failed")
-	}
-
-	if p.onMenuClose != nil {
-		p.onMenuClose()
-	}
-
-	if win32.PostMessage(p.parent, win32.WM_NULL, 0, 0) == 0 {
-		return errors.New("PostMessage failed")
-	}
-
-	return nil
-}
-
-func (p *PopupMenu) ProcessCommand(cmdMsgID int) {
-	item := p.menuMapping[cmdMsgID]
-	platformMenu.MenuManager.ProcessClick(item)
-}
-
-func (p *PopupMenu) Destroy() {
-	p.menu.Destroy()
-}
-
-func (p *PopupMenu) UpdateMenuItem(item *menu.MenuItem) {
-	if item.IsCheckbox() {
-		for _, itemID := range p.checkboxItems[item] {
-			p.menu.Check(uintptr(itemID), item.Checked)
-		}
-		return
-	}
-	if item.IsRadio() && item.Checked == true {
-		p.updateRadioGroup(item)
-	}
-}
-
-func (p *PopupMenu) updateRadioGroups() {
-	for menuItem := range p.radioGroups {
-		if menuItem.Checked {
-			p.updateRadioGroup(menuItem)
-		}
-	}
-}
-
-func (p *PopupMenu) updateRadioGroup(item *menu.MenuItem) {
-	for _, radioGroup := range p.radioGroups[item] {
-		thisMenuID := radioGroup.MenuID(item)
-		startID, endID := radioGroup.Bounds()
-		p.menu.CheckRadio(startID, endID, thisMenuID)
-	}
-}
-
-func (p *PopupMenu) OnMenuOpen(fn func()) {
-	p.onMenuOpen = fn
-}
-
-func (p *PopupMenu) OnMenuClose(fn func()) {
-	p.onMenuClose = fn
-}

v2/internal/platform/systray/systray_linux.go

@@ -1,83 +0,0 @@
-//go:build linux
-
-/*
- * Based on code originally from https://github.com/tadvi/systray. Copyright (C) 2019 The Systray Authors. All Rights Reserved.
- */
-
-package systray
-
-import (
-	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-
-type Systray struct {
-}
-
-func (p *Systray) Close() {
-	err := p.Stop()
-	if err != nil {
-		println(err.Error())
-	}
-}
-
-func (p *Systray) Update() error {
-	return nil
-}
-
-// SetTitle is unused on Windows
-func (p *Systray) SetTitle(_ string) {}
-
-func New() (*Systray, error) {
-	return nil, nil
-}
-
-func (p *Systray) SetMenu(popupMenu *menu.Menu) (err error) {
-	return
-}
-
-func (p *Systray) Stop() error {
-	return nil
-}
-
-func (p *Systray) OnLeftClick(fn func()) {
-}
-
-func (p *Systray) OnRightClick(fn func()) {
-}
-
-func (p *Systray) OnLeftDoubleClick(fn func()) {
-}
-
-func (p *Systray) OnRightDoubleClick(fn func()) {
-}
-
-func (p *Systray) OnMenuClose(fn func()) {
-}
-
-func (p *Systray) OnMenuOpen(fn func()) {
-}
-
-func (p *Systray) SetTooltip(tooltip string) error {
-	return nil
-}
-
-func (p *Systray) Show() error {
-	return p.setVisible(true)
-}
-
-func (p *Systray) Hide() error {
-	return p.setVisible(false)
-}
-
-func (p *Systray) setVisible(visible bool) error {
-	return nil
-}
-
-func (p *Systray) SetIcons(lightModeIcon, darkModeIcon *options.SystemTrayIcon) error {
-	return nil
-}
-
-func (p *Systray) Run() error {
-	return nil
-}

v2/internal/platform/systray/systray_mac.go

@@ -1,91 +0,0 @@
-//go:build darwin
-
-package systray
-
-import (
-	"errors"
-	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-
-var NotImplementedSysTray = errors.New("not implemented")
-
-type Systray struct {
-}
-
-func (p *Systray) Close() {
-	err := p.Stop()
-	if err != nil {
-		println(err.Error())
-	}
-}
-
-func (p *Systray) Update() error {
-	return NotImplementedSysTray
-}
-
-func (p *Systray) SetTitle(_ string) {}
-
-func New() (*Systray, error) {
-	return nil, NotImplementedSysTray
-}
-
-func (p *Systray) SetMenu(popupMenu *menu.Menu) (err error) {
-	return NotImplementedSysTray
-}
-
-func (p *Systray) Stop() error {
-	return NotImplementedSysTray
-}
-
-func (p *Systray) OnLeftClick(fn func()) {
-
-}
-
-func (p *Systray) OnRightClick(fn func()) {
-
-}
-
-func (p *Systray) OnLeftDoubleClick(fn func()) {
-
-}
-
-func (p *Systray) OnRightDoubleClick(fn func()) {
-
-}
-
-func (p *Systray) OnMenuClose(fn func()) {
-
-}
-
-func (p *Systray) OnMenuOpen(fn func()) {
-
-}
-
-func (p *Systray) SetTooltip(tooltip string) error {
-	return NotImplementedSysTray
-}
-
-func (p *Systray) ShowMessage(title, msg string, bigIcon bool) error {
-	return NotImplementedSysTray
-}
-
-func (p *Systray) Show() error {
-	return p.setVisible(true)
-}
-
-func (p *Systray) Hide() error {
-	return p.setVisible(false)
-}
-
-func (p *Systray) setVisible(visible bool) error {
-	return NotImplementedSysTray
-}
-
-func (p *Systray) SetIcons(lightModeIcon, darkModeIcon *options.SystemTrayIcon) error {
-	return NotImplementedSysTray
-}
-
-func (p *Systray) Run() error {
-	return NotImplementedSysTray
-}

v2/internal/platform/systray/systray_windows.go

@@ -1,432 +0,0 @@
-//go:build windows
-
-/*
- * Based on code originally from https://github.com/tadvi/systray. Copyright (C) 2019 The Systray Authors. All Rights Reserved.
- */
-
-package systray
-
-import (
-	"errors"
-	"github.com/samber/lo"
-	"github.com/wailsapp/wails/v2/internal/platform/win32"
-	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/options"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	user32 = syscall.MustLoadDLL("user32.dll")
-
-	DefWindowProc   = user32.MustFindProc("DefWindowProcW")
-	RegisterClassEx = user32.MustFindProc("RegisterClassExW")
-	CreateWindowEx  = user32.MustFindProc("CreateWindowExW")
-
-	windowClasses = map[string]win32.HINSTANCE{}
-)
-
-type Systray struct {
-	id          uint32
-	mhwnd       win32.HWND // main window handle
-	hwnd        win32.HWND
-	hinst       win32.HINSTANCE
-	lclick      func()
-	rclick      func()
-	ldblclick   func()
-	rdblclick   func()
-	onMenuClose func()
-	onMenuOpen  func()
-
-	appIcon       win32.HICON
-	lightModeIcon win32.HICON
-	darkModeIcon  win32.HICON
-	currentIcon   win32.HICON
-
-	menu *PopupMenu
-
-	quit chan struct{}
-	icon *options.SystemTrayIcon
-}
-
-func (p *Systray) Close() {
-	err := p.Stop()
-	if err != nil {
-		println(err.Error())
-	}
-}
-
-func (p *Systray) Update() error {
-	// Delete old menu
-	if p.menu != nil {
-		p.menu.Destroy()
-	}
-
-	return p.menu.Update()
-}
-
-// SetTitle is unused on Windows
-func (p *Systray) SetTitle(_ string) {}
-
-func New() (*Systray, error) {
-	ni := &Systray{}
-
-	ni.lclick = func() {
-		if ni.menu != nil {
-			_ = ni.menu.ShowAtCursor()
-		}
-	}
-	ni.rclick = func() {
-		if ni.menu != nil {
-			_ = ni.menu.ShowAtCursor()
-		}
-	}
-
-	MainClassName := "WailsSystray"
-	ni.hinst, _ = RegisterWindow(MainClassName, ni.WinProc)
-
-	ni.mhwnd = win32.CreateWindowEx(
-		win32.WS_EX_CONTROLPARENT,
-		win32.MustStringToUTF16Ptr(MainClassName),
-		win32.MustStringToUTF16Ptr(""),
-		win32.WS_OVERLAPPEDWINDOW|win32.WS_CLIPSIBLINGS,
-		win32.CW_USEDEFAULT,
-		win32.CW_USEDEFAULT,
-		win32.CW_USEDEFAULT,
-		win32.CW_USEDEFAULT,
-		0,
-		0,
-		0,
-		unsafe.Pointer(nil))
-
-	if ni.mhwnd == 0 {
-		return nil, errors.New("create main win failed")
-	}
-
-	NotifyIconClassName := "NotifyIconForm"
-	_, err := RegisterWindow(NotifyIconClassName, ni.WinProc)
-	if err != nil {
-		return nil, err
-	}
-
-	hwnd, _, _ := CreateWindowEx.Call(
-		0,
-		uintptr(unsafe.Pointer(win32.MustStringToUTF16Ptr(NotifyIconClassName))),
-		0,
-		0,
-		0,
-		0,
-		0,
-		0,
-		uintptr(win32.HWND_MESSAGE),
-		0,
-		0,
-		0)
-	if hwnd == 0 {
-		return nil, errors.New("create notify win failed")
-	}
-
-	ni.hwnd = win32.HWND(hwnd) // Important to keep this inside struct.
-
-	nid := win32.NOTIFYICONDATA{
-		HWnd:             win32.HWND(hwnd),
-		UFlags:           win32.NIF_MESSAGE | win32.NIF_STATE,
-		DwState:          win32.NIS_HIDDEN,
-		DwStateMask:      win32.NIS_HIDDEN,
-		UCallbackMessage: win32.NotifyIconMessageId,
-	}
-	nid.CbSize = uint32(unsafe.Sizeof(nid))
-
-	if !win32.ShellNotifyIcon(win32.NIM_ADD, &nid) {
-		return nil, errors.New("shell notify create failed")
-	}
-
-	nid.UVersion = win32.NOTIFYICON_VERSION
-
-	if !win32.ShellNotifyIcon(win32.NIM_SETVERSION, &nid) {
-		return nil, errors.New("shell notify version failed")
-	}
-
-	ni.appIcon = win32.LoadIconWithResourceID(0, uintptr(win32.IDI_APPLICATION))
-	ni.lightModeIcon = ni.appIcon
-	ni.darkModeIcon = ni.appIcon
-	ni.id = nid.UID
-	return ni, nil
-}
-
-func (p *Systray) HWND() win32.HWND {
-	return p.hwnd
-}
-
-func (p *Systray) SetMenu(popupMenu *menu.Menu) (err error) {
-	p.menu, err = NewPopupMenu(p.hwnd, popupMenu)
-	p.menu.OnMenuClose(p.onMenuClose)
-	p.menu.OnMenuOpen(p.onMenuOpen)
-	return
-}
-
-func (p *Systray) Stop() error {
-	nid := p.newNotifyIconData()
-	win32.PostQuitMessage(0)
-	if !win32.ShellNotifyIcon(win32.NIM_DELETE, &nid) {
-		return errors.New("shell notify delete failed")
-	}
-	return nil
-}
-
-func (p *Systray) OnLeftClick(fn func()) {
-	if fn != nil {
-		p.lclick = fn
-	}
-}
-
-func (p *Systray) OnRightClick(fn func()) {
-	if fn != nil {
-		p.rclick = fn
-	}
-}
-
-func (p *Systray) OnLeftDoubleClick(fn func()) {
-	if fn != nil {
-		p.ldblclick = fn
-	}
-}
-
-func (p *Systray) OnRightDoubleClick(fn func()) {
-	if fn != nil {
-		p.rdblclick = fn
-	}
-}
-
-func (p *Systray) OnMenuClose(fn func()) {
-	if fn != nil {
-		p.onMenuClose = fn
-	}
-}
-
-func (p *Systray) OnMenuOpen(fn func()) {
-	if fn != nil {
-		p.onMenuOpen = fn
-	}
-}
-
-func (p *Systray) SetTooltip(tooltip string) error {
-	nid := p.newNotifyIconData()
-	nid.UFlags = win32.NIF_TIP
-	copy(nid.SzTip[:], win32.MustUTF16FromString(tooltip))
-
-	if !win32.ShellNotifyIcon(win32.NIM_MODIFY, &nid) {
-		return errors.New("shell notify tooltip failed")
-	}
-	return nil
-}
-
-func (p *Systray) ShowMessage(title, msg string, bigIcon bool) error {
-	nid := p.newNotifyIconData()
-	if bigIcon == true {
-		nid.DwInfoFlags = win32.NIIF_USER
-	}
-
-	nid.CbSize = uint32(unsafe.Sizeof(nid))
-
-	nid.UFlags = win32.NIF_INFO
-	copy(nid.SzInfoTitle[:], win32.MustUTF16FromString(title))
-	copy(nid.SzInfo[:], win32.MustUTF16FromString(msg))
-
-	if !win32.ShellNotifyIcon(win32.NIM_MODIFY, &nid) {
-		return errors.New("shell notify tooltip failed")
-	}
-	return nil
-}
-
-func (p *Systray) newNotifyIconData() win32.NOTIFYICONDATA {
-	nid := win32.NOTIFYICONDATA{
-		UID:  p.id,
-		HWnd: p.hwnd,
-	}
-	nid.CbSize = uint32(unsafe.Sizeof(nid))
-	return nid
-}
-
-func (p *Systray) Show() error {
-	return p.setVisible(true)
-}
-
-func (p *Systray) Hide() error {
-	return p.setVisible(false)
-}
-
-func (p *Systray) setVisible(visible bool) error {
-	nid := p.newNotifyIconData()
-	nid.UFlags = win32.NIF_STATE
-	nid.DwStateMask = win32.NIS_HIDDEN
-	if !visible {
-		nid.DwState = win32.NIS_HIDDEN
-	}
-
-	if !win32.ShellNotifyIcon(win32.NIM_MODIFY, &nid) {
-		return errors.New("shell notify tooltip failed")
-	}
-	return nil
-}
-
-func (p *Systray) SetIcons(lightModeIcon, darkModeIcon *options.SystemTrayIcon) error {
-	var newLightModeIcon, newDarkModeIcon win32.HICON
-	if lightModeIcon != nil && lightModeIcon.Data != nil {
-		newLightModeIcon = p.getIcon(lightModeIcon.Data)
-	}
-	if darkModeIcon != nil && darkModeIcon.Data != nil {
-		newDarkModeIcon = p.getIcon(darkModeIcon.Data)
-	}
-	p.lightModeIcon, _ = lo.Coalesce(newLightModeIcon, newDarkModeIcon, p.appIcon)
-	p.darkModeIcon, _ = lo.Coalesce(newDarkModeIcon, newLightModeIcon, p.appIcon)
-	return p.updateIcon()
-}
-
-func (p *Systray) getIcon(icon []byte) win32.HICON {
-	result, err := win32.CreateHIconFromPNG(icon)
-	if err != nil {
-		result = p.appIcon
-	}
-	return result
-}
-
-func (p *Systray) setIcon(hicon win32.HICON) error {
-	nid := p.newNotifyIconData()
-	nid.UFlags = win32.NIF_ICON
-	if hicon == 0 {
-		nid.HIcon = 0
-	} else {
-		nid.HIcon = hicon
-	}
-
-	if !win32.ShellNotifyIcon(win32.NIM_MODIFY, &nid) {
-		return errors.New("shell notify icon failed")
-	}
-	return nil
-}
-
-func (p *Systray) WinProc(hwnd win32.HWND, msg uint32, wparam, lparam uintptr) uintptr {
-	switch msg {
-	case win32.NotifyIconMessageId:
-		switch lparam {
-		case win32.WM_LBUTTONUP:
-			if p.lclick != nil {
-				println("left click")
-				p.lclick()
-			}
-		case win32.WM_RBUTTONUP:
-			if p.rclick != nil {
-				println("right click")
-				p.rclick()
-			}
-		case win32.WM_LBUTTONDBLCLK:
-			if p.ldblclick != nil {
-				p.ldblclick()
-			}
-		case win32.WM_RBUTTONDBLCLK:
-			if p.rdblclick != nil {
-				p.rdblclick()
-			}
-		default:
-			//println(win32.WMMessageToString(lparam))
-		}
-	case win32.WM_SETTINGCHANGE:
-		settingChanged := win32.UTF16PtrToString(lparam)
-		if settingChanged == "ImmersiveColorSet" {
-			err := p.updateIcon()
-			if err != nil {
-				println("update icon failed", err.Error())
-			}
-		}
-		return 0
-	case win32.WM_COMMAND:
-		cmdMsgID := int(wparam & 0xffff)
-		switch cmdMsgID {
-		default:
-			p.menu.ProcessCommand(cmdMsgID)
-		}
-	default:
-		//msg := int(wparam & 0xffff)
-		//println(win32.WMMessageToString(uintptr(msg)))
-	}
-
-	result, _, _ := DefWindowProc.Call(uintptr(hwnd), uintptr(msg), wparam, lparam)
-	return result
-}
-
-func (p *Systray) Run() error {
-	var msg win32.MSG
-	for {
-		rt := win32.GetMessage(&msg)
-		switch int(rt) {
-		case 0:
-			return nil
-		case -1:
-			return errors.New("run failed")
-		}
-
-		if win32.IsDialogMessage(p.hwnd, &msg) == 0 {
-			win32.TranslateMessage(&msg)
-			win32.DispatchMessage(&msg)
-		}
-	}
-}
-
-func (p *Systray) updateIcon() error {
-
-	var newIcon win32.HICON
-	if win32.IsCurrentlyDarkMode() {
-		newIcon = p.darkModeIcon
-	} else {
-		newIcon = p.lightModeIcon
-	}
-	if p.currentIcon == newIcon {
-		return nil
-	}
-	p.currentIcon = newIcon
-	return p.setIcon(newIcon)
-}
-
-func (p *Systray) updateTheme() {
-	//win32.SetTheme(p.hwnd, win32.IsCurrentlyDarkMode())
-}
-
-func RegisterWindow(name string, proc win32.WindowProc) (win32.HINSTANCE, error) {
-	instance, exists := windowClasses[name]
-	if exists {
-		return instance, nil
-	}
-	hinst := win32.GetModuleHandle(0)
-	if hinst == 0 {
-		return 0, errors.New("get module handle failed")
-	}
-	hicon := win32.LoadIconWithResourceID(0, uintptr(win32.IDI_APPLICATION))
-	if hicon == 0 {
-		return 0, errors.New("load icon failed")
-	}
-	hcursor := win32.LoadCursorWithResourceID(0, uintptr(win32.IDC_ARROW))
-	if hcursor == 0 {
-		return 0, errors.New("load cursor failed")
-	}
-
-	hi := win32.HINSTANCE(hinst)
-
-	var wc win32.WNDCLASSEX
-	wc.CbSize = uint32(unsafe.Sizeof(wc))
-	wc.LpfnWndProc = syscall.NewCallback(proc)
-	wc.HInstance = win32.HINSTANCE(hinst)
-	wc.HIcon = hicon
-	wc.HCursor = hcursor
-	wc.HbrBackground = win32.COLOR_BTNFACE + 1
-	wc.LpszClassName = win32.MustStringToUTF16Ptr(name)
-
-	atom, _, e := RegisterClassEx.Call(uintptr(unsafe.Pointer(&wc)))
-	if atom == 0 {
-		println(e.Error())
-		return 0, errors.New("register class failed")
-	}
-
-	windowClasses[name] = hi
-	return hi, nil
-}

v2/pkg/application/application.go

@@ -14,9 +14,6 @@ type Application struct {
 	application *app.App
 	options     *options.App
 
-	// System Trays
-	systemTrays []*SystemTray
-
 	// running flag
 	running bool
 
@@ -52,11 +49,6 @@ func (a *Application) SetApplicationMenu(appMenu *menu.Menu) {
 
 // Run starts the application
 func (a *Application) Run() error {
-
-	for _, systemtray := range a.systemTrays {
-		go systemtray.run()
-	}
-
 	err := applicationInit()
 	if err != nil {
 		return err
@@ -78,16 +70,12 @@ func (a *Application) Run() error {
 	a.running = true
 
 	err = a.application.Run()
-	a.Quit()
 	return err
 }
 
 // Quit will shut down the application
 func (a *Application) Quit() {
 	a.shutdown.Do(func() {
-		for _, systray := range a.systemTrays {
-			systray.Close()
-		}
 		a.application.Shutdown()
 	})
 }
@@ -112,9 +100,3 @@ func (a *Application) On(eventType EventType, callback func()) {
 		a.options.OnDomReady = c
 	}
 }
-
-func (a *Application) NewSystemTray(options *options.SystemTray) *SystemTray {
-	systemTray := newSystemTray(options)
-	a.systemTrays = append(a.systemTrays, systemTray)
-	return systemTray
-}

v2/pkg/application/systray.go

@@ -1,151 +0,0 @@
-package application
-
-import (
-	"github.com/wailsapp/wails/v2/internal/platform"
-	"github.com/wailsapp/wails/v2/pkg/menu"
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-
-// SystemTray defines a system tray!
-type SystemTray struct {
-	title              string
-	hidden             bool
-	lightModeIcon      *options.SystemTrayIcon
-	darkModeIcon       *options.SystemTrayIcon
-	tooltip            string
-	startHidden        bool
-	menu               *menu.Menu
-	onLeftClick        func()
-	onRightClick       func()
-	onLeftDoubleClick  func()
-	onRightDoubleClick func()
-	onMenuClose        func()
-	onMenuOpen         func()
-
-	// The platform specific implementation
-	impl platform.SysTray
-}
-
-func newSystemTray(options *options.SystemTray) *SystemTray {
-	return &SystemTray{
-		title:              options.Title,
-		lightModeIcon:      options.LightModeIcon,
-		darkModeIcon:       options.DarkModeIcon,
-		tooltip:            options.Tooltip,
-		startHidden:        options.StartHidden,
-		menu:               options.Menu,
-		onLeftClick:        options.OnLeftClick,
-		onRightClick:       options.OnRightClick,
-		onLeftDoubleClick:  options.OnLeftDoubleClick,
-		onRightDoubleClick: options.OnRightDoubleClick,
-		onMenuOpen:         options.OnMenuOpen,
-		onMenuClose:        options.OnMenuClose,
-	}
-}
-
-func (t *SystemTray) run() {
-	t.impl = platform.NewSysTray()
-	t.impl.SetTitle(t.title)
-	t.impl.SetIcons(t.lightModeIcon, t.darkModeIcon)
-	t.impl.SetTooltip(t.tooltip)
-	t.impl.OnLeftClick(t.onLeftClick)
-	t.impl.OnRightClick(t.onRightClick)
-	t.impl.OnLeftDoubleClick(t.onLeftDoubleClick)
-	t.impl.OnRightDoubleClick(t.onRightDoubleClick)
-	t.impl.OnMenuOpen(t.onMenuOpen)
-	t.impl.OnMenuClose(t.onMenuClose)
-	if !t.startHidden {
-		t.impl.Show()
-	}
-	t.impl.SetMenu(t.menu)
-	t.impl.Run()
-}
-
-func (t *SystemTray) SetTitle(title string) {
-	if t.impl != nil {
-		t.impl.SetTitle(title)
-	} else {
-		t.title = title
-	}
-}
-
-func (t *SystemTray) Run() error {
-	t.run()
-	return nil
-}
-
-func (t *SystemTray) Close() {
-	if t.impl != nil {
-		t.impl.Close()
-		t.impl = nil
-	}
-}
-
-func (t *SystemTray) SetMenu(items *menu.Menu) {
-	if t.impl != nil {
-		t.impl.SetMenu(t.menu)
-	} else {
-		t.menu = items
-	}
-}
-
-func (t *SystemTray) Update() error {
-	if t.impl != nil {
-		return t.impl.Update()
-	}
-	return nil
-}
-
-func (t *SystemTray) SetTooltip(s string) {
-	if t.impl != nil {
-		t.impl.SetTooltip(s)
-	} else {
-		t.tooltip = s
-	}
-}
-
-func (t *SystemTray) SetIcons(lightModeIcon *options.SystemTrayIcon, darkModeIcon *options.SystemTrayIcon) {
-	if t.impl != nil {
-		t.impl.SetIcons(lightModeIcon, darkModeIcon)
-	} else {
-		t.lightModeIcon = lightModeIcon
-		t.darkModeIcon = darkModeIcon
-	}
-
-}
-
-func (t *SystemTray) OnLeftClick(fn func()) {
-	if t.impl != nil {
-		t.impl.OnLeftClick(fn)
-	}
-}
-
-func (t *SystemTray) OnRightClick(fn func()) {
-	if t.impl != nil {
-		t.impl.OnRightClick(fn)
-	}
-}
-
-func (t *SystemTray) OnLeftDoubleClick(fn func()) {
-	if t.impl != nil {
-		t.impl.OnLeftDoubleClick(fn)
-	}
-}
-
-func (t *SystemTray) OnRightDoubleClick(fn func()) {
-	if t.impl != nil {
-		t.impl.OnRightDoubleClick(fn)
-	}
-}
-
-func (t *SystemTray) OnMenuOpen(fn func()) {
-	if t.impl != nil {
-		t.impl.OnMenuOpen(fn)
-	}
-}
-
-func (t *SystemTray) OnMenuClose(fn func()) {
-	if t.impl != nil {
-		t.impl.OnMenuClose(fn)
-	}
-}