chore: update bundler version

This was cherry picked from ee71c31fd0, keeping only the logic to block remote URLs from using the IPC.
PR: #5918

.cargo/config

@@ -1,2 +0,0 @@
-[env]
-__TAURI_WORKSPACE__ = "true"

.changes/config.json

@@ -8,7 +8,7 @@
       "getPublishedVersion": "node ../../.scripts/covector/package-latest-version.js cargo ${ pkgFile.pkg.package.name } ${ pkgFile.pkg.package.version }",
       "prepublish": [
         "sudo apt-get update",
-        "sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev",
+        "sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf",
         "cargo install cargo-audit --features=fix",
         {
           "command": "cargo generate-lockfile",
@@ -17,7 +17,12 @@
           "pipe": true
         },
         {
-          "command": "echo '<details>\n<summary><em><h4>Cargo Audit</h4></em></summary>\n\n```'",
+          "command": "echo \"# Cargo Audit\"",
+          "dryRunCommand": true,
+          "pipe": true
+        },
+        {
+          "command": "echo '```'",
           "dryRunCommand": true,
           "pipe": true
         },
@@ -28,7 +33,7 @@
           "pipe": true
         },
         {
-          "command": "echo '```\n\n</details>\n'",
+          "command": "echo '```'",
           "dryRunCommand": true,
           "pipe": true
         }
@@ -40,7 +45,12 @@
           "dryRunCommand": true
         },
         {
-          "command": "echo '<details>\n<summary><em><h4>Cargo Publish</h4></em></summary>\n\n```'",
+          "command": "echo \"# Cargo Publish\"",
+          "dryRunCommand": true,
+          "pipe": true
+        },
+        {
+          "command": "echo '```'",
           "dryRunCommand": true,
           "pipe": true
         },
@@ -50,13 +60,12 @@
           "pipe": true
         },
         {
-          "command": "echo '```\n\n</details>\n'",
+          "command": "echo '```'",
           "dryRunCommand": true,
           "pipe": true
         }
       ],
       "postpublish": [
-        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor } -f",
         "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor }.${ pkgFile.versionMinor } -f",
         "git push --tags -f"
       ],
@@ -77,7 +86,12 @@
           "dryRunCommand": true
         },
         {
-          "command": "echo '<details>\n<summary><em><h4>Yarn Audit</h4></em></summary>\n\n```'",
+          "command": "echo \"# Yarn Audit\n\"",
+          "dryRunCommand": true,
+          "pipe": true
+        },
+        {
+          "command": "echo '<details>\n<summary>click to view</summary>\n\n```'",
           "dryRunCommand": true,
           "pipe": true
         },
@@ -100,7 +114,12 @@
       "publish": [
         "sleep 15s",
         {
-          "command": "echo '<details>\n<summary><em><h4>Yarn Publish</h4></em></summary>\n\n```'",
+          "command": "echo \"# Yarn Package Publish\"",
+          "dryRunCommand": true,
+          "pipe": true
+        },
+        {
+          "command": "echo '```'",
           "dryRunCommand": true,
           "pipe": true
         },
@@ -110,13 +129,12 @@
           "pipe": true
         },
         {
-          "command": "echo '```\n\n</details>\n'",
+          "command": "echo '```'",
           "dryRunCommand": true,
           "pipe": true
         }
       ],
       "postpublish": [
-        "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor } -f",
         "git tag ${ pkg.pkg }-v${ pkgFile.versionMajor }.${ pkgFile.versionMinor } -f",
         "git push --tags -f"
       ]
@@ -138,7 +156,12 @@
           "dryRunCommand": true
         },
         {
-          "command": "echo '<details>\n<summary><em><h4>Yarn Audit</h4></em></summary>\n\n```'",
+          "command": "echo \"# Yarn Audit\n\"",
+          "dryRunCommand": true,
+          "pipe": true
+        },
+        {
+          "command": "echo '<details>\n<summary>click to view</summary>\n\n```'",
           "dryRunCommand": true,
           "pipe": true
         },
@@ -160,7 +183,12 @@
       ],
       "publish": [
         {
-          "command": "echo '<details>\n<summary><em><h4>Yarn Publish</h4></em></summary>\n\n```'",
+          "command": "echo \"# Yarn Package Publish\"",
+          "dryRunCommand": true,
+          "pipe": true
+        },
+        {
+          "command": "echo '```'",
           "dryRunCommand": true,
           "pipe": true
         },
@@ -170,7 +198,7 @@
           "pipe": true
         },
         {
-          "command": "echo '```\n\n</details>\n'",
+          "command": "echo '```'",
           "dryRunCommand": true,
           "pipe": true
         }
@@ -209,16 +237,7 @@
       "path": "./core/tauri-build",
       "manager": "rust",
       "dependencies": ["tauri-codegen", "tauri-utils"],
-      "postversion": [
-        "node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
-        "cargo build --manifest-path ../tauri-config-schema/Cargo.toml"
-      ],
-      "assets": [
-        {
-          "path": "./tooling/cli/schema.json",
-          "name": "schema.json"
-        }
-      ]
+      "postversion": "node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }"
     },
     "tauri": {
       "path": "./core/tauri",
@@ -235,11 +254,7 @@
       "path": "./tooling/cli/node",
       "manager": "javascript",
       "getPublishedVersion": "node ../../../.scripts/covector/package-latest-version.js npm ${ pkgFile.pkg.name } ${ pkgFile.pkg.version }",
-      "dependencies": ["cli.rs"],
-      "postversion": [
-        "node ../../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
-        "cargo build --manifest-path ../../../core/tauri-config-schema/Cargo.toml"
-      ],
+      "postversion": "node ../../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
       "prepublish": [],
       "publish": [],
       "postpublish": []
@@ -248,10 +263,7 @@
       "path": "./tooling/cli",
       "manager": "rust",
       "dependencies": ["tauri-bundler", "tauri-utils"],
-      "postversion": [
-        "cargo check",
-        "cargo build --manifest-path ../../core/tauri-config-schema/Cargo.toml"
-      ],
+      "postversion": "cargo check",
       "assets": [
         {
           "path": "${ pkg.path }/target/package/tauri-cli-${ pkgFile.version }.crate",

.changes/readme.md

@@ -1,31 +0,0 @@
-# Changes
-
-##### via https://github.com/jbolda/covector
-
-As you create PRs and make changes that require a version bump, please add a new markdown file in this folder. You do not note the version _number_, but rather the type of bump that you expect: major, minor, or patch. The filename is not important, as long as it is a `.md`, but we recommend that it represents the overall change for organizational purposes.
-
-When you select the version bump required, you do _not_ need to consider dependencies. Only note the package with the actual change, and any packages that depend on that package will be bumped automatically in the process.
-
-Use the following format:
-
-```md
----
-"package-a": patch
-"package-b": patch
----
-
-Change summary goes here
-
-```
-
-Summaries do not have a specific character limit, but are text only. These summaries are used within the (future implementation of) changelogs. They will give context to the change and also point back to the original PR if more details and context are needed.
-
-Changes will be designated as a `major`, `minor` or `patch` as further described in [semver](https://semver.org/).
-
-Given a version number MAJOR.MINOR.PATCH, increment the:
-
-- MAJOR version when you make incompatible API changes,
-- MINOR version when you add functionality in a backwards compatible manner, and
-- PATCH version when you make backwards compatible bug fixes.
-
-Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format, but will be discussed prior to usage (as extra steps will be necessary in consideration of merging and publishing).

.devcontainer/Dockerfile

@@ -5,7 +5,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
 
 # Derived from Tauri contribution and setup guides:
 # See: https://github.com/tauri-apps/tauri/blob/dev/.github/CONTRIBUTING.md#development-guide
-# See: https://tauri.app/v1/guides/getting-started/prerequisites/#setting-up-linux
+# See: https://tauri.studio/v1/guides/getting-started/prerequisites/#setting-up-linux
 ARG TAURI_BUILD_DEPS="build-essential curl libappindicator3-dev libgtk-3-dev librsvg2-dev libssl-dev libwebkit2gtk-4.0-dev wget"
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/README.md

@@ -24,7 +24,7 @@ Prerequisites are mainly derived from VS Code's instructions for usage of develo
 
 ### A note on filesystem performance
 
-Due to limitations in how Docker shares files between the Docker host and a container, it's also recommended that developers [clone Tauri source code into a container volume](https://code.visualstudio.com/remote/advancedcontainers/improve-performance#_use-clone-repository-in-container-volume). This is optional, but highly advised as many filesystem/IO heavy operations (`cargo build`, `yarn install`, etc) will be very slow if they operate on directories shared with a Docker container from the Docker host.
+Due to limititations in how Docker shares files between the Docker host and a container, it's also recommended that developers [clone Tauri source code into a container volume](https://code.visualstudio.com/remote/advancedcontainers/improve-performance#_use-clone-repository-in-container-volume). This is optional, but highly advised as many filesystem/IO heavy opearations (`cargo build`, `yarn install`, etc) will be very slow if they operate on directories shared with a Docker container from the Docker host.
 
 To do this, open your project with VS Code and run **Remote-Containers: Clone Repository in Container Volume...** from the Command Palette (<kbd>F1</kbd>).
 

.docker/cross/aarch64.Dockerfile

@@ -1,44 +0,0 @@
-FROM ubuntu:18.04
-ARG DEBIAN_FRONTEND=noninteractive
-
-COPY common.sh lib.sh /
-RUN /common.sh
-
-COPY cmake.sh /
-RUN /cmake.sh
-
-COPY xargo.sh /
-RUN /xargo.sh
-
-RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
-    g++-aarch64-linux-gnu \
-    libc6-dev-arm64-cross
-
-COPY deny-debian-packages.sh /
-RUN TARGET_ARCH=arm64 /deny-debian-packages.sh \
-    binutils \
-    binutils-aarch64-linux-gnu
-
-COPY qemu.sh /
-RUN /qemu.sh aarch64 softmmu
-
-COPY dropbear.sh /
-RUN /dropbear.sh
-
-COPY linux-image.sh /
-RUN /linux-image.sh aarch64
-
-COPY linux-runner /
-
-ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
-    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner aarch64" \
-    CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
-    CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
-    BINDGEN_EXTRA_CLANG_ARGS_aarch64_unknown_linux_gnu="--sysroot=/usr/aarch64-linux-gnu" \
-    QEMU_LD_PREFIX=/usr/aarch64-linux-gnu \
-    RUST_TEST_THREADS=1 \
-    PKG_CONFIG_PATH="/usr/lib/aarch64-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"
-
-RUN dpkg --add-architecture arm64
-RUN apt-get update
-RUN apt-get install --assume-yes --no-install-recommends libssl-dev:arm64 libdbus-1-dev:arm64 libsoup2.4-dev:arm64 libssl-dev:arm64 libgtk-3-dev:arm64 webkit2gtk-4.0-dev:arm64 libappindicator3-1:arm64 librsvg2-dev:arm64 patchelf:arm64

.docker/cross/cmake.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -euo pipefail
-
-# shellcheck disable=SC1091
-. lib.sh
-
-main() {
-    local version=3.23.1
-
-    install_packages curl
-
-    local td
-    td="$(mktemp -d)"
-
-    pushd "${td}"
-
-    curl --retry 3 -sSfL "https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-linux-x86_64.sh" -o cmake.sh
-    sh cmake.sh --skip-license --prefix=/usr/local
-
-    popd
-
-    purge_packages
-
-    rm -rf "${td}"
-    rm -rf /var/lib/apt/lists/*
-    rm "${0}"
-}
-
-main "${@}"

.docker/cross/common.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -euo pipefail
-
-# shellcheck disable=SC1091
-. lib.sh
-
-# For architectures except amd64 and i386, look for packages on ports.ubuntu.com instead.
-# This is important if you enable additional architectures so you can install libraries to cross-compile against.
-# Look for 'dpkg --add-architecture' in the README for more details.
-if grep -i ubuntu /etc/os-release >/dev/null; then
-    sed 's/http:\/\/\(.*\).ubuntu.com\/ubuntu\//[arch-=amd64,i386] http:\/\/ports.ubuntu.com\/ubuntu-ports\//g' /etc/apt/sources.list > /etc/apt/sources.list.d/ports.list
-    sed -i 's/http:\/\/\(.*\).ubuntu.com\/ubuntu\//[arch=amd64,i386] http:\/\/\1.archive.ubuntu.com\/ubuntu\//g' /etc/apt/sources.list
-fi
-
-install_packages \
-    autoconf \
-    automake \
-    binutils \
-    ca-certificates \
-    curl \
-    file \
-    gcc \
-    git \
-    libtool \
-    m4 \
-    make
-
-if_centos install_packages \
-    clang-devel \
-    gcc-c++ \
-    glibc-devel \
-    pkgconfig
-
-if_ubuntu install_packages \
-    g++ \
-    libc6-dev \
-    libclang-dev \
-    pkg-config

.docker/cross/deny-debian-packages.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -euo pipefail
-
-main() {
-    local package
-
-    for package in "${@}"; do
-        echo "Package: ${package}:${TARGET_ARCH}
-Pin: release *
-Pin-Priority: -1" > "/etc/apt/preferences.d/${package}"
-        echo "${package}"
-    done
-
-    rm "${0}"
-}
-
-main "${@}"

.docker/cross/dropbear.sh

@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -euo pipefail
-
-# shellcheck disable=SC1091
-. lib.sh
-
-main() {
-    local version=2022.82
-
-    install_packages \
-        autoconf \
-        automake \
-        bzip2 \
-        curl \
-        make
-
-    if_centos install_packages zlib-devel
-    if_ubuntu install_packages zlib1g-dev
-
-    local td
-    td="$(mktemp -d)"
-
-    pushd "${td}"
-
-    curl --retry 3 -sSfL "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2" -O
-    tar --strip-components=1 -xjf "dropbear-${version}.tar.bz2"
-
-    # Remove some unwanted message
-    sed -i '/skipping hostkey/d' cli-kex.c
-    sed -i '/failed to identify current user/d' cli-runopts.c
-
-    ./configure \
-       --disable-syslog \
-       --disable-shadow \
-       --disable-lastlog \
-       --disable-utmp \
-       --disable-utmpx \
-       --disable-wtmp \
-       --disable-wtmpx \
-       --disable-pututline \
-       --disable-pututxline
-
-    make "-j$(nproc)" PROGRAMS=dbclient
-    cp dbclient /usr/local/bin/
-
-    purge_packages
-
-    popd
-
-    rm -rf "${td}"
-    rm "${0}"
-}
-
-main "${@}"

.docker/cross/lib.sh

@@ -1,45 +0,0 @@
-purge_list=()
-
-install_packages() {
-    if grep -i ubuntu /etc/os-release; then
-        apt-get update
-
-        for pkg in "${@}"; do
-            if ! dpkg -L "${pkg}" >/dev/null 2>/dev/null; then
-                apt-get install --assume-yes --no-install-recommends "${pkg}"
-
-                purge_list+=( "${pkg}" )
-            fi
-        done
-    else
-        for pkg in "${@}"; do
-            if ! yum list installed "${pkg}" >/dev/null 2>/dev/null; then
-                yum install -y "${pkg}"
-
-                purge_list+=( "${pkg}" )
-            fi
-        done
-    fi
-}
-
-purge_packages() {
-    if (( ${#purge_list[@]} )); then
-        if grep -i ubuntu /etc/os-release; then
-            apt-get purge --assume-yes --auto-remove "${purge_list[@]}"
-        else
-            yum remove -y "${purge_list[@]}"
-        fi
-    fi
-}
-
-if_centos() {
-    if grep -q -i centos /etc/os-release; then
-        eval "${@}"
-    fi
-}
-
-if_ubuntu() {
-    if grep -q -i ubuntu /etc/os-release; then
-        eval "${@}"
-    fi
-}

.docker/cross/linux-image.sh

@@ -1,274 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -euo pipefail
-
-# shellcheck disable=SC1091
-. lib.sh
-
-main() {
-    # arch in the rust target
-    local arch="${1}" \
-          kversion=4.19.0-20
-
-    local debsource="deb http://http.debian.net/debian/ buster main"
-    debsource="${debsource}\ndeb http://security.debian.org/ buster/updates main"
-
-    local dropbear="dropbear-bin"
-
-    local -a deps
-    local kernel=
-    local libgcc="libgcc1"
-
-    # select debian arch and kernel version
-    case "${arch}" in
-        aarch64)
-            arch=arm64
-            kernel="${kversion}-arm64"
-            ;;
-        armv7)
-            arch=armhf
-            kernel="${kversion}-armmp"
-            ;;
-        i686)
-            arch=i386
-            kernel="${kversion}-686"
-            ;;
-        mips|mipsel)
-            kernel="${kversion}-4kc-malta"
-            ;;
-        mips64el)
-            kernel="${kversion}-5kc-malta"
-            ;;
-        powerpc)
-            # there is no buster powerpc port, so we use jessie
-            # use a more recent kernel from backports
-            kversion='4.9.0-0.bpo.6'
-            kernel="${kversion}-powerpc"
-            debsource="deb http://archive.debian.org/debian jessie main"
-            debsource="${debsource}\ndeb http://archive.debian.org/debian jessie-backports main"
-            debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unstable main"
-            debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
-
-            # archive.debian.org Release files are expired.
-            echo "Acquire::Check-Valid-Until false;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid
-            echo "APT::Get::AllowUnauthenticated true;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid
-
-            dropbear="dropbear"
-            deps=(libcrypt1:"${arch}")
-            ;;
-        powerpc64)
-            # there is no stable port
-            arch=ppc64
-            # https://packages.debian.org/en/sid/linux-image-powerpc64
-            kversion='5.*'
-            kernel="${kversion}-powerpc64"
-            libgcc="libgcc-s1"
-            debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
-            debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
-            # sid version of dropbear requires these dependencies
-            deps=(libcrypt1:"${arch}")
-            ;;
-        powerpc64le)
-            arch=ppc64el
-            kernel="${kversion}-powerpc64le"
-            ;;
-        s390x)
-            arch=s390x
-            kernel="${kversion}-s390x"
-            ;;
-        sparc64)
-            # there is no stable port
-            # https://packages.debian.org/en/sid/linux-image-sparc64
-            kernel='*-sparc64'
-            libgcc="libgcc-s1"
-            debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
-            debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
-            # sid version of dropbear requires these dependencies
-            deps=(libcrypt1:"${arch}")
-            ;;
-        x86_64)
-            arch=amd64
-            kernel="${kversion}-amd64"
-            ;;
-        *)
-            echo "Invalid arch: ${arch}"
-            exit 1
-            ;;
-    esac
-
-    install_packages ca-certificates \
-        curl \
-        cpio \
-        sharutils \
-        gnupg
-
-    # Download packages
-    mv /etc/apt/sources.list /etc/apt/sources.list.bak
-    echo -e "${debsource}" > /etc/apt/sources.list
-
-    # Old ubuntu does not support --add-architecture, so we directly change multiarch file
-    if [ -f /etc/dpkg/dpkg.cfg.d/multiarch ]; then
-        cp /etc/dpkg/dpkg.cfg.d/multiarch /etc/dpkg/dpkg.cfg.d/multiarch.bak
-    fi
-    dpkg --add-architecture "${arch}" || echo "foreign-architecture ${arch}" > /etc/dpkg/dpkg.cfg.d/multiarch
-
-    # Add Debian keys.
-    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/archive-key-{7.0,8,9,10}.asc' -O
-    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/archive-key-{8,9,10}-security.asc' -O
-    curl --retry 3 -sSfL 'https://ftp-master.debian.org/keys/release-{7,8,9,10}.asc' -O
-    curl --retry 3 -sSfL 'https://www.ports.debian.org/archive_{2020,2021,2022}.key' -O
-
-    for key in *.asc *.key; do
-      apt-key add "${key}"
-      rm "${key}"
-    done
-
-    # allow apt-get to retry downloads
-    echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries
-
-    apt-get update
-
-    mkdir -p "/qemu/${arch}"
-    chmod 777 /qemu "/qemu/${arch}"
-
-    cd "/qemu/${arch}"
-    apt-get -d --no-install-recommends download \
-        ${deps[@]+"${deps[@]}"} \
-        "busybox:${arch}" \
-        "${dropbear}:${arch}" \
-        "libtommath1:${arch}" \
-        "libtomcrypt1:${arch}" \
-        "libgmp10:${arch}" \
-        "libc6:${arch}" \
-        "${libgcc}:${arch}" \
-        "libstdc++6:${arch}" \
-        "linux-image-${kernel}:${arch}" \
-        ncurses-base \
-        "zlib1g:${arch}"
-    cd /qemu
-
-    # Install packages
-    root="root-${arch}"
-    mkdir -p "${root}"/{bin,etc/dropbear,root,sys,dev,proc,sbin,tmp,usr/{bin,sbin},var/log}
-    for deb in "${arch}"/*deb; do
-        dpkg -x "${deb}" "${root}"/
-    done
-
-    cp "${root}/boot/vmlinu"* kernel
-
-    # initrd
-    mkdir -p "${root}/modules"
-    cp -v \
-        "${root}/lib/modules"/*/kernel/drivers/net/net_failover.ko \
-        "${root}/lib/modules"/*/kernel/drivers/net/virtio_net.ko \
-        "${root}/lib/modules"/*/kernel/drivers/virtio/* \
-        "${root}/lib/modules"/*/kernel/fs/netfs/netfs.ko \
-        "${root}/lib/modules"/*/kernel/fs/9p/9p.ko \
-        "${root}/lib/modules"/*/kernel/fs/fscache/fscache.ko \
-        "${root}/lib/modules"/*/kernel/net/9p/9pnet.ko \
-        "${root}/lib/modules"/*/kernel/net/9p/9pnet_virtio.ko \
-        "${root}/lib/modules"/*/kernel/net/core/failover.ko \
-        "${root}/modules" || true # some file may not exist
-    rm -rf "${root:?}/boot"
-    rm -rf "${root:?}/lib/modules"
-
-    cat << 'EOF' > "${root}/etc/hosts"
-127.0.0.1 localhost qemu
-EOF
-
-    cat << 'EOF' > $root/etc/hostname
-qemu
-EOF
-
-    cat << 'EOF' > $root/etc/passwd
-root::0:0:root:/root:/bin/sh
-EOF
-
-cat << 'EOF' | uudecode -o $root/etc/dropbear/dropbear_rsa_host_key
-begin 600 dropbear_rsa_host_key
-M````!W-S:"UR<V$````#`0`!```!`0"N!-<%K,3Z.!Z,OEMB2.N\O.$IWQ*F
-M#5%(_;(^2YKY_J_.RQW/7U@_MK&J#!Z0_\;EH#98ZW*E1\.<FF%P/*Y.W56-
-M31.'EJE`TN@=T5EC(8"Y%3'ZBYH)^WIVJ]S*G/_;#RH\_?S"U^1L_<<.F`O+
-MZVI?*]\KTDOT&QV0#B-M;"%_7:\>+3[X=QMH,B<HM$+0E[\B6*^!XKLR@V,K
-M)<V80HHK:_#;D]26XKN&CB./EZAC%4)78R!G""4HT@UK<5I4B^$/""`,?*\T
-M>*4$RYULV,V3X6]K:7@Q?80"#WXGGQZNFN6CZ7LTDX(F6J[\]F5<0`HEOF:Z
-MX;^53`L'4I/A```!``$L:$Z*#6<^3@+O%.[-#/5H+.C'3\#QQZN[1;J>L`8I
-MZ_&T'!"J'/Y+?R?55G:M^=]R*-&I3TOJYZA8@&H51ZOAF59'1_>>Z@?E4#)$
-MQU)X/RWH51ZB5KSDWJS:D'7GD(!?NAY`C'7\)I:_4)J")QBV/P"RJQGHG'%B
-M1BT2LE6676>`1K,0\NIMZTKQNB(IC+88<7#8%_-=P<&6<"9LH>60TSS?3?-C
-MN`T36YB/3^<(Q;`N1NT>I9EZS`BAC^-?.:,R\7EL"<4>7E=]^1]B\K9])AQU
-MBM\]M;4V(S(6KH-I.4[6>9E+@\UEM.J6:[2LUEEJDG:G:+:/EVF^Y75@(S$`
-M``"!`.O+KW=&*CBCHL"11&SVO4/K]$R-]7MV7,3RR)Q[X'0;6.?4JHW!3VR6
-M*FGBY--37ZD-+UV.8_+"$<?B"#&K$.[V)F7V2\UY!7(0FZ@A2`0ADDY*J-_B
-M4AU&.*GP#F/!I([:?E],.>6PH9)(/E.\G19#G0K`LRM?JWS!58&;D0C1````
-M@0"\[@NYWSTW(?Q@:_A*1Y3/AKYO5?S=0"<2>#V-AH6W-NCSDTSRP=2D79FS
-M"D?[;.)V>8'#9&I3"MU@+:2\Z%$0-MG0+J'(0>T1_C6?*C=4U0I$DI<=@D]1
-H_&DE8Y(OT%%EPG]!$H&5HX*),_D1A2\P=R.7G'`0L%YM-79Y"T">$0``
-`
-end
-EOF
-
-    # dropbear complains when this file is missing
-    touch "${root}/var/log/lastlog"
-
-    cat << 'EOF' > $root/init
-#!/bin/busybox sh
-
-set -e
-
-/bin/busybox --install
-
-mount -t devtmpfs devtmpfs /dev
-mount -t proc none /proc
-mount -t sysfs none /sys
-mkdir /dev/pts
-mount -t devpts none /dev/pts/
-
-# some archs does not have virtio modules
-insmod /modules/failover.ko || true
-insmod /modules/net_failover.ko || true
-insmod /modules/virtio.ko || true
-insmod /modules/virtio_ring.ko || true
-insmod /modules/virtio_mmio.ko || true
-insmod /modules/virtio_pci_legacy_dev.ko || true
-insmod /modules/virtio_pci_modern_dev.ko || true
-insmod /modules/virtio_pci.ko || true
-insmod /modules/virtio_net.ko || true
-insmod /modules/netfs.ko || true
-insmod /modules/fscache.ko
-insmod /modules/9pnet.ko
-insmod /modules/9pnet_virtio.ko || true
-insmod /modules/9p.ko
-
-ifconfig lo 127.0.0.1
-ifconfig eth0 10.0.2.15
-route add default gw 10.0.2.2 eth0
-
-mkdir /target
-mount -t 9p -o trans=virtio target /target -oversion=9p2000.u || true
-
-exec dropbear -F -E -B
-EOF
-
-    chmod +x "${root}/init"
-    cd "${root}"
-    find . | cpio --create --format='newc' --quiet | gzip > ../initrd.gz
-    cd -
-
-    # Clean up
-    rm -rf "/qemu/${root}" "/qemu/${arch}"
-    mv -f /etc/apt/sources.list.bak /etc/apt/sources.list
-    if [ -f /etc/dpkg/dpkg.cfg.d/multiarch.bak ]; then
-        mv /etc/dpkg/dpkg.cfg.d/multiarch.bak /etc/dpkg/dpkg.cfg.d/multiarch
-    fi
-    # can fail if arch is used (amd64 and/or i386)
-    dpkg --remove-architecture "${arch}" || true
-    apt-get update
-
-    purge_packages
-
-    ls -lh /qemu
-}
-
-main "${@}"

.docker/cross/linux-runner

@@ -1,173 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-LOG=/tmp/qemu.log
-LOCK=/tmp/qemu.lock
-
-if [ -n "${CROSS_DEBUG}" ]; then
-    set -x
-fi
-
-# arch in the rust target
-arch="${1}"
-shift
-
-if [ "${CROSS_RUNNER}" = "" ]; then
-    if [[ "${arch}" == i?86 ]] || [[ "${arch}" == x86_64 ]]; then
-        CROSS_RUNNER=native
-    else
-        CROSS_RUNNER=qemu-user
-    fi
-fi
-
-# select qemu arch
-qarch="${arch}"
-case "${arch}" in
-    armv7)
-        qarch="arm"
-        ;;
-    i686)
-        qarch="i386"
-        ;;
-    powerpc)
-        qarch="ppc"
-        ;;
-    powerpc64)
-        qarch="ppc64"
-        ;;
-    powerpc64le)
-        if [ "${CROSS_RUNNER}" = "qemu-user" ]; then
-            qarch="ppc64le"
-        else
-            qarch="ppc64"
-        fi
-        ;;
-esac
-
-case "${CROSS_RUNNER}" in
-    native)
-        exec "${@}"
-        ;;
-    qemu-user)
-        exec "qemu-${qarch}" "${@}"
-        ;;
-    qemu-system)
-        true
-        ;;
-    *)
-        echo "Invalid runner: \"${CROSS_RUNNER}\"";
-        echo "Valid runners are: native, qemu-user and qemu-system"
-        exit 1
-        ;;
-esac
-
-n="$(nproc)"
-memory=1G
-driver9p="virtio-9p-pci"
-drivernet="virtio-net-pci"
-
-# select qemu parameters
-case "${arch}" in
-    aarch64)
-        # 8 is the max number of cpu supported by qemu-aarch64
-        n=$(( n > 8 ? 8 : n ))
-        opt="-machine virt -cpu cortex-a57"
-        ;;
-    armv7)
-        opt="-machine virt"
-        driver9p="virtio-9p-device"
-        drivernet="virtio-net-device"
-        ;;
-    i686)
-        opt="-append console=ttyS0"
-        ;;
-    mips|mipsel)
-        # avoid kernel error
-        # https://blahcat.github.io/2017/07/14/building-a-debian-stretch-qemu-image-for-mipsel/
-        opt="-append nokaslr"
-        n=1
-        ;;
-    mips64el)
-        # avoid kernel error
-        # https://blahcat.github.io/2017/07/14/building-a-debian-stretch-qemu-image-for-mipsel/
-        opt="-append nokaslr -cpu MIPS64R2-generic"
-        n=1
-        ;;
-    powerpc)
-        opt="-append console=ttyPZ0"
-        n=1
-        ;;
-    powerpc64|powerpc64le)
-        opt="-append console=hvc0 --nodefaults -serial stdio"
-        ;;
-    s390x)
-        n=1
-        driver9p="virtio-9p-ccw"
-        drivernet="virtio-net-ccw"
-        ;;
-    sparc64)
-        n=1
-        driver9p+=",bus=pciB"
-        drivernet+=",bus=pciB"
-        ;;
-    x86_64)
-        opt="-append console=ttyS0"
-        ;;
-esac
-
-(
-    flock -n 200 || exit 0
-
-    echo Booting QEMU virtual machine with $n cpus...
-
-    QEMU_CMD="qemu-system-${qarch} \
-        -m ${memory} \
-        -smp ${n} \
-        -nographic \
-        -monitor none \
-        -netdev user,id=net0,hostfwd=tcp::10022-:22 \
-        -device ${drivernet},netdev=net0 \
-        -kernel /qemu/kernel \
-        -initrd /qemu/initrd.gz \
-        ${opt} \
-        -fsdev local,id=fs0,path=/target,security_model=mapped \
-        -device ${driver9p},fsdev=fs0,mount_tag=target"
-
-    touch "${LOG}"
-    if [[ -n "${CROSS_DEBUG}" ]]; then
-        (${QEMU_CMD} 2>&1 | tee -a "${LOG}") &
-    else
-        ${QEMU_CMD} >> "${LOG}" 2>&1 &
-    fi
-
-    # wait for dropbear
-    for _ in $(seq 240); do
-        if grep -q "Not backgrounding" "${LOG}"; then
-            READY=1
-            break
-        fi
-        sleep 0.5s
-    done
-
-    if [ -z "${READY}" ]; then
-        if [ -n "${CROSS_DEBUG}" ]; then
-            echo "Not ready but continuing because CROSS_DEBUG is set"
-        else
-            echo "Qemu is not ready after ${SECONDS} seconds..."
-            echo "Set the environment variable CROSS_DEBUG=1 to debug"
-            echo "Last 100 lines of qemu output:"
-            tail -n 100 "${LOG}"
-            exit 1
-        fi
-    fi
-
-    echo "Booted in ${SECONDS} seconds"
-
-) 200>"${LOCK}"
-
-if [[ -t 1 ]] && [[ -t 2 ]]; then
-  tty_flag='-t'
-fi
-
-exec dbclient ${tty_flag} -p 10022 -y -y root@localhost "${@}"

.docker/cross/qemu.sh

@@ -1,233 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -euo pipefail
-
-# shellcheck disable=SC1091
-. lib.sh
-
-build_static_libffi () {
-    local version=3.0.13
-
-    local td
-    td="$(mktemp -d)"
-
-    pushd "${td}"
-
-
-    curl --retry 3 -sSfL "https://github.com/libffi/libffi/archive/refs/tags/v${version}.tar.gz" -O -L
-    tar --strip-components=1 -xzf "v${version}.tar.gz"
-    ./configure --prefix="$td"/lib --disable-builddir --disable-shared --enable-static
-    make "-j$(nproc)"
-    install -m 644 ./.libs/libffi.a /usr/lib64/
-
-    popd
-
-    rm -rf "${td}"
-}
-
-build_static_libmount () {
-    local version_spec=2.23.2
-    local version=2.23
-    local td
-    td="$(mktemp -d)"
-
-    pushd "${td}"
-
-    curl --retry 3 -sSfL "https://kernel.org/pub/linux/utils/util-linux/v${version}/util-linux-${version_spec}.tar.xz" -O -L
-    tar --strip-components=1 -xJf "util-linux-${version_spec}.tar.xz"
-    ./configure --disable-shared --enable-static --without-ncurses
-    make "-j$(nproc)" mount blkid
-    install -m 644 ./.libs/*.a /usr/lib64/
-
-    popd
-
-    rm -rf "${td}"
-}
-
-
-build_static_libattr() {
-    local version=2.4.46
-
-    local td
-    td="$(mktemp -d)"
-
-    pushd "${td}"
-
-    yum install -y gettext
-
-    curl --retry 3 -sSfL "https://download.savannah.nongnu.org/releases/attr/attr-${version}.src.tar.gz" -O
-    tar --strip-components=1 -xzf "attr-${version}.src.tar.gz"
-    cp /usr/share/automake*/config.* .
-
-    ./configure
-    make "-j$(nproc)"
-    install -m 644 ./libattr/.libs/libattr.a /usr/lib64/
-
-    yum remove -y gettext
-
-    popd
-
-    rm -rf "${td}"
-}
-
-build_static_libcap() {
-    local version=2.22
-
-    local td
-    td="$(mktemp -d)"
-
-    pushd "${td}"
-
-    curl --retry 3 -sSfL "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${version}.tar.xz" -O
-    tar --strip-components=1 -xJf "libcap-${version}.tar.xz"
-    make "-j$(nproc)"
-    install -m 644 libcap/libcap.a /usr/lib64/
-
-    popd
-
-    rm -rf "${td}"
-}
-
-build_static_pixman() {
-    local version=0.34.0
-
-    local td
-    td="$(mktemp -d)"
-
-    pushd "${td}"
-
-    curl --retry 3 -sSfL "https://www.cairographics.org/releases/pixman-${version}.tar.gz" -O
-    tar --strip-components=1 -xzf "pixman-${version}.tar.gz"
-    ./configure
-    make "-j$(nproc)"
-    install -m 644 ./pixman/.libs/libpixman-1.a /usr/lib64/
-
-    popd
-
-    rm -rf "${td}"
-}
-
-main() {
-    local version=5.1.0
-
-    if_centos version=4.2.1
-
-    local arch="${1}" \
-          softmmu="${2:-}"
-
-    install_packages \
-        autoconf \
-        automake \
-        bison \
-        bzip2 \
-        curl \
-        flex \
-        libtool \
-        make \
-        patch \
-        python3 \
-
-    if_centos install_packages \
-        gcc-c++ \
-        pkgconfig \
-        xz \
-        glib2-devel \
-        glib2-static \
-        glibc-static \
-        libattr-devel \
-        libcap-devel \
-        libfdt-devel \
-        pcre-static \
-        pixman-devel \
-        libselinux-devel \
-        libselinux-static \
-        libffi \
-        libuuid-devel \
-        libblkid-devel \
-        libmount-devel \
-        zlib-devel \
-        zlib-static
-
-    if_centos 'curl --retry 3 -sSfL "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" -o /usr/share/automake*/config.guess'
-    if_centos 'curl --retry 3 -sSfL "https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" -o /usr/share/automake*/config.sub'
-
-    # these are not packaged as static libraries in centos; build them manually
-    if_centos build_static_libffi
-    if_centos build_static_libmount
-    if_centos build_static_libattr
-    if_centos build_static_libcap
-    if_centos build_static_pixman
-
-    if_ubuntu install_packages \
-        g++ \
-        pkg-config \
-        xz-utils \
-        libattr1-dev \
-        libcap-ng-dev \
-        libffi-dev \
-        libglib2.0-dev \
-        libpixman-1-dev \
-        libselinux1-dev \
-        zlib1g-dev
-
-    # if we have python3.6+, we can install qemu 6.1.0, which needs ninja-build
-    # ubuntu 16.04 only provides python3.5, so remove when we have a newer qemu.
-    is_ge_python36=$(python3 -c "import sys; print(int(sys.version_info >= (3, 6)))")
-    if [[ "${is_ge_python36}" == "1" ]]; then
-        if_ubuntu version=6.1.0
-        if_ubuntu install_packages ninja-build
-    fi
-
-    local td
-    td="$(mktemp -d)"
-
-    pushd "${td}"
-
-    curl --retry 3 -sSfL "https://download.qemu.org/qemu-${version}.tar.xz" -O
-    tar --strip-components=1 -xJf "qemu-${version}.tar.xz"
-
-    local targets="${arch}-linux-user"
-    local virtfs=""
-    case "${softmmu}" in
-        softmmu)
-            if [ "${arch}" = "ppc64le" ]; then
-                targets="${targets},ppc64-softmmu"
-            else
-                targets="${targets},${arch}-softmmu"
-            fi
-            virtfs="--enable-virtfs"
-            ;;
-        "")
-            true
-            ;;
-        *)
-            echo "Invalid softmmu option: ${softmmu}"
-            exit 1
-            ;;
-    esac
-
-    ./configure \
-        --disable-kvm \
-        --disable-vnc \
-        --disable-guest-agent \
-        --enable-linux-user \
-        --static \
-        ${virtfs} \
-        --target-list="${targets}"
-    make "-j$(nproc)"
-    make install
-
-    # HACK the binfmt_misc interpreter we'll use expects the QEMU binary to be
-    # in /usr/bin. Create an appropriate symlink
-    ln -s "/usr/local/bin/qemu-${arch}" "/usr/bin/qemu-${arch}-static"
-
-    purge_packages
-
-    popd
-
-    rm -rf "${td}"
-    rm "${0}"
-}
-
-main "${@}"

.docker/cross/xargo.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -euo pipefail
-
-# shellcheck disable=SC1091
-. lib.sh
-
-main() {
-    install_packages ca-certificates curl
-
-    export RUSTUP_HOME=/tmp/rustup
-    export CARGO_HOME=/tmp/cargo
-
-    curl --retry 3 -sSfL https://sh.rustup.rs -o rustup-init.sh
-    sh rustup-init.sh -y --no-modify-path --profile minimal
-    rm rustup-init.sh
-
-    PATH="${CARGO_HOME}/bin:${PATH}" cargo install xargo --root /usr/local
-
-    rm -r "${RUSTUP_HOME}" "${CARGO_HOME}"
-
-    purge_packages
-
-    rm "${0}"
-}
-
-main "${@}"

.github/CODE_OF_CONDUCT.md

@@ -61,7 +61,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[contact@tauri.app](mailto:contact@tauri.app).
+[contact@tauri.studio](mailto:contact@tauri.studio).
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/CONTRIBUTING.md

@@ -48,9 +48,9 @@ Hi! We, the maintainers, are really excited that you are interested in contribut
 
 First, [join our Discord server](https://discord.gg/SpmNs4S) and let us know that you want to contribute. This way we can point you in the right direction and help ensure your contribution will be as helpful as possible.
 
-To set up your machine for development, follow the [Tauri setup guide](https://tauri.app/v1/guides/getting-started/prerequisites/) to get all the tools you need to develop Tauri apps. The only additional tool you may need is [Yarn](https://yarnpkg.com/), it is only required if you are developing the Node CLI or API packages (`tooling/cli/node` and `tooling/api`). Next, fork and clone this repo. It is structured as a monorepo, which means that all the various Tauri packages are under the same repository. The development process varies depending on what part of Tauri you are contributing to, see the guides below for per-package instructions.
+To set up your machine for development, follow the [Tauri setup guide](https://tauri.studio/guides/getting-started/prerequisites/) to get all the tools you need to develop Tauri apps. The only additional tool you may need is [Yarn](https://yarnpkg.com/), it is only required if you are developing the Node CLI or API packages (`tooling/cli/node` and `tooling/api`). Next, fork and clone this repo. It is structured as a monorepo, which means that all the various Tauri packages are under the same repository. The development process varies depending on what part of Tauri you are contributing to, see the guides below for per-package instructions.
 
-Some Tauri packages will be automatically built when running one of the examples. Others, however, will need to be built beforehand. To build these automatically, run the `.scripts/setup.sh` (Linux and macOS) or `.scripts/setup.ps1` (Windows) script. This will install the Rust and Node.js CLI and build the JS API. After that, you should be able to run all the examples. Note that the setup script should be executed from the root folder of the repository in order to run correctly.
+Some Tauri packages will be automatically built when running one of the examples. Others, however, will need to be built beforehand. To build these automatically, run the `.scripts/setup.sh` (Linux and macOS) or `.scripts/setup.ps1` (Windows) script. This will install the Rust and Node.js CLI and build the JS API. After that, you should be able to run all the examples. Note that the setup script should be executed from the root folder of the respository in order to run correctly.
 
 ### Packages Overview
 
@@ -87,4 +87,4 @@ The JS API provides bindings between the developer's JS in the Webview and the b
 
 ## Financial Contribution
 
-Tauri is an MIT-licensed open source project. Its ongoing development can be supported via [GitHub Sponsors](https://github.com/sponsors/nothingismagick) or [Open Collective](https://opencollective.com/tauri). We prefer GitHub Sponsors as donations made are doubled through the matching fund program.
+Tauri is an MIT-licensed open source project. Its ongoing development can be supported via [Github Sponsors](https://github.com/sponsors/nothingismagick) or [Open Collective](https://opencollective.com/tauri). We prefer Github Sponsors as donations made are doubled through the matching fund program.

.github/FUNDING.yml

@@ -1,10 +1,6 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
 # These are supported funding model platforms
 
-github: tauri-apps
+github: nothingismagick
 patreon: #
 open_collective: tauri
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,3 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
 name: 🐞 Bug Report
 title: '[bug] '
 description: Report a bug
@@ -30,10 +26,11 @@ body:
     id: reproduction
     attributes:
       label: Reproduction
-      description: A link to a reproduction repo or steps to reproduce the behaviour.
+      description: Steps to reproduce the behavior.
       placeholder: |
-        Please provide a minimal reproduction or steps to reproduce, see this guide https://stackoverflow.com/help/minimal-reproducible-example
-        Why reproduction is required? see this article https://antfu.me/posts/why-reproductions-are-required
+        1. Go to ...
+        2. Click on ...
+        3. See error
 
   - type: textarea
     id: expected-behavior
@@ -46,7 +43,7 @@ body:
     attributes:
       label: Platform and versions
       description: "Output of `npm run tauri info` or `cargo tauri info`"
-      render: text
+      render: shell
     validations:
       required: true
 
@@ -54,8 +51,8 @@ body:
     id: logs
     attributes:
       label: Stack trace
-      render: text
-
+      render: shell
+  
   - type: textarea
     id: context
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,3 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
 contact_links:
   - name: 💬 Discord Chat
     url: https://discord.com/invite/tauri

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,3 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
 name: 💡 Feature Request
 title: '[feat] '
 description: Suggest an idea

.github/config.yml

@@ -1,3 +0,0 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT

.github/workflows/artifacts-updater.yml

@@ -1,19 +1,24 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
 name: updater test artifacts
 on:
-  schedule:
-    - cron: '0 0 * * *'
+  push:
+    branches:
+      - dev
+      - next
   pull_request:
     paths:
       - '.github/workflows/artifacts-updater.yml'
+      - 'core/tauri/**'
+      - 'tooling/cli/**'
+      - 'tooling/bundler/**'
       - 'examples/updater/**'
-  workflow_dispatch:
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
 
 concurrency:
@@ -21,7 +26,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-artifacts:
+  build-artifacs:
     runs-on: ${{ matrix.platform }}
 
     strategy:
@@ -40,13 +45,61 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
+
+      - name: Get current date
+        if: matrix.platform == 'windows-latest'
+        run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: |
-            core -> ../target
-            tooling/cli
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache core cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_core
+        with:
+          path: target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache CLI cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_cli
+        with:
+          path: tooling/cli/target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
 
       - name: build and install cli.rs
         run: cargo install --path tooling/cli --force
@@ -57,14 +110,13 @@ jobs:
         run: |
           echo "Enable code signing: ${{ env.ENABLE_CODE_SIGNING != '' }}"
           echo "::set-output name=enabled::${{ env.ENABLE_CODE_SIGNING != '' }}"
-
       # run only on tauri-apps/tauri repo (require secrets)
       - name: build sample artifacts + code signing (updater)
         if: steps.enablecodesigning.outputs.enabled == 'true'
         working-directory: ./examples/updater
         run: |
           yarn install
-          cargo tauri build --verbose
+          cargo tauri build
         env:
           # Notarization (disabled)
           # FIXME: enable only on `dev` push maybe? as it take some times...
@@ -78,17 +130,15 @@ jobs:
           APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
           # Updater signature is exposed here to make sure it works in PR's
           TAURI_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg==
-          TAURI_KEY_PASSWORD:
       # run on PRs and forks
       - name: build sample artifacts (updater)
         if: steps.enablecodesigning.outputs.enabled != 'true'
         working-directory: ./examples/updater
         run: |
           yarn install
-          cargo tauri build --verbose
+          cargo tauri build
         env:
           TAURI_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg==
-          TAURI_KEY_PASSWORD:
       # upload assets
       - uses: actions/upload-artifact@v2
         if: matrix.platform == 'ubuntu-latest'

.github/workflows/audit.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 

.github/workflows/bench.yml

@@ -1,7 +1,3 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
 name: benches
 
 on:
@@ -13,8 +9,8 @@ on:
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
-  LC_ALL: en_US.UTF-8 # This prevents strace from changing it's number format to use commas.
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -27,7 +23,7 @@ jobs:
       matrix:
         rust: [nightly]
         platform:
-          - { target: x86_64-unknown-linux-gnu, os: ubuntu-20.04 }
+          - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest }
 
     runs-on: ${{ matrix.platform.os }}
 
@@ -38,30 +34,72 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           override: true
-          default: true
           components: rust-src
           target: ${{ matrix.platform.target }}
 
       - name: setup python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: '3.x'
           architecture: x64
 
-      - name: install dependencies
+      - name: install depedencies
         run: |
           python -m pip install --upgrade pip
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev xvfb
+          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf xvfb
           wget https://github.com/sharkdp/hyperfine/releases/download/v1.11.0/hyperfine_1.11.0_amd64.deb
           sudo dpkg -i hyperfine_1.11.0_amd64.deb
           pip install memory_profiler
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: |
-            core -> ../target
-            tooling/bench/tests
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache core cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_core
+        with:
+          path: target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-${{ matrix.rust }}-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-${{ matrix.rust }}-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}
+            ${{ matrix.platform }}-${{ matrix.rust }}-${{ env.cache-name }}-
+            ${{ matrix.platform }}-${{ matrix.rust }}-
+            ${{ matrix.platform }}-
+
+      - name: cache cargo `tooling/bench/tests` target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_benches
+        with:
+          path: tooling/bench/tests/target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-${{ matrix.rust }}-${{ env.cache-name }}-${{ hashFiles('tooling/bench/tests/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-${{ matrix.rust }}-${{ env.cache-name }}-${{ hashFiles('tooling/bench/tests/Cargo.lock') }}
+            ${{ matrix.platform }}-${{ matrix.rust }}-${{ env.cache-name }}-
+            ${{ matrix.platform }}-${{ matrix.rust }}-
+            ${{ matrix.platform }}-
 
       - name: run benchmarks
         run: |
@@ -88,7 +126,7 @@ jobs:
           git commit --message "Update Tauri benchmarks"
           git push origin gh-pages
 
-      - name: Print worker info
+      - name: Worker info
         run: |
           cat /proc/cpuinfo
           cat /proc/meminfo

.github/workflows/change-status-on-PR.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 

.github/workflows/check-generated-files.yml

@@ -1,96 +0,0 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
-name: Check generated files
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/check-generated-files.yml'
-      - 'tooling/api/src/**'
-      - 'core/tauri/scripts/bundle.global.js'
-      - 'core/tauri-utils/src/config.rs'
-      - 'tooling/cli/schema.json'
-      - 'core/tauri-config-schema/schema.json'
-  push:
-    branches:
-      - dev
-    paths:
-      - '.github/workflows/check-generated-files.yml'
-      - 'tooling/api/src/**'
-      - 'core/tauri/scripts/bundle.global.js'
-      - 'core/tauri-utils/src/config.rs'
-      - 'tooling/cli/schema.json'
-      - 'core/tauri-config-schema/schema.json'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  changes:
-    runs-on: ubuntu-latest
-    outputs:
-      api: ${{ steps.filter.outputs.api }}
-      schema: ${{ steps.filter.outputs.schema }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            api:
-              - 'tooling/api/src/**'
-              - 'tooling/api/docs/js-api.json'
-              - 'core/tauri/scripts/bundle.global.js'
-            schema:
-              - 'core/tauri-utils/src/config.rs'
-              - 'tooling/cli/schema.json'
-              - 'core/tauri-config-schema/schema.json'
-
-  check-api:
-    runs-on: ubuntu-latest
-    needs: changes
-    if: needs.changes.outputs.api == 'true'
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: build api
-        working-directory: tooling/api
-        run: yarn && yarn build
-      - name: check api
-        run: |
-          git restore tooling/api/docs/js-api.json
-          ./.scripts/ci/has-diff.sh
-
-  check-schema:
-    runs-on: ubuntu-latest
-    needs: changes
-    if: needs.changes.outputs.schema == 'true'
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: install stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-
-      - name: install Linux dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: core -> ../target
-
-      - name: generate schema.json
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --manifest-path ./core/tauri-config-schema/Cargo.toml
-
-      - name: check schema
-        run: ./.scripts/ci/has-diff.sh

.github/workflows/check-license-header.yml

@@ -1,28 +0,0 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
-name: Check generated files
-
-on:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          list-files: shell
-          filters: |
-            added:
-              - added: '**'
-      - name: check header license on new files
-        if: ${{ steps.filter.outputs.added == 'true' }}
-        run: node check-license-header.js ${{ steps.filter.outputs.added_files }}

.github/workflows/covector-version-or-publish.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
@@ -16,7 +16,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        # platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [ubuntu-latest, macos-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -30,13 +31,61 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libfuse2
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
+
+      - name: Get current date
+        if: matrix.platform == 'windows-latest'
+        run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: |
-            core -> ../target
-            tooling/cli
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache core cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_core
+        with:
+          path: target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache CLI cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_cli
+        with:
+          path: tooling/cli/target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
 
       - name: build CLI
         uses: actions-rs/cargo@v1
@@ -77,7 +126,7 @@ jobs:
           cache-dependency-path: tooling/*/yarn.lock
 
       - name: cargo login
-        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
+        run: cargo login ${{ secrets.crate_token }}
       - name: git config
         run: |
           git config --global user.name "${{ github.event.pusher.name }}"
@@ -96,7 +145,7 @@ jobs:
 
       - name: Create Pull Request With Versions Bumped
         if: steps.covector.outputs.commandRan == 'version'
-        uses: tauri-apps/create-pull-request@v3
+        uses: tauri-apps/create-pull-request@v3.4.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: release/version-updates
@@ -106,12 +155,10 @@ jobs:
           body: ${{ steps.covector.outputs.change }}
 
       - name: Trigger doc update
-        if: |
-          steps.covector.outputs.successfulPublish == 'true' &&
-          steps.covector.outputs.packagesPublished != ''
+        if: steps.covector.outputs.successfulPublish == 'true'
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
+          token: ${{ secrets.TAURI_BOT_PAT }}
           repository: tauri-apps/tauri-docs
           event-type: update-docs
 
@@ -121,17 +168,6 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, 'cli.rs')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
+          token: ${{ secrets.TAURI_BOT_PAT }}
           repository: tauri-apps/tauri
           event-type: publish-clijs
-          client-payload: '{"releaseId": "${{ steps.covector.outputs.cli.js-releaseId }}" }'
-
-      - name: Trigger cli.rs publishing workflow
-        if: |
-          steps.covector.outputs.successfulPublish == 'true' &&
-          contains(steps.covector.outputs.packagesPublished, 'cli.rs')
-        uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
-          repository: tauri-apps/tauri
-          event-type: publish-clirs

.github/workflows/docker.yml

@@ -1,137 +0,0 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
-name: docker
-
-on:
-  workflow_dispatch:
-  #pull_request:
-  #  paths:
-  #    - '.docker/**'
-  #    - '.github/workflows/docker.yml'
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: install stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: install Linux dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
-
-      - name: install cross
-        run: cargo install cross --git https://github.com/cross-rs/cross
-
-      - name: Upload cross
-        uses: actions/upload-artifact@v3
-        with:
-          name: cross
-          path: '~/.cargo/bin/cross'
-          if-no-files-found: error
-
-      - name: build CLI
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --manifest-path ./tooling/cli/Cargo.toml
-
-      - name: Upload CLI
-        uses: actions/upload-artifact@v3
-        with:
-          name: cargo-tauri
-          path: tooling/cli/target/debug/cargo-tauri
-          if-no-files-found: error
-
-  docker:
-    needs: setup
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        target:
-          - { name: 'aarch64-unknown-linux-gnu', filename: 'aarch64' }
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: install stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          default: true
-          target: ${{ matrix.target.name }}
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Download cross
-        uses: actions/download-artifact@v3
-        with:
-          name: cross
-          path: '~/.cargo/bin'
-
-      - name: Download CLI
-        uses: actions/download-artifact@v3
-        with:
-          name: cargo-tauri
-          path: 'examples/api'
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and export to Docker
-        uses: docker/build-push-action@v3
-        with:
-          context: .docker/cross
-          file: .docker/cross/${{ matrix.target.filename }}.Dockerfile
-          load: true
-          tags: ${{ matrix.target.name }}:latest
-
-      - name: install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
-
-      - name: Test
-        run: |
-          cd tooling/api
-          yarn && yarn build
-          cd ../../examples/api
-          yarn
-          . .setup-cross.sh
-          chmod +x cargo-tauri
-          chmod +x $HOME/.cargo/bin/cross
-          ./cargo-tauri build --runner cross --bundles deb --target ${{ matrix.target.name }} --verbose
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .docker/cross
-          file: .docker/cross/${{ matrix.target.filename }}.Dockerfile
-          push: true
-          tags: ghcr.io/${{ github.repository }}/${{ matrix.target.name }}:latest

.github/workflows/lint-fmt-cli.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
@@ -16,6 +16,7 @@ on:
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
 
 concurrency:
@@ -54,14 +55,44 @@ jobs:
           override: true
           components: clippy
 
-      - name: install dependencies
+      - name: install Linux dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: tooling/cli
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ubuntu-latest-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ubuntu-latest-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ubuntu-latest-stable-${{ env.cache-name }}-
+            ubuntu-latest-stable-
+            ubuntu-latest-
+
+      - name: Cache CLI cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_cli
+        with:
+          path: tooling/cli/target
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}
+            ubuntu-latest-stable-${{ env.cache-name }}-
+            ubuntu-latest-stable-
+            ubuntu-latest-
 
       - uses: actions-rs/clippy-check@v1
         with:

.github/workflows/lint-fmt-core.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
@@ -13,11 +13,11 @@ on:
     paths:
       - '.github/workflows/lint-fmt-core.yml'
       - 'core/**'
-      - '!core/tauri/scripts/**'
       - 'examples/**'
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
 
 concurrency:
@@ -50,7 +50,7 @@ jobs:
         clippy:
           - { args: '', key: 'empty' }
           - {
-              args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart',
+              args: '--features compression,wry,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart',
               key: 'all'
             }
           - { args: '--features custom-protocol', key: 'custom-protocol' }
@@ -58,11 +58,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: install dependencies
+      - name: install webkit2gtk
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -71,10 +70,44 @@ jobs:
           override: true
           components: clippy
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
+
+      - name: Get current date
+        if: matrix.platform == 'windows-latest'
+        run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: core -> ../target
-          save-if: ${{ matrix.clippy.key == 'all' }}
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ubuntu-latest-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ubuntu-latest-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ubuntu-latest-stable-${{ env.cache-name }}-
+            ubuntu-latest-stable-
+            ubuntu-latest-
+
+      - name: Cache core cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_core
+        with:
+          path: target
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-stable-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-stable-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}
+            ubuntu-latest-stable-${{ env.cache-name }}-
+            ubuntu-latest-stable-
+            ubuntu-latest-
 
       - uses: actions-rs/clippy-check@v1
         with:

.github/workflows/lint-js.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 

.github/workflows/publish-cli-rs.yml

@@ -1,91 +0,0 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
-name: publish cli.rs
-env:
-  MACOSX_DEPLOYMENT_TARGET: '10.13'
-on:
-  workflow_dispatch:
-  repository_dispatch:
-    types: [publish-clirs]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.config.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - os: ubuntu-20.04
-            rust_target: x86_64-unknown-linux-gnu
-            ext: ''
-          - os: macos-latest
-            rust_target: x86_64-apple-darwin
-            ext: ''
-          - os: macos-latest
-            rust_target: aarch64-apple-darwin
-            ext: ''
-          - os: windows-latest
-            rust_target: x86_64-pc-windows-msvc
-            ext: '.exe'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: 'Setup Rust'
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.config.rust_target }}
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.config.rust_target }}
-
-      - name: install Linux dependencies
-        if: matrix.config.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
-
-      - name: Build CLI
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --manifest-path ./tooling/cli/Cargo.toml --release
-
-      - name: Upload CLI
-        uses: actions/upload-artifact@v3
-        with:
-          name: cargo-tauri-${{ matrix.config.rust_target }}${{ matrix.config.ext }}
-          path: tooling/cli/target/release/cargo-tauri${{ matrix.config.ext }}
-          if-no-files-found: error
-
-  upload:
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Download built CLIs
-        uses: actions/download-artifact@v3
-        with:
-          path: outputs
-
-      - name: Pack archives
-        run: ./.scripts/ci/pack-cli.sh
-
-      - name: Get CLI version
-        run: echo "CLI_VERSION=$(cat tooling/cli/metadata.json | jq '."cli.js".version' -r)" >> $GITHUB_ENV
-
-      - name: Publish release
-        uses: softprops/action-gh-release@50195ba7f6f93d1ac97ba8332a178e008ad176aa
-        with:
-          tag_name: cli.rs-v${{ env.CLI_VERSION }}
-          files: |
-            outputs/cargo-tauri-*.zip
-            outputs/cargo-tauri-*.tgz

.github/workflows/publish-cli.yml

@@ -1,7 +1,3 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
 name: publish cli.js
 env:
   DEBUG: napi:*
@@ -9,10 +5,6 @@ env:
   MACOSX_DEPLOYMENT_TARGET: '10.13'
 on:
   workflow_dispatch:
-    inputs:
-      releaseId:
-        description: 'ID of the cli.js release'
-        required: true
   repository_dispatch:
     types: [publish-clijs]
 
@@ -30,64 +22,64 @@ jobs:
             target: x86_64-apple-darwin
             architecture: x64
             build: |
-              yarn build:release --features rustls
+              yarn build:release
               strip -x *.node
           - host: windows-latest
-            build: yarn build:release --features rustls
+            build: yarn build:release
             target: x86_64-pc-windows-msvc
             architecture: x64
           - host: windows-latest
-            build: yarn build:release --features rustls --target i686-pc-windows-msvc
+            build: yarn build:release --target i686-pc-windows-msvc
             target: i686-pc-windows-msvc
             architecture: x64
-          - host: ubuntu-20.04
+          - host: ubuntu-18.04
             target: x86_64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
             build: |
               cd tooling/cli/node
-              yarn build:release --features rustls --target x86_64-unknown-linux-gnu
+              yarn build:release --target x86_64-unknown-linux-gnu
               strip *.node
-          - host: ubuntu-20.04
+          - host: ubuntu-18.04
             target: x86_64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
             build: |
               cd tooling/cli/node
-              yarn build:release --features rustls
+              yarn build:release
               strip *.node
           - host: macos-latest
             target: aarch64-apple-darwin
             build: |
-              yarn build:release --features rustls --target=aarch64-apple-darwin
+              yarn build:release --target=aarch64-apple-darwin
               strip -x *.node
-          - host: ubuntu-20.04
+          - host: ubuntu-18.04
             target: aarch64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
             build: |
               cd tooling/cli/node
-              yarn build:release --features rustls --target aarch64-unknown-linux-gnu
+              yarn build:release --target aarch64-unknown-linux-gnu
               aarch64-unknown-linux-gnu-strip *.node
-          - host: ubuntu-20.04
+          - host: ubuntu-18.04
             architecture: x64
             target: armv7-unknown-linux-gnueabihf
             setup: |
               sudo apt-get update
               sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
             build: |
-              yarn build:release --features rustls --target=armv7-unknown-linux-gnueabihf
+              yarn build:release --target=armv7-unknown-linux-gnueabihf
               arm-linux-gnueabihf-strip *.node
-          - host: ubuntu-20.04
+          - host: ubuntu-18.04
             architecture: x64
             target: aarch64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
             build: |
               cd tooling/cli/node
               rustup target add aarch64-unknown-linux-musl
-              yarn build:release --features rustls --target aarch64-unknown-linux-musl
+              yarn build:release --target aarch64-unknown-linux-musl
               /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node
           #- host: windows-latest
           #  architecture: x64
           #  target: aarch64-pc-windows-msvc
-          #  build: yarn build:release --features rustls --target aarch64-pc-windows-msvc
+          #  build: yarn build:release --target aarch64-pc-windows-msvc
     name: stable - ${{ matrix.settings.target }} - node@16
     runs-on: ${{ matrix.settings.host }}
     steps:
@@ -179,7 +171,7 @@ jobs:
   #            freebsd-version
   #            cd ./tooling/cli/node/
   #            yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
-  #            yarn build:release --features rustls
+  #            yarn build:release
   #            strip -x *.node
   #            rm -rf node_modules
   #            rm -rf ../target
@@ -202,6 +194,7 @@ jobs:
           - host: windows-latest
             target: x86_64-pc-windows-msvc
         node:
+          - '12'
           - '14'
           - '16'
           - '18'
@@ -235,6 +228,7 @@ jobs:
       fail-fast: false
       matrix:
         node:
+          - '12'
           - '14'
           - '16'
           - '18'
@@ -261,7 +255,7 @@ jobs:
       - name: install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
       - name: Test bindings
         run: yarn test
   test-linux-x64-musl-binding:
@@ -272,6 +266,7 @@ jobs:
       fail-fast: false
       matrix:
         node:
+          - '12'
           - '14'
           - '16'
           - '18'
@@ -299,7 +294,7 @@ jobs:
         shell: bash
       - name: Install system dependencies
         run: |
-          apk add openssl-dev musl-dev glib-dev cairo-dev pkgconfig gdk-pixbuf-dev webkit2gtk-dev curl gtk+3.0-dev
+          apk add openssl-dev musl-dev glib-dev cairo-dev pkgconfig gdk-pixbuf-dev webkit2gtk-dev curl libappindicator-dev patchelf librsvg-dev gtk+3.0-dev
       - name: Setup and run tests
         run: |
           yarn tauri --help
@@ -319,6 +314,7 @@ jobs:
       fail-fast: false
       matrix:
         node:
+          - '12'
           - '14'
           - '16'
           - '18'
@@ -355,7 +351,7 @@ jobs:
             set -e
             export PATH=/usr/local/cargo/bin/:/usr/local/fnm:$PATH
             apt-get update
-            DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install --no-install-recommends -y unzip webkit2gtk-4.0 libayatana-appindicator3-dev
+            DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install --no-install-recommends -y unzip libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
             bash
             curl https://sh.rustup.rs -sSf | bash -s -- -y
             curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "/usr/local/fnm" --skip-shell
@@ -401,4 +397,3 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
-          RELEASE_ID: ${{ github.event.client_payload.releaseId || github.event.inputs.releaseId }}

.github/workflows/publish-hotfix.yml

@@ -0,0 +1,58 @@
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: version or publish
+
+on:
+  push:
+    branches:
+      - '1.*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    timeout-minutes: 65
+    outputs:
+      change: ${{ steps.covector.outputs.change }}
+      commandRan: ${{ steps.covector.outputs.commandRan }}
+      successfulPublish: ${{ steps.covector.outputs.successfulPublish }}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          registry-url: 'https://registry.npmjs.org'
+          cache: yarn
+          cache-dependency-path: tooling/*/yarn.lock
+
+      - name: cargo login
+        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
+      - name: git config
+        run: |
+          git config --global user.name "${{ github.event.pusher.name }}"
+          git config --global user.email "${{ github.event.pusher.email }}"
+
+      - name: covector version or publish (publish when no change files present)
+        uses: jbolda/covector/packages/action@covector-v0
+        id: covector
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
+          CARGO_AUDIT_OPTIONS: ${{ secrets.CARGO_AUDIT_OPTIONS }}
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          command: 'version-or-publish'
+          createRelease: true
+
+      - name: Trigger cli.js publishing workflow
+        if: |
+          steps.covector.outputs.successfulPublish == 'true' &&
+          contains(steps.covector.outputs.packagesPublished, 'cli.rs')
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.TAURI_BOT_PAT }}
+          repository: tauri-apps/tauri
+          event-type: publish-clijs

.github/workflows/test-bundler.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
@@ -16,6 +16,7 @@ on:
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
 
 concurrency:
@@ -33,15 +34,49 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
       - name: install stable
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
+
+      - name: Get current date
+        if: matrix.platform == 'windows-latest'
+        run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: tooling/bundler
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache bundler cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_bundler
+        with:
+          path: tooling/bundler/target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/bundler/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/bundler/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
 
       - name: test
         run: |
@@ -71,19 +106,52 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
       - name: install minimal stable with clippy and rustfmt
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           override: true
-          default: true
           components: rustfmt, clippy
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
+
+      - name: Get current date
+        if: matrix.platform == 'windows-latest'
+        run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: tooling/bundler
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache bundler cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_bundler
+        with:
+          path: tooling/bundler/target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/bundler/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/bundler/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
 
       - name: clippy check
         uses: actions-rs/clippy-check@v1

.github/workflows/test-cli-js.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
@@ -17,6 +17,7 @@ on:
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
 
 concurrency:
@@ -34,7 +35,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
       - name: install Rust stable
         uses: actions-rs/toolchain@v1
         with:
@@ -51,13 +51,61 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
+
+      - name: Get current date
+        if: matrix.platform == 'windows-latest'
+        run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: |
-            tooling/cli
-            tooling/cli/node/test/jest/fixtures/empty/src-tauri
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache CLI cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_cli
+        with:
+          path: tooling/cli/target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache template cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_template
+        with:
+          path: tooling/cli/node/test/jest/fixtures/empty/src-tauri/target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/templates/app/**') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/templates/app/**') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
 
       - name: test
         timeout-minutes: 30

.github/workflows/test-cli-rs.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
@@ -16,6 +16,7 @@ on:
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
 
 concurrency:
@@ -33,7 +34,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
       - name: install stable
         uses: actions-rs/toolchain@v1
         with:
@@ -46,9 +46,44 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
+
+      - name: Get current date
+        if: matrix.platform == 'windows-latest'
+        run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: tooling/cli
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache CLI cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_cli
+        with:
+          path: tooling/cli/target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
 
       - name: build CLI
         uses: actions-rs/cargo@v1

.github/workflows/test-core.yml

@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
@@ -13,10 +13,12 @@ on:
     paths:
       - '.github/workflows/test-core.yml'
       - 'core/**'
-      - '!core/tauri/scripts/**'
+      - 'examples/**'
+      - 'tooling/cli/**'
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
 
 concurrency:
@@ -25,62 +27,66 @@ concurrency:
 
 jobs:
   test-tauri-core:
-    runs-on: ${{ matrix.platform.os }}
+    runs-on: ${{ matrix.platform }}
 
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - {
-              target: x86_64-pc-windows-msvc,
-              os: windows-latest,
-              toolchain: '1.61.0'
-            }
-          - {
-              target: x86_64-unknown-linux-gnu,
-              os: ubuntu-latest,
-              toolchain: '1.60.0'
-            }
-          - {
-              target: x86_64-apple-darwin,
-              os: macos-latest,
-              toolchain: '1.60.0'
-            }
-        features:
-          - {
-              args: --no-default-features,
-              key: no-default
-            }
-          - {
-              args: --features api-all,
-              key: api-all
-            }
-          - {
-              args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,
-              key: all
-            }
+        platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v2
-
       - name: install stable
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.platform.toolchain }}
-          target: ${{ matrix.platform.target }}
-          override: true
-          default: true
-
+          toolchain: stable
       - name: install Linux dependencies
-        if: contains(matrix.platform.target, 'unknown-linux')
+        if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
 
-      - uses: Swatinem/rust-cache@v2
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+        if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
+
+      - name: Get current date
+        if: matrix.platform == 'windows-latest'
+        run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
         with:
-          workspaces: core -> ../target
-          save-if: ${{ matrix.features.key == 'all' }}
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
+
+      - name: Cache core cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_core
+        with:
+          path: target
+          # Add date to the cache to keep it up to date
+          key: ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}
+            ${{ matrix.platform }}-stable-${{ env.cache-name }}-
+            ${{ matrix.platform }}-stable-
+            ${{ matrix.platform }}-
 
       - name: test
-        run: cargo test --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
+        run: |
+          cargo test
+          cargo test --features api-all
+          cargo test --features compression,wry,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart

.github/workflows/udeps.yml

@@ -1,17 +1,20 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
 name: Udeps
 
 on:
-  push:
-    branches:
-      - dev
-      - next
+  pull_request:
+    paths:
+      - '.github/workflows/udeps.yml'
+      - 'core/**'
+      - 'tooling/bundler/**'
+      - 'tooling/cli/**'
 
 env:
   RUST_BACKTRACE: 1
+  CARGO_INCREMENTAL: 0 # This is set to 0 by the https://github.com/Swatinem/rust-cache
   CARGO_PROFILE_DEV_DEBUG: 0 # This would add unnecessary bloat to the target folder, decreasing cache efficiency.
 
 concurrency:
@@ -19,58 +22,26 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  changes:
+  udeps:
     runs-on: ubuntu-latest
-    outputs:
-      tauri: ${{ steps.filter.outputs.tauri }}
-      build: ${{ steps.filter.outputs.build }}
-      codegen: ${{ steps.filter.outputs.codegen }}
-      macros: ${{ steps.filter.outputs.macros }}
-      runtime: ${{ steps.filter.outputs.runtime }}
-      wry: ${{ steps.filter.outputs.wry }}
-      utils: ${{ steps.filter.outputs.utils }}
-      bundler: ${{ steps.filter.outputs.bundler }}
-      cli: ${{ steps.filter.outputs.cli }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            tauri:
-              - 'core/tauri/**'
-              - '!core/tauri/scripts/**'
-            build:
-              - 'core/tauri-build/**'
-            codegen:
-              - 'core/tauri-codegen/**'
-            macros:
-              - 'core/tauri-macros/**'
-            runtime:
-              - 'core/tauri-runtime/**'
-            wry:
-              - 'core/tauri-runtime-wry/**'
-            utils:
-              - 'core/tauri-utils/**'
-            bundler:
-              - 'tooling/bundler/**'
-            cli:
-              - 'tooling/cli/**'
-
-  setup:
-    runs-on: ubuntu-latest
-    needs: changes
-    if: |
-      needs.changes.outputs.tauri == 'true' ||
-      needs.changes.outputs.build == 'true' ||
-      needs.changes.outputs.codegen == 'true' ||
-      needs.changes.outputs.macros == 'true' ||
-      needs.changes.outputs.runtime == 'true' ||
-      needs.changes.outputs.wry == 'true' ||
-      needs.changes.outputs.utils == 'true' ||
-      needs.changes.outputs.bundler == 'true' ||
-      needs.changes.outputs.cli == 'true'
-
+    strategy:
+      matrix:
+        clippy:
+          - {
+              path: './core/tauri/Cargo.toml',
+              args: '--features compression,wry,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart'
+            }
+          - { path: './core/tauri-build/Cargo.toml', args: '--all-features' }
+          - { path: './core/tauri-codegen/Cargo.toml', args: '--all-features' }
+          - { path: './core/tauri-macros/Cargo.toml', args: '--all-features' }
+          - { path: './core/tauri-runtime/Cargo.toml', args: '--all-features' }
+          - {
+              path: './core/tauri-runtime-wry/Cargo.toml',
+              args: '--features devtools,system-tray,macos-private-api,objc-exception'
+            }
+          - { path: './core/tauri-utils/Cargo.toml', args: '--all-features' }
+          - { path: './tooling/bundler/Cargo.toml', args: '--all-features' }
+          - { path: './tooling/cli/Cargo.toml', args: '--all-features' }
     steps:
       - uses: actions/checkout@v2
 
@@ -80,86 +51,86 @@ jobs:
           toolchain: nightly
           override: true
 
+      - name: install Linux dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev
+
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+      - name: Cache cargo state
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_state
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ~/.cargo/bin
+          key: ubuntu-latest-nightly-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          restore-keys: |
+            ubuntu-latest-nightly-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}-
+            ubuntu-latest-nightly-${{ env.cache-name }}-
+            ubuntu-latest-nightly-
+            ubuntu-latest-
+
+      - name: Cache core cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_core
+        with:
+          path: target
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-nightly-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-nightly-${{ env.cache-name }}-${{ hashFiles('core/**/Cargo.toml') }}
+            ubuntu-latest-nightly-${{ env.cache-name }}-
+            ubuntu-latest-nightly-
+            ubuntu-latest-
+
+      - name: Cache bundler cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_bundler
+        with:
+          path: tooling/bundler/target
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-nightly-${{ env.cache-name }}-${{ hashFiles('tooling/bundler/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-nightly-${{ env.cache-name }}-${{ hashFiles('tooling/bundler/Cargo.lock') }}
+            ubuntu-latest-nightly-${{ env.cache-name }}-
+            ubuntu-latest-nightly-
+            ubuntu-latest-
+
+      - name: Cache CLI cargo target
+        uses: actions/cache@v2
+        env:
+          cache-name: cargo_cli
+        with:
+          path: tooling/cli/target
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-nightly-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-nightly-${{ env.cache-name }}-${{ hashFiles('tooling/cli/Cargo.lock') }}
+            ubuntu-latest-nightly-${{ env.cache-name }}-
+            ubuntu-latest-nightly-
+            ubuntu-latest-
+
       - uses: actions-rs/cargo@v1
         with:
           command: install
           args: cargo-udeps --locked --force
 
-      - name: Upload udeps
-        uses: actions/upload-artifact@v3
-        with:
-          name: udeps
-          path: '~/.cargo/bin/cargo-udeps'
-          if-no-files-found: error
-
-      - name: Create udeps matrix
-        id: create-matrix
-        env:
-          TAURI: ${{ needs.changes.outputs.tauri == 'true' }}
-          BUILD: ${{ needs.changes.outputs.build == 'true' }}
-          CODEGEN: ${{ needs.changes.outputs.codegen == 'true' }}
-          MACROS: ${{ needs.changes.outputs.macros == 'true' }}
-          RUNTIME: ${{ needs.changes.outputs.runtime == 'true' }}
-          WRY: ${{ needs.changes.outputs.wry == 'true' }}
-          UTILS: ${{ needs.changes.outputs.utils == 'true' }}
-          BUNDLER: ${{ needs.changes.outputs.bundler == 'true' }}
-          CLI: ${{ needs.changes.outputs.cli == 'true' }}
-        run: |
-          crates=()
-          if [ "${TAURI}" == "true" ]; then crates[${#crates[@]}]="\"./core/tauri\""; fi
-          if [ "${BUILD}" == "true" ]; then crates[${#crates[@]}]="\"./core/tauri-build\""; fi
-          if [ "${CODEGEN}" == "true" ]; then crates[${#crates[@]}]="\"./core/tauri-codegen\""; fi
-          if [ "${MACROS}" == "true" ]; then crates[${#crates[@]}]="\"./core/tauri-macros\""; fi
-          if [ "${RUNTIME}" == "true" ]; then crates[${#crates[@]}]="\"./core/tauri-runtime\""; fi
-          if [ "${WRY}" == "true" ]; then crates[${#crates[@]}]="\"./core/tauri-runtime-wry\""; fi
-          if [ "${UTILS}" == "true" ]; then crates[${#crates[@]}]="\"./core/tauri-utils\""; fi
-          if [ "${BUNDLER}" == "true" ]; then crates[${#crates[@]}]="\"./tooling/bundler\""; fi
-          if [ "${CLI}" == "true" ]; then crates[${#crates[@]}]="\"./tooling/cli\""; fi
-          echo ::set-output name=matrix::[$crates]
-    outputs:
-      matrix: ${{ steps.create-matrix.outputs.matrix }}
-
-  udeps:
-    runs-on: ubuntu-latest
-    needs: setup
-    strategy:
-      matrix:
-        path: ${{ fromJson(needs.setup.outputs.matrix) }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-
-      - name: install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            core -> ../target
-            tooling/cli
-            tooling/bundler
-
-      - name: Download udeps
-        uses: actions/download-artifact@v3
-        with:
-          name: udeps
-          path: '~/.cargo/bin'
-
-      - run: chmod +x $HOME/.cargo/bin/cargo-udeps
-
       - name: Install required packages
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
 
       - uses: actions-rs/cargo@v1
         with:
           command: udeps
-          args: --manifest-path ${{ matrix.path }}/Cargo.toml --all-targets --all-features
+          args: --manifest-path ${{ matrix.clippy.path }} --all-targets ${{ matrix.clippy.args }}

.husky/pre-commit

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 

.prettierignore

@@ -1,13 +0,0 @@
-/.github
-/.husky
-/.vscode
-/audits
-node_modules
-target
-dist
-/core/tauri/scripts
-/tooling/cli/templates
-/tooling/cli/node
-/tooling/cli/schema.json
-/tooling/api/docs/js-api.json
-/core/tauri-config-schema/schema.json

.prettierrc.js

@@ -1,7 +1,3 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
 module.exports = {
   singleQuote: true,
   semi: false,

.scripts/cargo-check.ps1

@@ -1,5 +1,5 @@
 #!/usr/bin/env pwsh
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 

.scripts/cargo-check.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 

.scripts/ci/has-diff.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if git diff --quiet --ignore-submodules HEAD
-then
-  echo "working directory is clean"
-else
-  echo "found diff"
-  exit 1
-fi

.scripts/ci/pack-cli.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-
-for o in outputs/*; do
-  pushd "$o"
-
-  chmod +x cargo-tauri*
-  cp ../../tooling/cli/LICENSE* ../../tooling/cli/README.md .
-
-  target=$(basename "$o" | cut -d. -f1)
-  if grep -qE '(apple|windows)' <<< "$target"; then
-    zip "../${target}.zip" *
-  else
-    tar cv * | gzip -9 > "../${target}.tgz"
-  fi
-
-  popd
-done

.scripts/covector/package-latest-version.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2022 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -19,10 +19,10 @@ let url = null
 switch (kind) {
   case 'cargo':
     url = `https://crates.io/api/v1/crates/${packageName}`
-    break
+    break;
   case 'npm':
     url = `https://registry.npmjs.org/${packageName}`
-    break
+    break;
   default:
     throw new Error('unexpected kind ' + kind)
 }
@@ -30,7 +30,7 @@ switch (kind) {
 const options = {
   headers: {
     'Content-Type': 'application/json',
-    Accept: 'application/json',
+    'Accept': 'application/json',
     'User-Agent': 'tauri (https://github.com/tauri-apps/tauri)'
   }
 }
@@ -44,12 +44,10 @@ https.get(url, options, (response) => {
   response.on('end', function () {
     const data = JSON.parse(chunks.join(''))
     if (kind === 'cargo') {
-      const versions = data.versions.filter((v) => v.num.startsWith(target))
+      const versions = data.versions.filter(v => v.num.startsWith(target))
       console.log(versions.length ? versions[0].num : '0.0.0')
     } else if (kind === 'npm') {
-      const versions = Object.keys(data.versions).filter((v) =>
-        v.startsWith(target)
-      )
+      const versions = Object.keys(data.versions).filter(v => v.startsWith(target))
       console.log(versions[versions.length - 1] || '0.0.0')
     }
   })

.scripts/covector/sync-cli-metadata.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+ // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -10,39 +10,34 @@ we should look to find a more "rusty way" to import / "pin" a version value in o
 rust binaries.
 */
 
-const { readFileSync, writeFileSync } = require('fs')
+const {
+  readFileSync,
+  writeFileSync
+} = require('fs')
 
 const packageNickname = process.argv[2]
-const filePath =
-  packageNickname === 'cli.js'
-    ? `../../../tooling/cli/metadata.json`
-    : `../../tooling/cli/metadata.json`
+const filePath = packageNickname === 'cli.js' ? `../../../tooling/cli/metadata.json` : `../../tooling/cli/metadata.json`
 const bump = process.argv[3]
 let index = null
 
 switch (bump) {
   case 'major':
-    index = 0
-    break
+    index = 0;
+    break;
   case 'minor':
-    index = 1
-    break
+    index = 1;
+    break;
   case 'patch':
-    index = 2
-    break
+    index = 2;
+    break;
   default:
     throw new Error('unexpected bump ' + bump)
 }
 
 const inc = (version) => {
   const v = version.split('.')
-  for (let i = 0; i < v.length; i++) {
-    if (i === index) {
-      v[i] = String(Number(v[i]) + 1)
-    } else if (i > index) {
-      v[i] = 0
-    }
-  }
+  const n = v[index]
+  v[index] = String(Number(n) + 1)
   return v.join('.')
 }
 

.scripts/docker/build.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-docker build -t aarch64-unknown-linux-gnu:latest --file .docker/cross/aarch64.Dockerfile .docker/cross

.scripts/setup.ps1

@@ -1,5 +1,5 @@
 #!/usr/bin/env pwsh
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 

.scripts/setup.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 

.scripts/update-lockfiles.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env sh
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-License-Identifier: MIT
 
-declare -a examples=("api" "sidecar" "updater" "resources" "tauri-dynamic-lib" "workspace")
+declare -a examples=("api" "sidecar" "updater" "resources" "tauri-dynamic-lib")
 declare -a tooling=("bench" "cli" "webdriver")
 
 for example in "${examples[@]}"

.scripts/utils/batch_to_exe.cmd

@@ -1,6 +1,6 @@
 @ECHO OFF
 
-REM Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+REM Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 REM SPDX-License-Identifier: Apache-2.0
 REM SPDX-License-Identifier: MIT
 
@@ -59,4 +59,4 @@ IF EXIST %SourceFiles% DEL %SourceFiles%
 IF EXIST %Config% DEL %Config%
 IF EXIST %Source7ZFile% DEL %Source7ZFile%
 
-ENDLOCAL
+ENDLOCAL

ARCHITECTURE.md

@@ -1,6 +1,5 @@
 # The Tauri Architecture
-https://tauri.app
-
+https://tauri.studio
 https://github.com/tauri-apps/tauri
 
 ## Introduction
@@ -40,7 +39,7 @@ This is common code that is reused in many places and offers useful utilities li
 
 ### Tauri Tooling
 #### [api](https://github.com/tauri-apps/tauri/tree/dev/tooling/api) [TS -> JS]
-A TypeScript library that creates `cjs` and `esm` JavaScript endpoints for you to import into your Frontend framework so that the Webview can call and listen to backend activity. We also ship the pure TypeScript, because for some frameworks this is more optimal. It uses the message passing of webviews to their hosts.
+A typescript library that creates `cjs` and `esm` Javascript endpoints for you to import into your Frontend framework so that the Webview can call and listen to backend activity. We also ship the pure typescript, because for some frameworks this is more optimal. It uses the message passing of webviews to their hosts.
 
 #### [bundler](https://github.com/tauri-apps/tauri/tree/dev/tooling/bundler) [RUST / SHELL]
 The bundler is a library that builds a Tauri App for the platform triple it detects / is told. At the moment it currently supports macOS, Windows and Linux - but in the near future will support mobile platforms as well. May be used outside of Tauri projects.
@@ -82,7 +81,7 @@ This plugin allows you to very quickly install tauri in a vue-cli project.
 ## [tauri-vscode](https://github.com/tauri-apps/tauri-vscode)
 This project enhances the VS Code interface with several nice-to-have features.
 
-# Tauri Plugins [documentation](https://tauri.app/v1/guides/features/plugin/)
+# Tauri Plugins [documentation](https://tauri.studio/en/docs/guides/plugin)
 
 Generally speaking, plugins are authored by third parties (even though there may be official, supported plugins). A plugin generally does 3 things:
 1. It provides rust code to do "something".

Cargo.toml

@@ -8,11 +8,10 @@ members = [
   "core/tauri-utils",
   "core/tauri-build",
   "core/tauri-codegen",
-  "core/tauri-config-schema",
-
+  
   # integration tests
   "core/tests/restart",
-  "core/tests/app-updater",
+  "core/tests/app-updater"
 ]
 
 exclude = [
@@ -20,13 +19,12 @@ exclude = [
   "examples/api/src-tauri",
   "examples/updater/src-tauri",
   "examples/resources/src-tauri",
-  "examples/sidecar/src-tauri",
-  "examples/web/core",
-  "examples/workspace",
+  "examples/sidecar/src-tauri"
 ]
 
 # default to small, optimized workspace release binaries
 [profile.release]
+strip = true
 panic = "abort"
 codegen-units = 1
 lto = true

LICENSE.spdx

@@ -6,7 +6,7 @@ PackageSupplier: Organization: The Tauri Programme in the Commons Conservancy
 PackageHomePage: https://tauri.app
 PackageLicenseDeclared: Apache-2.0
 PackageLicenseDeclared: MIT
-PackageCopyrightText: 2019-2022, The Tauri Programme in the Commons Conservancy
+PackageCopyrightText: 2019-2021, The Tauri Programme in the Commons Conservancy
 PackageSummary: <text>Tauri is a rust project that enables developers to make secure
 and small desktop applications using a web frontend.
                 </text>
@@ -17,4 +17,4 @@ Created: 2019-05-20T09:00:00Z
 PackageDownloadLocation: git://github.com/tauri-apps/tauri
 PackageDownloadLocation: git+https://github.com/tauri-apps/tauri.git
 PackageDownloadLocation: git+ssh://github.com/tauri-apps/tauri.git
-Creator: Person: Daniel Thompson-Yvetot
+Creator: Person: Daniel Thompson-Yvetot

README.md

@@ -1,13 +1,15 @@
 <img src=".github/splash.png" alt="Tauri" />
 
-[![status](https://img.shields.io/badge/status-stable-blue.svg)](https://github.com/tauri-apps/tauri/tree/dev)
+[![status](https://img.shields.io/badge/Status-Stable-green.svg)](https://github.com/tauri-apps/tauri/tree/dev)
 [![License](https://img.shields.io/badge/License-MIT%20or%20Apache%202-green.svg)](https://opencollective.com/tauri)
 [![test library](https://img.shields.io/github/workflow/status/tauri-apps/tauri/test%20library?label=test%20library)](https://github.com/tauri-apps/tauri/actions?query=workflow%3A%22test+library%22)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Ftauri-apps%2Ftauri.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Ftauri-apps%2Ftauri?ref=badge_shield)
-[![Chat Server](https://img.shields.io/badge/chat-discord-7289da.svg)](https://discord.gg/SpmNs4S)
-[![website](https://img.shields.io/badge/website-tauri.app-purple.svg)](https://tauri.app)
+
+[![Chat Server](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/SpmNs4S)
+[![devto](https://img.shields.io/badge/blog-dev.to-black.svg)](https://dev.to/tauri)
+[![devto](https://img.shields.io/badge/documentation-tauri.app-purple.svg)](https://tauri.app)
 [![https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg](https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg)](https://good-labs.github.io/greater-good-affirmation)
-[![support](https://img.shields.io/badge/sponsor-Open%20Collective-blue.svg)](https://opencollective.com/tauri)
+[![support](https://img.shields.io/badge/sponsor-open%20collective-blue.svg)](https://opencollective.com/tauri)
 
 ## Current Releases
 
@@ -49,7 +51,7 @@ To learn more about the details of how all of these pieces fit together, please
 
 ## Get Started
 
-If you are interested in making a tauri app, please visit the [documentation website](https://tauri.app). This README is directed towards those who are interested in contributing to the core library. But if you just want a quick overview about where `tauri` is at in its development, here's a quick burndown:
+If you are interested in making a tauri app, please visit the [documentation website](https://tauri.studio). This README is directed towards those who are interested in contributing to the core library. But if you just want a quick overview about where `tauri` is at in its development, here's a quick burndown:
 
 ### Platforms
 
@@ -78,16 +80,22 @@ For **running** Tauri apps we support the below configurations (these are automa
 
 <sup>1</sup> `appindicator` is only required if system trays are used
 
-### Features
+### App Bundles
 
-- [x] Desktop Bundler (.app, .dmg, .deb, AppImage, .msi)
+- [x] App Icons
+- [x] Build on macOS (.app, .dmg)
+- [x] Build on Linux (.deb, AppImage)
+- [x] Build on Windows (.exe, .msi)
+- [x] Copy Buffer
+- [x] Device Notifications (toast)
 - [x] Self Updater
 - [x] App Signing
-- [x] Native Notifications (toast)
-- [x] App Tray
-- [x] Core Plugin System
-- [x] Scoped Filesystem
-- [x] Sidecar
+- [x] Frameless Mode
+- [x] Transparent Mode
+- [x] Multiwindow Mode
+- [x] Tray
+- [ ] deeplink RPC (in progress)
+- [ ] One-Time commands (coming soon)
 
 ### Security Features
 
@@ -100,9 +108,39 @@ For **running** Tauri apps we support the below configurations (these are automa
 
 ### Utilities
 
-- [x] Rust-based CLI
 - [x] GH Action for creating binaries for all platforms
 - [x] VS Code Extension
+- [x] Tauri Core Plugins
+- [x] Update core dependencies automatically from the command line
+- [x] Rust-based CLI
+
+### Comparison between Tauri and Electron
+
+| Detail                     | Tauri  | Electron             |
+| -------------------------- | ------ | -------------------- |
+| Installer Size Linux       | 3.1 MB | 52.1 MB              |
+| Memory Consumption Linux   | 180 MB | 462 MB               |
+| Launch Time Linux          | 0.39s  | 0.80s                |
+| Interface Service Provider | WRY    | Chromium             |
+| Backend Binding            | Rust   | Node.js (ECMAScript) |
+| Underlying Engine          | Rust   | V8 (C/C++)           |
+| FLOSS                      | Yes    | No                   |
+| Multithreading             | Yes    | Yes                  |
+| Bytecode Delivery          | Yes    | No                   |
+| Multiple Windows           | Yes    | Yes                  |
+| Auto Updater               | Yes    | Yes<sup>1</sup>      |
+| Custom App Icon            | Yes    | Yes                  |
+| Windows Binary             | Yes    | Yes                  |
+| macOS Binary               | Yes    | Yes                  |
+| Linux Binary               | Yes    | Yes                  |
+| iOS Binary                 | Soon   | No                   |
+| Android Binary             | Soon   | No                   |
+| Desktop Tray               | Yes    | Yes                  |
+| Sidecar Binaries           | Yes    | No                   |
+
+#### Notes
+
+1. Electron has no native auto updater on Linux, but is offered by electron-packager
 
 ## Development
 
@@ -117,6 +155,18 @@ Tauri is a system composed of a number of moving pieces:
 - Netlify-hosted documentation website
 - DigitalOcean Meilisearch instance
 
+### Major Runtimes
+
+- Node.js for running the CLI (deno and pure rust are on the roadmap)
+- Cargo for testing, running the dev service, building binaries and as the runtime harness for the webview
+
+### Major Languages
+
+- Rust for the CLI
+- ECMAScript bindings to the Rust API, written in typescript
+- Rust for bindings, rust side of the API, harnesses
+- Rust plugins to Tauri backend
+
 ### Operating systems
 
 Tauri core can be developed on Mac, Linux and Windows, but you are encouraged to use the latest possible operating systems and build tools for your OS.
@@ -138,7 +188,7 @@ Documentation in a polyglot system is a tricky proposition. To this end, we pref
 Test all the things! We have a number of test suites, but are always looking to improve our coverage:
 
 - Rust (`cargo test`) => sourced via inline `#[cfg(test)]` declarations
-- Typescript (`jest`) => via spec files
+- TS (`jest`) => via spec files
 - Smoke Tests (run on merges to latest)
 - eslint, clippy
 

SECURITY.md

@@ -13,16 +13,7 @@ If you have found a potential security threat, vulnerability or exploit in Tauri
 or one of its upstream dependencies, please DON’T create a pull-request, DON’T
 file an issue on GitHub, DON’T mention it on Discord and DON’T create a forum thread.
 
-Please submit your report via the GitHub Private Vulnerability Disclosure functionality.
-
-Find out more about the reporting process [here](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability).
-
-Our team will triage your report and keep you informed about the progress.
-We may ask questions or request further guidance on reproduction of the vulnerability in the comments of the advisory, which will be publicized.
-
-Additionally, we may ask you to independently verify our patch, which will be available in the private advisory branch. Please do not publish your vulnerability during the process or before coordinated public disclosure from our side. We try to adhere to common standards of publication within 90-Days of disclosure.
-
-Depending on your decision to accept or deny credit for the vulnerability, you will be publicly attributed to the vulnerability and may be mentioned in our announcements.
+We will be adding contact information to this page very soon.
 
 At the current time we do not have the financial ability to reward bounties, 
 but in extreme cases will at our discretion consider a reward.

check-license-header.js

@@ -1,102 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-const fs = require('fs')
-const path = require('path')
-const readline = require('readline')
-
-const header = `Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-SPDX-License-Identifier: Apache-2.0
-SPDX-License-Identifier: MIT`
-const bundlerLicense = '// Copyright 2016-2019 Cargo-Bundle developers <https://github.com/burtonageo/cargo-bundle>'
-
-const extensions = ['.rs', '.js', '.ts', '.yml']
-const ignore = ['target', 'templates', 'node_modules', 'gen', 'dist', 'bundle.js', 'bundle.global.js']
-
-async function checkFile(file) {
-  if (extensions.some(e => file.endsWith(e))) {
-    const fileStream = fs.createReadStream(file)
-    const rl = readline.createInterface({
-      input: fileStream,
-      crlfDelay: Infinity
-    })
-
-    let contents = ``
-    let i = 0
-    for await (let line of rl) {
-      // ignore empty lines, allow shebang and bundler license
-      if (line.length === 0 || line.startsWith("#!") || line === bundlerLicense) {
-        continue
-      }
-
-      // strip comment marker
-      if (line.startsWith('// ')) {
-        line = line.substring(3)
-      } else if (line.startsWith('# ')) {
-        line = line.substring(2)
-      }
-
-      contents += line
-      if (++i === 3) {
-        break
-      }
-      contents += '\n'
-    }
-    if (contents !== header) {
-      return true
-    }
-  }
-  return false
-}
-
-async function check(src) {
-  const missingHeader = []
-
-  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-    const p = path.join(src, entry.name)
-
-    if (entry.isSymbolicLink() || ignore.includes(entry.name)) {
-      continue
-    }
-
-    if (entry.isDirectory()) {
-      const missing = await check(p)
-      missingHeader.push(...missing)
-    } else {
-      const isMissing = await checkFile(p)
-      if (isMissing) {
-        missingHeader.push(p)
-      }
-    }
-  }
-
-  return missingHeader
-}
-
-const [_bin, _script, ...files] = process.argv
-
-if (files.length > 0) {
-  async function run() {
-    const missing = []
-    for (const f of files) {
-      const isMissing = await checkFile(f)
-      if (isMissing) {
-        missing.push(f)
-      }
-    }
-    if (missing.length > 0) {
-      console.log(missing.join('\n'))
-      process.exit(1)
-    }
-  }
-
-  run()
-} else {
-  check('.').then(missing => {
-    if (missing.length > 0) {
-      console.log(missing.join('\n'))
-      process.exit(1)
-    }
-  })
-}

core/tauri-build/CHANGELOG.md

@@ -1,51 +1,5 @@
 # Changelog
 
-## \[1.3.0]
-
-- Bump minimum supported Rust version to 1.60.
-  - [5fdc616d](https://www.github.com/tauri-apps/tauri/commit/5fdc616df9bea633810dcb814ac615911d77222c) feat: Use the zbus-backed of notify-rust ([#6332](https://www.github.com/tauri-apps/tauri/pull/6332)) on 2023-03-31
-- Add initial support for building `nsis` bundles on non-Windows platforms.
-  - [60e6f6c3](https://www.github.com/tauri-apps/tauri/commit/60e6f6c3f1605f3064b5bb177992530ff788ccf0) feat(bundler): Add support for creating NSIS bundles on unix hosts ([#5788](https://www.github.com/tauri-apps/tauri/pull/5788)) on 2023-01-19
-- Add `WindowsAttributes::app_manifest` to specify the application manifest on Windows.
-  - [bca09f7f](https://www.github.com/tauri-apps/tauri/commit/bca09f7f5ff1c9c5a4b51da043bdd5da668a179b) feat(tauri-build): add option to specify Windows manifest, closes [#5584](https://www.github.com/tauri-apps/tauri/pull/5584) ([#5730](https://www.github.com/tauri-apps/tauri/pull/5730)) on 2022-12-14
-- Added support for Cargo's workspace inheritance for package information. The cli now also detects inherited `tauri` and `tauri-build` dependencies and disables manifest rewrites accordingly.
-  - [cd8c074a](https://www.github.com/tauri-apps/tauri/commit/cd8c074ae6592303d3f6844a4fb6d262eae913b2) feat(cli): add support for Cargo's workspace inheritance for the package version, closes [#5070](https://www.github.com/tauri-apps/tauri/pull/5070) ([#5775](https://www.github.com/tauri-apps/tauri/pull/5775)) on 2022-12-14
-  - [d20a7288](https://www.github.com/tauri-apps/tauri/commit/d20a728892eee1858ab525ab6216cd721f473ab5) feat: Further improve workspace inheritance, closes [#6122](https://www.github.com/tauri-apps/tauri/pull/6122), [#5070](https://www.github.com/tauri-apps/tauri/pull/5070) ([#6144](https://www.github.com/tauri-apps/tauri/pull/6144)) on 2023-01-26
-- Pin `winnow` crate to 0.4.1 to keep the 1.60 MSRV.
-
-## \[1.2.1]
-
-- Fix `allowlist > app > show/hide` always disabled when `allowlist > app > all: false`.
-  - Bumped due to a bump in tauri-utils.
-  - [bb251087](https://www.github.com/tauri-apps/tauri/commit/bb2510876d0bdff736d36bf3a465cdbe4ad2b90c) fix(core): extend allowlist with `app`'s allowlist, closes [#5650](https://www.github.com/tauri-apps/tauri/pull/5650) ([#5652](https://www.github.com/tauri-apps/tauri/pull/5652)) on 2022-11-18
-
-## \[1.2.0]
-
-- - [7d9aa398](https://www.github.com/tauri-apps/tauri/commit/7d9aa3987efce2d697179ffc33646d086c68030c) feat: bump MSRV to 1.59 ([#5296](https://www.github.com/tauri-apps/tauri/pull/5296)) on 2022-09-28
-
-## \[1.1.1]
-
-- Add missing allowlist config for `set_cursor_grab`, `set_cursor_visible`, `set_cursor_icon` and `set_cursor_position` APIs.
-  - Bumped due to a bump in tauri-utils.
-  - [c764408d](https://www.github.com/tauri-apps/tauri/commit/c764408da7fae123edd41115bda42fa75a4731d2) fix: Add missing allowlist config for cursor apis, closes [#5207](https://www.github.com/tauri-apps/tauri/pull/5207) ([#5211](https://www.github.com/tauri-apps/tauri/pull/5211)) on 2022-09-16
-
-## \[1.1.0]
-
-- Rerun codegen if assets or icons change.
-  - [ff8fd761](https://www.github.com/tauri-apps/tauri/commit/ff8fd7619ae894b70f149b192d8635d842827141) fix(tauri-build): rerun if assets or icons change ([#4910](https://www.github.com/tauri-apps/tauri/pull/4910)) on 2022-08-10
-- Create the `desktop` and `mobile` cfg aliases.
-  - [c04d0340](https://www.github.com/tauri-apps/tauri/commit/c04d0340e2f163483f3556c7aabe35322ee71e6a) feat(core): prepare build for mobile targets ([#4830](https://www.github.com/tauri-apps/tauri/pull/4830)) on 2022-08-02
-- Added support to configuration files in TOML format (Tauri.toml file).
-  - [ae83d008](https://www.github.com/tauri-apps/tauri/commit/ae83d008f9e1b89bfc8dddaca42aa5c1fbc36f6d) feat: add support to TOML config file `Tauri.toml`, closes [#4806](https://www.github.com/tauri-apps/tauri/pull/4806) ([#4813](https://www.github.com/tauri-apps/tauri/pull/4813)) on 2022-08-02
-- Enhance the dialog style on Windows via the manifest dependency `Microsoft.Windows.Common-Controls v6.0.0.0`.
-  - [5c5c42ed](https://www.github.com/tauri-apps/tauri/commit/5c5c42edb64adf4250af6891d7d226fda7d4d783) feat(build): use modern dialog styles on Windows, closes [#4709](https://www.github.com/tauri-apps/tauri/pull/4709) ([#4840](https://www.github.com/tauri-apps/tauri/pull/4840)) on 2022-08-02
-- Fix root of codegen output when using the `CodegenContext` API.
-  - [ed581950](https://www.github.com/tauri-apps/tauri/commit/ed581950ea6fd0afee47aa73fb63083d2483429f) fix(tauri-build): use `::tauri` as root for the CodegenContext ([#4894](https://www.github.com/tauri-apps/tauri/pull/4894)) on 2022-08-08
-- Return an error if a sidecar is configured with the same file name as the application.
-  - [5cc1fd0f](https://www.github.com/tauri-apps/tauri/commit/5cc1fd0f7b01b257a461d4e867ddc8cd5072ff15) feat(tauri-build): validate sidecar name, closes [#4780](https://www.github.com/tauri-apps/tauri/pull/4780) closes [#4823](https://www.github.com/tauri-apps/tauri/pull/4823) ([#4814](https://www.github.com/tauri-apps/tauri/pull/4814)) on 2022-08-02
-- Only rewrite temporary icon files when the content change, avoid needless rebuilds.
-  - [f957cbb5](https://www.github.com/tauri-apps/tauri/commit/f957cbb56ccbd8d1c047a978b4579946252a6fd2) fix(codegen): write output file when contents change ([#4889](https://www.github.com/tauri-apps/tauri/pull/4889)) on 2022-08-09
-
 ## \[1.0.4]
 
 - Reduce the amount of allocations when converting cases.

core/tauri-build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-build"
-version = "1.3.0"
+version = "1.0.4"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 categories = [ "gui", "web-programming" ]
 license = "Apache-2.0 OR MIT"
@@ -8,8 +8,8 @@ homepage = "https://tauri.app"
 repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-build"
 description = "build time code to pair with https://crates.io/crates/tauri"
 edition = "2021"
-rust-version = "1.60"
-exclude = [ "CHANGELOG.md", "/target" ]
+rust-version = "1.57"
+exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -19,19 +19,18 @@ rustdoc-args = [ "--cfg", "doc_cfg" ]
 [dependencies]
 anyhow = "1"
 quote = { version = "1", optional = true }
-tauri-codegen = { version = "1.3.0", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "1.3.0", path = "../tauri-utils", features = [ "build", "resources" ] }
-cargo_toml = "0.15"
-winnow = "=0.4.1"
-serde = "1"
+tauri-codegen = { version = "1.0.4", path = "../tauri-codegen", optional = true }
+tauri-utils = { version = "1.0.3", path = "../tauri-utils", features = [ "build", "resources" ] }
+cargo_toml = "0.11"
 serde_json = "1"
 heck = "0.4"
-json-patch = "1.0"
-tauri-winres = "0.1"
+json-patch = "0.2"
+
+[target."cfg(windows)".dependencies]
+winres = "0.1"
 semver = "1"
 
 [features]
 codegen = [ "tauri-codegen", "quote" ]
 isolation = [ "tauri-codegen/isolation", "tauri-utils/isolation" ]
 config-json5 = [ "tauri-utils/config-json5" ]
-config-toml = [ "tauri-utils/config-toml" ]

core/tauri-build/README.md

@@ -2,14 +2,15 @@
 
  <img align="right" src="https://github.com/tauri-apps/tauri/raw/dev/app-icon.png" height="128" width="128">
 
-[![status](https://img.shields.io/badge/status-stable-blue.svg)](https://github.com/tauri-apps/tauri/tree/dev)
-[![License](https://img.shields.io/badge/License-MIT%20or%20Apache%202-green.svg)](https://opencollective.com/tauri)
-[![test library](https://img.shields.io/github/workflow/status/tauri-apps/tauri/test%20library?label=test%20library)](https://github.com/tauri-apps/tauri/actions?query=workflow%3A%22test+library%22)
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Ftauri-apps%2Ftauri.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Ftauri-apps%2Ftauri?ref=badge_shield)
-[![Chat Server](https://img.shields.io/badge/chat-discord-7289da.svg)](https://discord.gg/SpmNs4S)
-[![website](https://img.shields.io/badge/website-tauri.app-purple.svg)](https://tauri.app)
+[![status](https://img.shields.io/badge/Status-Stable-green.svg)](https://github.com/tauri-apps/tauri)
+[![Chat Server](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/SpmNs4S)
+[![devto](https://img.shields.io/badge/blog-dev.to-black.svg)](https://dev.to/tauri)
+
+![](https://img.shields.io/github/workflow/status/tauri-apps/tauri/test%20library?label=test%20library)
+[![devto](https://img.shields.io/badge/documentation-site-purple.svg)](https://tauri.app)
+
 [![https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg](https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg)](https://good-labs.github.io/greater-good-affirmation)
-[![support](https://img.shields.io/badge/sponsor-Open%20Collective-blue.svg)](https://opencollective.com/tauri)
+[![support](https://img.shields.io/badge/sponsor-Opencollective-blue.svg)](https://opencollective.com/tauri)
 
 | Component   | Version                                                                                                    |
 | ----------- | ---------------------------------------------------------------------------------------------------------- |

core/tauri-build/src/codegen/context.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -10,7 +10,6 @@ use std::{
   path::PathBuf,
 };
 use tauri_codegen::{context_codegen, ContextData};
-use tauri_utils::config::{AppUrl, WindowUrl};
 
 // TODO docs
 /// A builder for generating a Tauri application context during compile time.
@@ -53,13 +52,13 @@ impl CodegenContext {
   ///
   /// **Note:** This path should be relative to the `OUT_DIR`.
   ///
-  /// Don't set this if you are using [`tauri::tauri_build_context!`] as that helper macro
+  /// Don't set this if you are using [`tauri::include_codegen_context!`] as that helper macro
   /// expects the default value. This option can be useful if you are not using the helper and
   /// instead using [`std::include!`] on the generated code yourself.
   ///
   /// Defaults to `tauri-build-context.rs`.
   ///
-  /// [`tauri::tauri_build_context!`]: https://docs.rs/tauri/latest/tauri/macro.tauri_build_context.html
+  /// [`tauri::include_codegen_context!`]: https://docs.rs/tauri/0.12/tauri/macro.include_codegen_context.html
   #[must_use]
   pub fn out_file(mut self, filename: PathBuf) -> Self {
     self.out_file = filename;
@@ -86,60 +85,20 @@ impl CodegenContext {
   pub fn build(self) -> PathBuf {
     match self.try_build() {
       Ok(out) => out,
-      Err(error) => panic!("Error found during Codegen::build: {error}"),
+      Err(error) => panic!("Error found during Codegen::build: {}", error),
     }
   }
 
   /// Non-panicking [`Self::build`]
   pub fn try_build(self) -> Result<PathBuf> {
     let (config, config_parent) = tauri_codegen::get_config(&self.config_path)?;
-
-    // rerun if changed
-    let app_url = if self.dev {
-      &config.build.dev_path
-    } else {
-      &config.build.dist_dir
-    };
-    match app_url {
-      AppUrl::Url(WindowUrl::App(p)) => {
-        println!("cargo:rerun-if-changed={}", config_parent.join(p).display());
-      }
-      AppUrl::Files(files) => {
-        for path in files {
-          println!(
-            "cargo:rerun-if-changed={}",
-            config_parent.join(path).display()
-          );
-        }
-      }
-      _ => (),
-    }
-    for icon in &config.tauri.bundle.icon {
-      println!(
-        "cargo:rerun-if-changed={}",
-        config_parent.join(icon).display()
-      );
-    }
-    if let Some(tray_icon) = config.tauri.system_tray.as_ref().map(|t| &t.icon_path) {
-      println!(
-        "cargo:rerun-if-changed={}",
-        config_parent.join(tray_icon).display()
-      );
-    }
-
-    #[cfg(target_os = "macos")]
-    println!(
-      "cargo:rerun-if-changed={}",
-      config_parent.join("Info.plist").display()
-    );
-
     let code = context_codegen(ContextData {
       dev: self.dev,
       config,
       config_parent,
       // it's very hard to have a build script for unit tests, so assume this is always called from
       // outside the tauri crate, making the ::tauri root valid.
-      root: quote::quote!(::tauri),
+      root: quote::quote!(::tauri::Context),
     })?;
 
     // get the full output file path
@@ -161,7 +120,7 @@ impl CodegenContext {
       )
     })?;
 
-    writeln!(file, "{code}").with_context(|| {
+    writeln!(file, "{}", code).with_context(|| {
       format!(
         "Unable to write tokenstream to out file during tauri-build {}",
         out.display()

core/tauri-build/src/codegen/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-build/src/lib.rs

@@ -1,22 +1,19 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
 #![cfg_attr(doc_cfg, feature(doc_cfg))]
 
 pub use anyhow::Result;
-use cargo_toml::{Dependency, Manifest};
 use heck::AsShoutySnakeCase;
 
-use tauri_utils::{
-  config::Config,
-  resources::{external_binaries, resource_relpath, ResourcePaths},
-};
+use tauri_utils::resources::{external_binaries, resource_relpath, ResourcePaths};
 
 use std::path::{Path, PathBuf};
 
 #[cfg(feature = "codegen")]
 mod codegen;
+#[cfg(windows)]
 mod static_vcruntime;
 
 #[cfg(feature = "codegen")]
@@ -38,29 +35,17 @@ fn copy_file(from: impl AsRef<Path>, to: impl AsRef<Path>) -> Result<()> {
   Ok(())
 }
 
-fn copy_binaries(
-  binaries: ResourcePaths,
-  target_triple: &str,
-  path: &Path,
-  package_name: Option<&String>,
-) -> Result<()> {
+fn copy_binaries<'a>(binaries: ResourcePaths<'a>, target_triple: &str, path: &Path) -> Result<()> {
   for src in binaries {
     let src = src?;
     println!("cargo:rerun-if-changed={}", src.display());
-    let file_name = src
-      .file_name()
-      .expect("failed to extract external binary filename")
-      .to_string_lossy()
-      .replace(&format!("-{target_triple}"), "");
-
-    if package_name.map_or(false, |n| n == &file_name) {
-      return Err(anyhow::anyhow!(
-        "Cannot define a sidecar with the same name as the Cargo package name `{}`. Please change the sidecar name in the filesystem and the Tauri configuration.",
-        file_name
-      ));
-    }
-
-    let dest = path.join(file_name);
+    let dest = path.join(
+      src
+        .file_name()
+        .expect("failed to extract external binary filename")
+        .to_string_lossy()
+        .replace(&format!("-{}", target_triple), ""),
+    );
     if dest.exists() {
       std::fs::remove_file(&dest).unwrap();
     }
@@ -75,7 +60,7 @@ fn copy_resources(resources: ResourcePaths<'_>, path: &Path) -> Result<()> {
     let src = src?;
     println!("cargo:rerun-if-changed={}", src.display());
     let dest = path.join(resource_relpath(&src));
-    copy_file(&src, dest)?;
+    copy_file(&src, &dest)?;
   }
   Ok(())
 }
@@ -93,7 +78,7 @@ fn has_feature(feature: &str) -> bool {
 // `alias` must be a snake case string.
 fn cfg_alias(alias: &str, has_feature: bool) {
   if has_feature {
-    println!("cargo:rustc-cfg={alias}");
+    println!("cargo:rustc-cfg={}", alias);
   }
 }
 
@@ -109,19 +94,10 @@ pub struct WindowsAttributes {
   ///
   /// For MSVC the Windows SDK has to be installed. It comes with the resource compiler rc.exe.
   /// This should be set to the root directory of the Windows SDK, e.g., "C:\Program Files (x86)\Windows Kits\10" or,
-  /// if multiple 10 versions are installed, set it directly to the correct bin directory "C:\Program Files (x86)\Windows Kits\10\bin\10.0.14393.0\x64"
+  /// if multiple 10 versions are installed, set it directly to the corret bin directory "C:\Program Files (x86)\Windows Kits\10\bin\10.0.14393.0\x64"
   ///
   /// If it is left unset, it will look up a path in the registry, i.e. HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots
   sdk_dir: Option<PathBuf>,
-  /// A string containing an [application manifest] to be included with the application on Windows.
-  ///
-  /// Defaults to:
-  /// ```ignore
-  #[doc = include_str!("window-app-manifest.xml")]
-  /// ```
-  ///
-  /// [application manifest]: https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests
-  app_manifest: Option<String>,
 }
 
 impl WindowsAttributes {
@@ -147,45 +123,6 @@ impl WindowsAttributes {
     self.sdk_dir = Some(sdk_dir.as_ref().into());
     self
   }
-
-  /// Sets the Windows app [manifest].
-  ///
-  /// # Example
-  ///
-  /// The following manifest will brand the exe as requesting administrator privileges.
-  /// Thus, everytime it is executed, a Windows UAC dialog will appear.
-  ///
-  /// Note that you can move the manifest contents to a separate file and use `include_str!("manifest.xml")`
-  /// instead of the inline string.
-  ///
-  /// ```rust,no_run
-  /// let mut windows = tauri_build::WindowsAttributes::new();
-  /// windows = windows.app_manifest(r#"
-  /// <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  /// <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-  ///     <security>
-  ///         <requestedPrivileges>
-  ///             <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-  ///         </requestedPrivileges>
-  ///     </security>
-  /// </trustInfo>
-  /// </assembly>
-  /// "#);
-  /// tauri_build::try_build(
-  ///   tauri_build::Attributes::new().windows_attributes(windows)
-  /// ).expect("failed to run build script");
-  /// ```
-  ///
-  /// Defaults to:
-  /// ```ignore
-  #[doc = include_str!("window-app-manifest.xml")]
-  /// [manifest]: https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests
-  /// ```
-  #[must_use]
-  pub fn app_manifest<S: AsRef<str>>(mut self, manifest: S) -> Self {
-    self.app_manifest = Some(manifest.as_ref().to_string());
-    self
-  }
 }
 
 /// The attributes used on the build.
@@ -230,8 +167,8 @@ impl Attributes {
 /// This is typically desirable when running inside a build script; see [`try_build`] for no panics.
 pub fn build() {
   if let Err(error) = try_build(Attributes::default()) {
-    let error = format!("{error:#}");
-    println!("{error}");
+    let error = format!("{:#}", error);
+    println!("{}", error);
     if error.starts_with("unknown field") {
       print!("found an unknown configuration field. This usually means that you are using a CLI version that is newer than `tauri-build` and is incompatible. ");
       println!(
@@ -246,18 +183,13 @@ pub fn build() {
 #[allow(unused_variables)]
 pub fn try_build(attributes: Attributes) -> Result<()> {
   use anyhow::anyhow;
+  use cargo_toml::{Dependency, Manifest};
+  use tauri_utils::config::{Config, TauriConfig};
 
   println!("cargo:rerun-if-env-changed=TAURI_CONFIG");
   println!("cargo:rerun-if-changed=tauri.conf.json");
   #[cfg(feature = "config-json5")]
   println!("cargo:rerun-if-changed=tauri.conf.json5");
-  #[cfg(feature = "config-toml")]
-  println!("cargo:rerun-if-changed=Tauri.toml");
-
-  let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
-  let mobile = target_os == "ios" || target_os == "android";
-  cfg_alias("desktop", !mobile);
-  cfg_alias("mobile", mobile);
 
   let mut config = serde_json::from_value(tauri_utils::config::parse::read_from(
     std::env::current_dir().unwrap(),
@@ -270,33 +202,49 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
 
   cfg_alias("dev", !has_feature("custom-protocol"));
 
-  let ws_path = get_workspace_dir()?;
-  let mut manifest =
-    Manifest::<cargo_toml::Value>::from_slice_with_metadata(&std::fs::read("Cargo.toml")?)?;
-
-  if let Ok(ws_manifest) = Manifest::from_path(ws_path.join("Cargo.toml")) {
-    Manifest::complete_from_path_and_workspace(
-      &mut manifest,
-      Path::new("Cargo.toml"),
-      Some((&ws_manifest, ws_path.as_path())),
-    )?;
-  } else {
-    Manifest::complete_from_path(&mut manifest, Path::new("Cargo.toml"))?;
-  }
-
-  if let Some(tauri_build) = manifest.build_dependencies.remove("tauri-build") {
-    let error_message = check_features(&config, tauri_build, true);
-
-    if !error_message.is_empty() {
-      return Err(anyhow!("
-      The `tauri-build` dependency features on the `Cargo.toml` file does not match the allowlist defined under `tauri.conf.json`.
-      Please run `tauri dev` or `tauri build` or {}.
-    ", error_message));
-    }
-  }
-
+  let mut manifest = Manifest::from_path("Cargo.toml")?;
   if let Some(tauri) = manifest.dependencies.remove("tauri") {
-    let error_message = check_features(&config, tauri, false);
+    let features = match tauri {
+      Dependency::Simple(_) => Vec::new(),
+      Dependency::Detailed(dep) => dep.features,
+    };
+
+    let all_cli_managed_features = TauriConfig::all_features();
+    let diff = features_diff(
+      &features
+        .into_iter()
+        .filter(|f| all_cli_managed_features.contains(&f.as_str()))
+        .collect::<Vec<String>>(),
+      &config
+        .tauri
+        .features()
+        .into_iter()
+        .map(|f| f.to_string())
+        .collect::<Vec<String>>(),
+    );
+
+    let mut error_message = String::new();
+    if !diff.remove.is_empty() {
+      error_message.push_str("remove the `");
+      error_message.push_str(&diff.remove.join(", "));
+      error_message.push_str(if diff.remove.len() == 1 {
+        "` feature"
+      } else {
+        "` features"
+      });
+      if !diff.add.is_empty() {
+        error_message.push_str(" and ");
+      }
+    }
+    if !diff.add.is_empty() {
+      error_message.push_str("add the `");
+      error_message.push_str(&diff.add.join(", "));
+      error_message.push_str(if diff.add.len() == 1 {
+        "` feature"
+      } else {
+        "` features"
+      });
+    }
 
     if !error_message.is_empty() {
       return Err(anyhow!("
@@ -322,31 +270,30 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
       ResourcePaths::new(external_binaries(paths, &target_triple).as_slice(), true),
       &target_triple,
       target_dir,
-      manifest.package.as_ref().map(|p| &p.name),
     )?;
   }
 
   #[allow(unused_mut, clippy::redundant_clone)]
   let mut resources = config.tauri.bundle.resources.clone().unwrap_or_default();
-  if target_triple.contains("windows") {
-    if let Some(fixed_webview2_runtime_path) =
-      &config.tauri.bundle.windows.webview_fixed_runtime_path
-    {
-      resources.push(fixed_webview2_runtime_path.display().to_string());
-    }
+  #[cfg(windows)]
+  if let Some(fixed_webview2_runtime_path) = &config.tauri.bundle.windows.webview_fixed_runtime_path
+  {
+    resources.push(fixed_webview2_runtime_path.display().to_string());
   }
   copy_resources(ResourcePaths::new(resources.as_slice(), true), target_dir)?;
 
-  if target_triple.contains("darwin") {
-    if let Some(version) = &config.tauri.bundle.macos.minimum_system_version {
-      println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET={version}");
+  #[cfg(target_os = "macos")]
+  {
+    if let Some(version) = config.tauri.bundle.macos.minimum_system_version {
+      println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET={}", version);
     }
   }
 
-  if target_triple.contains("windows") {
+  #[cfg(windows)]
+  {
     use anyhow::Context;
     use semver::Version;
-    use tauri_winres::{VersionInfo, WindowsResource};
+    use winres::{VersionInfo, WindowsResource};
 
     fn find_icon<F: Fn(&&String) -> bool>(config: &Config, predicate: F, default: &str) -> PathBuf {
       let icon_path = config
@@ -367,13 +314,6 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
 
     if window_icon_path.exists() {
       let mut res = WindowsResource::new();
-
-      if let Some(manifest) = attributes.windows_attributes.app_manifest {
-        res.set_manifest(&manifest);
-      } else {
-        res.set_manifest(include_str!("window-app-manifest.xml"));
-      }
-
       if let Some(sdk_dir) = &attributes.windows_attributes.sdk_dir {
         if let Some(sdk_dir_str) = sdk_dir.to_str() {
           res.set_toolkit_path(sdk_dir_str);
@@ -470,89 +410,6 @@ fn features_diff(current: &[String], expected: &[String]) -> Diff {
   Diff { remove, add }
 }
 
-fn check_features(config: &Config, dependency: Dependency, is_tauri_build: bool) -> String {
-  use tauri_utils::config::{PatternKind, TauriConfig};
-
-  let features = match dependency {
-    Dependency::Simple(_) => Vec::new(),
-    Dependency::Detailed(dep) => dep.features,
-    Dependency::Inherited(dep) => dep.features,
-  };
-
-  let all_cli_managed_features = if is_tauri_build {
-    vec!["isolation"]
-  } else {
-    TauriConfig::all_features()
-  };
-
-  let expected = if is_tauri_build {
-    match config.tauri.pattern {
-      PatternKind::Isolation { .. } => vec!["isolation".to_string()],
-      _ => vec![],
-    }
-  } else {
-    config
-      .tauri
-      .features()
-      .into_iter()
-      .map(|f| f.to_string())
-      .collect::<Vec<String>>()
-  };
-
-  let diff = features_diff(
-    &features
-      .into_iter()
-      .filter(|f| all_cli_managed_features.contains(&f.as_str()))
-      .collect::<Vec<String>>(),
-    &expected,
-  );
-
-  let mut error_message = String::new();
-  if !diff.remove.is_empty() {
-    error_message.push_str("remove the `");
-    error_message.push_str(&diff.remove.join(", "));
-    error_message.push_str(if diff.remove.len() == 1 {
-      "` feature"
-    } else {
-      "` features"
-    });
-    if !diff.add.is_empty() {
-      error_message.push_str(" and ");
-    }
-  }
-  if !diff.add.is_empty() {
-    error_message.push_str("add the `");
-    error_message.push_str(&diff.add.join(", "));
-    error_message.push_str(if diff.add.len() == 1 {
-      "` feature"
-    } else {
-      "` features"
-    });
-  }
-
-  error_message
-}
-
-#[derive(serde::Deserialize)]
-struct CargoMetadata {
-  workspace_root: PathBuf,
-}
-
-fn get_workspace_dir() -> Result<PathBuf> {
-  let output = std::process::Command::new("cargo")
-    .args(["metadata", "--no-deps", "--format-version", "1"])
-    .output()?;
-
-  if !output.status.success() {
-    return Err(anyhow::anyhow!(
-      "cargo metadata command exited with a non zero exit code: {}",
-      String::from_utf8(output.stderr)?
-    ));
-  }
-
-  Ok(serde_json::from_slice::<CargoMetadata>(&output.stdout)?.workspace_root)
-}
-
 #[cfg(test)]
 mod tests {
   use super::Diff;

core/tauri-build/src/static_vcruntime.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -10,7 +10,7 @@ use std::{env, fs, io::Write, path::Path};
 pub fn build() {
   override_msvcrt_lib();
 
-  // Disable conflicting libraries that aren't hard coded by Rust
+  // Disable conflicting libraries that aren't hard coded by Rust.
   println!("cargo:rustc-link-arg=/NODEFAULTLIB:libvcruntimed.lib");
   println!("cargo:rustc-link-arg=/NODEFAULTLIB:vcruntime.lib");
   println!("cargo:rustc-link-arg=/NODEFAULTLIB:vcruntimed.lib");
@@ -48,7 +48,7 @@ fn override_msvcrt_lib() {
   let f = fs::OpenOptions::new()
     .write(true)
     .create_new(true)
-    .open(path);
+    .open(&path);
   if let Ok(mut f) = f {
     f.write_all(machine).unwrap();
     f.write_all(bytes).unwrap();

core/tauri-build/src/window-app-manifest.xml

@@ -1,14 +0,0 @@
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-        type="win32"
-        name="Microsoft.Windows.Common-Controls"
-        version="6.0.0.0"
-        processorArchitecture="*"
-        publicKeyToken="6595b64144ccf1df"
-        language="*"
-      />
-    </dependentAssembly>
-  </dependency>
-</assembly>

core/tauri-codegen/CHANGELOG.md

@@ -1,43 +1,5 @@
 # Changelog
 
-## \[1.3.0]
-
-- Bump minimum supported Rust version to 1.60.
-  - [5fdc616d](https://www.github.com/tauri-apps/tauri/commit/5fdc616df9bea633810dcb814ac615911d77222c) feat: Use the zbus-backed of notify-rust ([#6332](https://www.github.com/tauri-apps/tauri/pull/6332)) on 2023-03-31
-- Pin `time` to `0.3.15`.
-  - [3d16461b](https://www.github.com/tauri-apps/tauri/commit/3d16461b68583ba7db037fbc217786e79b46ddf2) fix(core): pin time to 0.3.15 ([#6312](https://www.github.com/tauri-apps/tauri/pull/6312)) on 2023-02-19
-
-## \[1.2.1]
-
-- Fix `allowlist > app > show/hide` always disabled when `allowlist > app > all: false`.
-  - Bumped due to a bump in tauri-utils.
-  - [bb251087](https://www.github.com/tauri-apps/tauri/commit/bb2510876d0bdff736d36bf3a465cdbe4ad2b90c) fix(core): extend allowlist with `app`'s allowlist, closes [#5650](https://www.github.com/tauri-apps/tauri/pull/5650) ([#5652](https://www.github.com/tauri-apps/tauri/pull/5652)) on 2022-11-18
-
-## \[1.2.0]
-
-- Properly serialize HTML template tags.
-  - [aec5537d](https://www.github.com/tauri-apps/tauri/commit/aec5537de0205f62b2ae5c89da04d21930a6fc2e) fix(codegen): serialize template tags, closes [#4410](https://www.github.com/tauri-apps/tauri/pull/4410) ([#5247](https://www.github.com/tauri-apps/tauri/pull/5247)) on 2022-09-28
-- - [7d9aa398](https://www.github.com/tauri-apps/tauri/commit/7d9aa3987efce2d697179ffc33646d086c68030c) feat: bump MSRV to 1.59 ([#5296](https://www.github.com/tauri-apps/tauri/pull/5296)) on 2022-09-28
-
-## \[1.1.1]
-
-- Add missing allowlist config for `set_cursor_grab`, `set_cursor_visible`, `set_cursor_icon` and `set_cursor_position` APIs.
-  - Bumped due to a bump in tauri-utils.
-  - [c764408d](https://www.github.com/tauri-apps/tauri/commit/c764408da7fae123edd41115bda42fa75a4731d2) fix: Add missing allowlist config for cursor apis, closes [#5207](https://www.github.com/tauri-apps/tauri/pull/5207) ([#5211](https://www.github.com/tauri-apps/tauri/pull/5211)) on 2022-09-16
-
-## \[1.1.0]
-
-- Use `TARGET` environment variable for code generation inside build scripts.
-  - [6ba99689](https://www.github.com/tauri-apps/tauri/commit/6ba99689aa7ed0ffa9072a1c8ab5db12c9bf95af) feat(codegen): use TARGET environment variable if set ([#4921](https://www.github.com/tauri-apps/tauri/pull/4921)) on 2022-08-12
-- Added support to configuration files in TOML format (Tauri.toml file).
-  - [ae83d008](https://www.github.com/tauri-apps/tauri/commit/ae83d008f9e1b89bfc8dddaca42aa5c1fbc36f6d) feat: add support to TOML config file `Tauri.toml`, closes [#4806](https://www.github.com/tauri-apps/tauri/pull/4806) ([#4813](https://www.github.com/tauri-apps/tauri/pull/4813)) on 2022-08-02
-- Improve tray icon read error message.
-  - [52f0c8bb](https://www.github.com/tauri-apps/tauri/commit/52f0c8bb836c6d50b7ce2393161394f4ce78f5ae) feat(core): improve tray icon read error messages ([#4850](https://www.github.com/tauri-apps/tauri/pull/4850)) on 2022-08-03
-- Fix relative paths in `version` field of `tauri.config.json` not being correctly parsed by `generate_context!()`.
-  - [accbc5e8](https://www.github.com/tauri-apps/tauri/commit/accbc5e8806a32efc555d019634fc2fa14d17f0a) fix(codegen): fix relative paths in `version` field of `tauri.config.json`, closes [#4723](https://www.github.com/tauri-apps/tauri/pull/4723) ([#4725](https://www.github.com/tauri-apps/tauri/pull/4725)) on 2022-07-24
-- Only rewrite temporary icon files when the content change, avoid needless rebuilds.
-  - [f957cbb5](https://www.github.com/tauri-apps/tauri/commit/f957cbb56ccbd8d1c047a978b4579946252a6fd2) fix(codegen): write output file when contents change ([#4889](https://www.github.com/tauri-apps/tauri/pull/4889)) on 2022-08-09
-
 ## \[1.0.4]
 
 - Validate `__TAURI_ISOLATION_HOOK__` being set by a file in the isolation application.

core/tauri-codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-codegen"
-version = "1.3.0"
+version = "1.0.4"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 categories = [ "gui", "web-programming" ]
 license = "Apache-2.0 OR MIT"
@@ -8,31 +8,31 @@ homepage = "https://tauri.app"
 repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-codegen"
 description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
 edition = "2021"
-rust-version = "1.60"
-exclude = [ "CHANGELOG.md", "/target" ]
+rust-version = "1.57"
+exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
 readme = "README.md"
 
 [dependencies]
 sha2 = "0.10"
-base64 = "0.21"
+base64 = "0.13"
 proc-macro2 = "1"
 quote = "1"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
-tauri-utils = { version = "1.3.0", path = "../tauri-utils", features = [ "build" ] }
+tauri-utils = { version = "1.0.3", path = "../tauri-utils", features = [ "build" ] }
 thiserror = "1"
 walkdir = "2"
 brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] }
-regex = { version = "1.7.1", optional = true }
+regex = { version = "1.6.0", optional = true }
 uuid = { version = "1", features = [ "v4" ] }
 semver = "1"
-ico = "0.3"
+ico = "0.1"
 png = "0.17"
-json-patch = "1.0"
+json-patch = "0.2"
 
 [target."cfg(target_os = \"macos\")".dependencies]
 plist = "1"
-time = { version = "=0.3.15", features = [ "parsing", "formatting" ] }
+time = { version = "0.3", features = [ "parsing", "formatting" ] }
 
 [features]
 default = [ "compression" ]
@@ -40,4 +40,3 @@ compression = [ "brotli", "tauri-utils/compression" ]
 isolation = [ "tauri-utils/isolation" ]
 shell-scope = [ "regex" ]
 config-json5 = [ "tauri-utils/config-json5" ]
-config-toml = [ "tauri-utils/config-toml" ]

core/tauri-codegen/src/context.rs

@@ -1,20 +1,17 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
 use std::path::{Path, PathBuf};
 use std::{ffi::OsStr, str::FromStr};
 
-use base64::Engine;
 use proc_macro2::TokenStream;
 use quote::quote;
 use sha2::{Digest, Sha256};
 
 use tauri_utils::assets::AssetKey;
 use tauri_utils::config::{AppUrl, Config, PatternKind, WindowUrl};
-use tauri_utils::html::{
-  inject_nonce_token, parse as parse_html, serialize_node as serialize_html_node,
-};
+use tauri_utils::html::{inject_nonce_token, parse as parse_html};
 
 #[cfg(feature = "shell-scope")]
 use tauri_utils::config::{ShellAllowedArg, ShellAllowedArgs, ShellAllowlistScope};
@@ -31,7 +28,6 @@ pub struct ContextData {
 
 fn map_core_assets(
   options: &AssetOptions,
-  target: Target,
 ) -> impl Fn(&AssetKey, &Path, &mut Vec<u8>, &mut CspHashes) -> Result<(), EmbeddedAssetsError> {
   #[cfg(feature = "isolation")]
   let pattern = tauri_utils::html::PatternObject::from(&options.pattern);
@@ -40,13 +36,12 @@ fn map_core_assets(
     options.dangerous_disable_asset_csp_modification.clone();
   move |key, path, input, csp_hashes| {
     if path.extension() == Some(OsStr::new("html")) {
+      let mut document = parse_html(String::from_utf8_lossy(input).into_owned());
+
       #[allow(clippy::collapsible_if)]
       if csp {
-        let mut document = parse_html(String::from_utf8_lossy(input).into_owned());
-
-        if target == Target::Linux {
-          ::tauri_utils::html::inject_csp_token(&mut document);
-        }
+        #[cfg(target_os = "linux")]
+        ::tauri_utils::html::inject_csp_token(&mut document);
 
         inject_nonce_token(&mut document, &dangerous_disable_asset_csp_modification);
 
@@ -58,10 +53,7 @@ fn map_core_assets(
               let mut hasher = Sha256::new();
               hasher.update(&script);
               let hash = hasher.finalize();
-              scripts.push(format!(
-                "'sha256-{}'",
-                base64::engine::general_purpose::STANDARD.encode(hash)
-              ));
+              scripts.push(format!("'sha256-{}'", base64::encode(&hash)));
             }
             csp_hashes
               .inline_scripts
@@ -78,15 +70,14 @@ fn map_core_assets(
             let mut hasher = Sha256::new();
             hasher.update(tauri_utils::pattern::isolation::IFRAME_STYLE);
             let hash = hasher.finalize();
-            csp_hashes.styles.push(format!(
-              "'sha256-{}'",
-              base64::engine::general_purpose::STANDARD.encode(hash)
-            ));
+            csp_hashes
+              .styles
+              .push(format!("'sha256-{}'", base64::encode(&hash)));
           }
         }
-
-        *input = serialize_html_node(&document);
       }
+
+      *input = document.to_string().as_bytes().to_vec();
     }
     Ok(())
   }
@@ -115,16 +106,6 @@ fn map_isolation(
   }
 }
 
-#[derive(PartialEq, Eq, Clone, Copy)]
-enum Target {
-  Linux,
-  Windows,
-  Darwin,
-  Android,
-  // iOS.
-  Ios,
-}
-
 /// Build a `tauri::Context` for including in application code.
 pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsError> {
   let ContextData {
@@ -134,34 +115,6 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
     root,
   } = data;
 
-  let target = if let Ok(target) = std::env::var("TARGET") {
-    if target.contains("unknown-linux") {
-      Target::Linux
-    } else if target.contains("pc-windows") {
-      Target::Windows
-    } else if target.contains("apple-darwin") {
-      Target::Darwin
-    } else if target.contains("android") {
-      Target::Android
-    } else if target.contains("apple-ios") {
-      Target::Ios
-    } else {
-      panic!("unknown codegen target {target}");
-    }
-  } else if cfg!(target_os = "linux") {
-    Target::Linux
-  } else if cfg!(windows) {
-    Target::Windows
-  } else if cfg!(target_os = "macos") {
-    Target::Darwin
-  } else if cfg!(target_os = "android") {
-    Target::Android
-  } else if cfg!(target_os = "ios") {
-    Target::Ios
-  } else {
-    panic!("unknown codegen target");
-  };
-
   let mut options = AssetOptions::new(config.tauri.pattern.clone())
     .freeze_prototype(config.tauri.security.freeze_prototype)
     .dangerous_disable_asset_csp_modification(
@@ -209,7 +162,7 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
             path
           )
         }
-        EmbeddedAssets::new(assets_path, &options, map_core_assets(&options, target))?
+        EmbeddedAssets::new(assets_path, &options, map_core_assets(&options))?
       }
       _ => unimplemented!(),
     },
@@ -219,7 +172,7 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
         .map(|p| config_parent.join(p))
         .collect::<Vec<_>>(),
       &options,
-      map_core_assets(&options, target),
+      map_core_assets(&options),
     )?,
     _ => unimplemented!(),
   };
@@ -236,28 +189,18 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
     out_dir
   };
 
+  // handle default window icons for Windows targets
+  #[cfg(windows)]
   let default_window_icon = {
-    if target == Target::Windows {
-      // handle default window icons for Windows targets
-      let icon_path = find_icon(
-        &config,
-        &config_parent,
-        |i| i.ends_with(".ico"),
-        "icons/icon.ico",
-      );
-      if icon_path.exists() {
-        ico_icon(&root, &out_dir, icon_path)?
-      } else {
-        let icon_path = find_icon(
-          &config,
-          &config_parent,
-          |i| i.ends_with(".png"),
-          "icons/icon.png",
-        );
-        png_icon(&root, &out_dir, icon_path)?
-      }
-    } else if target == Target::Linux {
-      // handle default window icons for Linux targets
+    let icon_path = find_icon(
+      &config,
+      &config_parent,
+      |i| i.ends_with(".ico"),
+      "icons/icon.ico",
+    );
+    if icon_path.exists() {
+      ico_icon(&root, &out_dir, icon_path)?
+    } else {
       let icon_path = find_icon(
         &config,
         &config_parent,
@@ -265,12 +208,23 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
         "icons/icon.png",
       );
       png_icon(&root, &out_dir, icon_path)?
-    } else {
-      quote!(None)
     }
   };
+  #[cfg(target_os = "linux")]
+  let default_window_icon = {
+    let icon_path = find_icon(
+      &config,
+      &config_parent,
+      |i| i.ends_with(".png"),
+      "icons/icon.png",
+    );
+    png_icon(&root, &out_dir, icon_path)?
+  };
+  #[cfg(not(any(windows, target_os = "linux")))]
+  let default_window_icon = quote!(None);
 
-  let app_icon = if target == Target::Darwin && dev {
+  #[cfg(target_os = "macos")]
+  let app_icon = if dev {
     let mut icon_path = find_icon(
       &config,
       &config_parent,
@@ -289,6 +243,8 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
   } else {
     quote!(None)
   };
+  #[cfg(not(target_os = "macos"))]
+  let app_icon = quote!(None);
 
   let package_name = if let Some(product_name) = &config.package.product_name {
     quote!(#product_name.to_string())
@@ -327,55 +283,56 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
   };
 
   #[cfg(target_os = "macos")]
-  let info_plist = if target == Target::Darwin && dev {
-    let info_plist_path = config_parent.join("Info.plist");
-    let mut info_plist = if info_plist_path.exists() {
-      plist::Value::from_file(&info_plist_path)
-        .unwrap_or_else(|e| panic!("failed to read plist {}: {}", info_plist_path.display(), e))
+  let info_plist = {
+    if dev {
+      let info_plist_path = config_parent.join("Info.plist");
+      let mut info_plist = if info_plist_path.exists() {
+        plist::Value::from_file(&info_plist_path)
+          .unwrap_or_else(|e| panic!("failed to read plist {}: {}", info_plist_path.display(), e))
+      } else {
+        plist::Value::Dictionary(Default::default())
+      };
+
+      if let Some(plist) = info_plist.as_dictionary_mut() {
+        if let Some(product_name) = &config.package.product_name {
+          plist.insert("CFBundleName".into(), product_name.clone().into());
+        }
+        if let Some(version) = &config.package.version {
+          plist.insert("CFBundleShortVersionString".into(), version.clone().into());
+        }
+        let format =
+          time::format_description::parse("[year][month][day].[hour][minute][second]").unwrap();
+        if let Ok(build_number) = time::OffsetDateTime::now_utc().format(&format) {
+          plist.insert("CFBundleVersion".into(), build_number.into());
+        }
+      }
+
+      let out_path = out_dir.join("Info.plist");
+      info_plist
+        .to_file_xml(&out_path)
+        .expect("failed to write Info.plist");
+
+      let info_plist_path = out_path.display().to_string();
+      quote!({
+        tauri::embed_plist::embed_info_plist!(#info_plist_path);
+      })
     } else {
-      plist::Value::Dictionary(Default::default())
-    };
-
-    if let Some(plist) = info_plist.as_dictionary_mut() {
-      if let Some(product_name) = &config.package.product_name {
-        plist.insert("CFBundleName".into(), product_name.clone().into());
-      }
-      if let Some(version) = &config.package.version {
-        plist.insert("CFBundleShortVersionString".into(), version.clone().into());
-      }
-      let format =
-        time::format_description::parse("[year][month][day].[hour][minute][second]").unwrap();
-      if let Ok(build_number) = time::OffsetDateTime::now_utc().format(&format) {
-        plist.insert("CFBundleVersion".into(), build_number.into());
-      }
+      quote!(())
     }
-
-    let out_path = out_dir.join("Info.plist");
-    info_plist
-      .to_file_xml(&out_path)
-      .expect("failed to write Info.plist");
-
-    let info_plist_path = out_path.display().to_string();
-    quote!({
-      tauri::embed_plist::embed_info_plist!(#info_plist_path);
-    })
-  } else {
-    quote!(())
   };
   #[cfg(not(target_os = "macos"))]
   let info_plist = quote!(());
 
   let pattern = match &options.pattern {
     PatternKind::Brownfield => quote!(#root::Pattern::Brownfield(std::marker::PhantomData)),
-    #[cfg(not(feature = "isolation"))]
-    PatternKind::Isolation { dir: _ } => {
-      quote!(#root::Pattern::Brownfield(std::marker::PhantomData))
-    }
     #[cfg(feature = "isolation")]
     PatternKind::Isolation { dir } => {
       let dir = config_parent.join(dir);
       if !dir.exists() {
-        panic!("The isolation application path is set to `{dir:?}` but it does not exist")
+        panic!(
+          "The isolation application path is set to `{:?}` but it does not exist",
+          dir
+        )
       }
 
       let mut sets_isolation_hook = false;
@@ -416,7 +373,7 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
     let shell_scope_open = match &config.tauri.allowlist.shell.open {
       ShellAllowlistOpen::Flag(false) => quote!(::std::option::Option::None),
       ShellAllowlistOpen::Flag(true) => {
-        quote!(::std::option::Option::Some(#root::regex::Regex::new(r#"^((mailto:\w+)|(tel:\w+)|(https?://\w+)).+"#).unwrap()))
+        quote!(::std::option::Option::Some(#root::regex::Regex::new("^https?://").unwrap()))
       }
       ShellAllowlistOpen::Validate(regex) => match Regex::new(regex) {
         Ok(_) => quote!(::std::option::Option::Some(#root::regex::Regex::new(#regex).unwrap())),
@@ -458,45 +415,66 @@ fn ico_icon<P: AsRef<Path>>(
   out_dir: &Path,
   path: P,
 ) -> Result<TokenStream, EmbeddedAssetsError> {
+  use std::fs::File;
+  use std::io::Write;
+
   let path = path.as_ref();
-  let bytes = std::fs::read(path)
-    .unwrap_or_else(|e| panic!("failed to read icon {}: {}", path.display(), e))
+  let bytes = std::fs::read(&path)
+    .unwrap_or_else(|_| panic!("failed to read icon {}", path.display()))
     .to_vec();
   let icon_dir = ico::IconDir::read(std::io::Cursor::new(bytes))
-    .unwrap_or_else(|e| panic!("failed to parse icon {}: {}", path.display(), e));
+    .unwrap_or_else(|_| panic!("failed to parse icon {}", path.display()));
   let entry = &icon_dir.entries()[0];
   let rgba = entry
     .decode()
-    .unwrap_or_else(|e| panic!("failed to decode icon {}: {}", path.display(), e))
+    .unwrap_or_else(|_| panic!("failed to decode icon {}", path.display()))
     .rgba_data()
     .to_vec();
   let width = entry.width();
   let height = entry.height();
 
   let out_path = out_dir.join(path.file_name().unwrap());
-  write_if_changed(&out_path, &rgba).map_err(|error| EmbeddedAssetsError::AssetWrite {
-    path: path.to_owned(),
+  let mut out_file = File::create(&out_path).map_err(|error| EmbeddedAssetsError::AssetWrite {
+    path: out_path.clone(),
     error,
   })?;
 
+  out_file
+    .write_all(&rgba)
+    .map_err(|error| EmbeddedAssetsError::AssetWrite {
+      path: path.to_owned(),
+      error,
+    })?;
+
   let out_path = out_path.display().to_string();
 
   let icon = quote!(Some(#root::Icon::Rgba { rgba: include_bytes!(#out_path).to_vec(), width: #width, height: #height }));
   Ok(icon)
 }
 
+#[cfg(target_os = "macos")]
 fn raw_icon<P: AsRef<Path>>(out_dir: &Path, path: P) -> Result<TokenStream, EmbeddedAssetsError> {
+  use std::fs::File;
+  use std::io::Write;
+
   let path = path.as_ref();
-  let bytes = std::fs::read(path)
-    .unwrap_or_else(|e| panic!("failed to read icon {}: {}", path.display(), e))
+  let bytes = std::fs::read(&path)
+    .unwrap_or_else(|_| panic!("failed to read icon {}", path.display()))
     .to_vec();
 
   let out_path = out_dir.join(path.file_name().unwrap());
-  write_if_changed(&out_path, &bytes).map_err(|error| EmbeddedAssetsError::AssetWrite {
-    path: path.to_owned(),
+  let mut out_file = File::create(&out_path).map_err(|error| EmbeddedAssetsError::AssetWrite {
+    path: out_path.clone(),
     error,
   })?;
 
+  out_file
+    .write_all(&bytes)
+    .map_err(|error| EmbeddedAssetsError::AssetWrite {
+      path: path.to_owned(),
+      error,
+    })?;
+
   let out_path = out_path.display().to_string();
 
   let icon = quote!(Some(include_bytes!(#out_path).to_vec()));
@@ -508,14 +486,17 @@ fn png_icon<P: AsRef<Path>>(
   out_dir: &Path,
   path: P,
 ) -> Result<TokenStream, EmbeddedAssetsError> {
+  use std::fs::File;
+  use std::io::Write;
+
   let path = path.as_ref();
-  let bytes = std::fs::read(path)
-    .unwrap_or_else(|e| panic!("failed to read icon {}: {}", path.display(), e))
+  let bytes = std::fs::read(&path)
+    .unwrap_or_else(|_| panic!("failed to read icon {}", path.display()))
     .to_vec();
   let decoder = png::Decoder::new(std::io::Cursor::new(bytes));
   let mut reader = decoder
     .read_info()
-    .unwrap_or_else(|e| panic!("failed to read icon {}: {}", path.display(), e));
+    .unwrap_or_else(|_| panic!("failed to read icon {}", path.display()));
   let mut buffer: Vec<u8> = Vec::new();
   while let Ok(Some(row)) = reader.next_row() {
     buffer.extend(row.data());
@@ -524,31 +505,24 @@ fn png_icon<P: AsRef<Path>>(
   let height = reader.info().height;
 
   let out_path = out_dir.join(path.file_name().unwrap());
-  write_if_changed(&out_path, &buffer).map_err(|error| EmbeddedAssetsError::AssetWrite {
-    path: path.to_owned(),
+  let mut out_file = File::create(&out_path).map_err(|error| EmbeddedAssetsError::AssetWrite {
+    path: out_path.clone(),
     error,
   })?;
 
+  out_file
+    .write_all(&buffer)
+    .map_err(|error| EmbeddedAssetsError::AssetWrite {
+      path: path.to_owned(),
+      error,
+    })?;
+
   let out_path = out_path.display().to_string();
 
   let icon = quote!(Some(#root::Icon::Rgba { rgba: include_bytes!(#out_path).to_vec(), width: #width, height: #height }));
   Ok(icon)
 }
 
-fn write_if_changed(out_path: &Path, data: &[u8]) -> std::io::Result<()> {
-  use std::fs::File;
-  use std::io::Write;
-
-  if let Ok(curr) = std::fs::read(out_path) {
-    if curr == data {
-      return Ok(());
-    }
-  }
-
-  let mut out_file = File::create(out_path)?;
-  out_file.write_all(data)
-}
-
 fn find_icon<F: Fn(&&String) -> bool>(
   config: &Config,
   config_parent: &Path,

core/tauri-codegen/src/embedded_assets.rs

@@ -1,8 +1,7 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use base64::Engine;
 use proc_macro2::TokenStream;
 use quote::{quote, ToTokens, TokenStreamExt};
 use sha2::{Digest, Sha256};
@@ -182,10 +181,9 @@ impl CspHashes {
           })?,
         );
         let hash = hasher.finalize();
-        self.scripts.push(format!(
-          "'sha256-{}'",
-          base64::engine::general_purpose::STANDARD.encode(hash)
-        ));
+        self
+          .scripts
+          .push(format!("'sha256-{}'", base64::encode(hash)));
       }
     }
 
@@ -345,14 +343,14 @@ impl EmbeddedAssets {
 
       let mut hex = String::with_capacity(2 * bytes.len());
       for b in bytes {
-        write!(hex, "{b:02x}").map_err(EmbeddedAssetsError::Hex)?;
+        write!(hex, "{:02x}", b).map_err(EmbeddedAssetsError::Hex)?;
       }
       hex
     };
 
     // use the content hash to determine filename, keep extensions that exist
     let out_path = if let Some(ext) = path.extension().and_then(|e| e.to_str()) {
-      out_dir.join(format!("{hash}.{ext}"))
+      out_dir.join(format!("{}.{}", hash, ext))
     } else {
       out_dir.join(hash)
     };
@@ -433,7 +431,6 @@ impl ToTokens for EmbeddedAssets {
 
     // we expect phf related items to be in path when generating the path code
     tokens.append_all(quote! {{
-        #[allow(unused)]
         use ::tauri::utils::assets::{CspHash, EmbeddedAssets, phf, phf::phf_map};
         EmbeddedAssets::new(phf_map! { #assets }, &[#global_hashes], phf_map! { #html_hashes })
     }});

core/tauri-codegen/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -64,14 +64,5 @@ pub fn get_config(path: &Path) -> Result<(Config, PathBuf), CodegenConfigError>
     json_patch::merge(&mut config, &merge_config);
   }
 
-  let old_cwd = std::env::current_dir().map_err(CodegenConfigError::CurrentDir)?;
-  // Set working directory to where `tauri.config.json` is, so that relative paths in it are parsed correctly.
-  std::env::set_current_dir(parent.clone()).map_err(CodegenConfigError::CurrentDir)?;
-
-  let config = serde_json::from_value(config)?;
-
-  // Reset working directory.
-  std::env::set_current_dir(old_cwd).map_err(CodegenConfigError::CurrentDir)?;
-
-  Ok((config, parent))
+  Ok((serde_json::from_value(config)?, parent))
 }

core/tauri-codegen/src/vendor/blake3_reference.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-codegen/src/vendor/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-config-schema/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "tauri-tauri-config-schema"
-version = "0.0.0"
-edition = "2021"
-publish = false
-
-[build-dependencies]
-tauri-utils = { version = "1.0.0", features = [
-  "schema",
-], path = "../tauri-utils" }
-schemars = { version = "0.8", features = ["url", "preserve_order"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-serde_with = "1.12"
-url = { version = "2.3", features = ["serde"] }

core/tauri-config-schema/build.rs

@@ -1,25 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-use std::{
-  error::Error,
-  fs::File,
-  io::{BufWriter, Write},
-  path::PathBuf,
-};
-
-pub fn main() -> Result<(), Box<dyn Error>> {
-  let schema = schemars::schema_for!(tauri_utils::config::Config);
-  let schema_str = serde_json::to_string_pretty(&schema).unwrap();
-  let crate_dir = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR")?);
-  for file in [
-    crate_dir.join("schema.json"),
-    crate_dir.join("../../tooling/cli/schema.json"),
-  ] {
-    let mut schema_file = BufWriter::new(File::create(file)?);
-    write!(schema_file, "{schema_str}")?;
-  }
-
-  Ok(())
-}

core/tauri-config-schema/src/main.rs

@@ -1,5 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-fn main() {}

core/tauri-macros/CHANGELOG.md

@@ -1,31 +1,5 @@
 # Changelog
 
-## \[1.3.0]
-
-- Bump minimum supported Rust version to 1.60.
-  - [5fdc616d](https://www.github.com/tauri-apps/tauri/commit/5fdc616df9bea633810dcb814ac615911d77222c) feat: Use the zbus-backed of notify-rust ([#6332](https://www.github.com/tauri-apps/tauri/pull/6332)) on 2023-03-31
-
-## \[1.2.1]
-
-- Fix `allowlist > app > show/hide` always disabled when `allowlist > app > all: false`.
-  - Bumped due to a bump in tauri-utils.
-  - [bb251087](https://www.github.com/tauri-apps/tauri/commit/bb2510876d0bdff736d36bf3a465cdbe4ad2b90c) fix(core): extend allowlist with `app`'s allowlist, closes [#5650](https://www.github.com/tauri-apps/tauri/pull/5650) ([#5652](https://www.github.com/tauri-apps/tauri/pull/5652)) on 2022-11-18
-
-## \[1.2.0]
-
-- - [7d9aa398](https://www.github.com/tauri-apps/tauri/commit/7d9aa3987efce2d697179ffc33646d086c68030c) feat: bump MSRV to 1.59 ([#5296](https://www.github.com/tauri-apps/tauri/pull/5296)) on 2022-09-28
-
-## \[1.1.1]
-
-- Add missing allowlist config for `set_cursor_grab`, `set_cursor_visible`, `set_cursor_icon` and `set_cursor_position` APIs.
-  - Bumped due to a bump in tauri-utils.
-  - [c764408d](https://www.github.com/tauri-apps/tauri/commit/c764408da7fae123edd41115bda42fa75a4731d2) fix: Add missing allowlist config for cursor apis, closes [#5207](https://www.github.com/tauri-apps/tauri/pull/5207) ([#5211](https://www.github.com/tauri-apps/tauri/pull/5211)) on 2022-09-16
-
-## \[1.1.0]
-
-- Added support to configuration files in TOML format (Tauri.toml file).
-  - [ae83d008](https://www.github.com/tauri-apps/tauri/commit/ae83d008f9e1b89bfc8dddaca42aa5c1fbc36f6d) feat: add support to TOML config file `Tauri.toml`, closes [#4806](https://www.github.com/tauri-apps/tauri/pull/4806) ([#4813](https://www.github.com/tauri-apps/tauri/pull/4813)) on 2022-08-02
-
 ## \[1.0.4]
 
 - Adjust command imports to fix `items_after_statements` Clippy warning.

core/tauri-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-macros"
-version = "1.3.0"
+version = "1.0.4"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 categories = [ "gui", "os", "filesystem", "web-programming" ]
 license = "Apache-2.0 OR MIT"
@@ -8,8 +8,8 @@ homepage = "https://tauri.app"
 repository = "https://github.com/tauri-apps/tauri"
 description = "Macros for the tauri crate."
 edition = "2021"
-rust-version = "1.60"
-exclude = [ "CHANGELOG.md", "/target" ]
+rust-version = "1.57"
+exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
 readme = "README.md"
 
 [lib]
@@ -20,8 +20,8 @@ proc-macro2 = "1"
 quote = "1"
 syn = { version = "1", features = [ "full" ] }
 heck = "0.4"
-tauri-codegen = { version = "1.3.0", default-features = false, path = "../tauri-codegen" }
-tauri-utils = { version = "1.3.0", path = "../tauri-utils" }
+tauri-codegen = { version = "1.0.4", default-features = false, path = "../tauri-codegen" }
+tauri-utils = { version = "1.0.3", path = "../tauri-utils" }
 
 [features]
 custom-protocol = [ ]
@@ -29,4 +29,3 @@ compression = [ "tauri-codegen/compression" ]
 isolation = [ "tauri-codegen/isolation" ]
 shell-scope = [ "tauri-codegen/shell-scope" ]
 config-json5 = [ "tauri-codegen/config-json5", "tauri-utils/config-json5" ]
-config-toml = [ "tauri-codegen/config-toml", "tauri-utils/config-toml" ]

core/tauri-macros/README.md

@@ -2,14 +2,15 @@
 
  <img align="right" src="https://github.com/tauri-apps/tauri/raw/dev/app-icon.png" height="128" width="128">
 
-[![status](https://img.shields.io/badge/status-stable-blue.svg)](https://github.com/tauri-apps/tauri/tree/dev)
-[![License](https://img.shields.io/badge/License-MIT%20or%20Apache%202-green.svg)](https://opencollective.com/tauri)
-[![test library](https://img.shields.io/github/workflow/status/tauri-apps/tauri/test%20library?label=test%20library)](https://github.com/tauri-apps/tauri/actions?query=workflow%3A%22test+library%22)
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Ftauri-apps%2Ftauri.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Ftauri-apps%2Ftauri?ref=badge_shield)
-[![Chat Server](https://img.shields.io/badge/chat-discord-7289da.svg)](https://discord.gg/SpmNs4S)
-[![website](https://img.shields.io/badge/website-tauri.app-purple.svg)](https://tauri.app)
+[![status](https://img.shields.io/badge/Status-Stable-green.svg)](https://github.com/tauri-apps/tauri)
+[![Chat Server](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/SpmNs4S)
+[![devto](https://img.shields.io/badge/blog-dev.to-black.svg)](https://dev.to/tauri)
+
+![](https://img.shields.io/github/workflow/status/tauri-apps/tauri/test%20library?label=test%20library)
+[![devto](https://img.shields.io/badge/documentation-site-purple.svg)](https://tauri.app)
+
 [![https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg](https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg)](https://good-labs.github.io/greater-good-affirmation)
-[![support](https://img.shields.io/badge/sponsor-Open%20Collective-blue.svg)](https://opencollective.com/tauri)
+[![support](https://img.shields.io/badge/sponsor-Opencollective-blue.svg)](https://opencollective.com/tauri)
 
 | Component    | Version                                                                                                      |
 | ------------ | ------------------------------------------------------------------------------------------------------------ |

core/tauri-macros/src/command/handler.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-macros/src/command/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-macros/src/command/wrapper.rs

@@ -1,83 +1,40 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use heck::{ToLowerCamelCase, ToSnakeCase};
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{format_ident, quote};
 use syn::{
   ext::IdentExt,
-  parse::{Parse, ParseStream},
+  parse::{Parse, ParseBuffer},
   parse_macro_input,
   spanned::Spanned,
-  FnArg, Ident, ItemFn, Lit, Meta, Pat, Token, Visibility,
+  FnArg, Ident, ItemFn, Pat, Token, Visibility,
 };
 
-struct WrapperAttributes {
-  execution_context: ExecutionContext,
-  argument_case: ArgumentCase,
-}
-
-impl Parse for WrapperAttributes {
-  fn parse(input: ParseStream) -> syn::Result<Self> {
-    let mut wrapper_attributes = WrapperAttributes {
-      execution_context: ExecutionContext::Blocking,
-      argument_case: ArgumentCase::Camel,
-    };
-
-    loop {
-      match input.parse::<Meta>() {
-        Ok(Meta::List(_)) => {}
-        Ok(Meta::NameValue(v)) => {
-          if v.path.is_ident("rename_all") {
-            if let Lit::Str(s) = v.lit {
-              wrapper_attributes.argument_case = match s.value().as_str() {
-                "snake_case" => ArgumentCase::Snake,
-                "camelCase" => ArgumentCase::Camel,
-                _ => {
-                  return Err(syn::Error::new(
-                    s.span(),
-                    "expected \"camelCase\" or \"snake_case\"",
-                  ))
-                }
-              };
-            }
-          }
-        }
-        Ok(Meta::Path(p)) => {
-          if p.is_ident("async") {
-            wrapper_attributes.execution_context = ExecutionContext::Async;
-          } else {
-            return Err(syn::Error::new(p.span(), "expected `async`"));
-          }
-        }
-        Err(_e) => {
-          break;
-        }
-      }
-
-      let lookahead = input.lookahead1();
-      if lookahead.peek(Token![,]) {
-        input.parse::<Token![,]>()?;
-      }
-    }
-
-    Ok(wrapper_attributes)
-  }
-}
-
 /// The execution context of the command.
 enum ExecutionContext {
   Async,
   Blocking,
 }
 
-/// The case of each argument name.
-#[derive(Copy, Clone)]
-enum ArgumentCase {
-  Snake,
-  Camel,
+impl Parse for ExecutionContext {
+  fn parse(input: &ParseBuffer<'_>) -> syn::Result<Self> {
+    if input.is_empty() {
+      return Ok(Self::Blocking);
+    }
+
+    input
+      .parse::<Token![async]>()
+      .map(|_| Self::Async)
+      .map_err(|_| {
+        syn::Error::new(
+          input.span(),
+          "only a single item `async` is currently allowed",
+        )
+      })
+  }
 }
 
 /// The bindings we attach to `tauri::Invoke`.
@@ -104,16 +61,14 @@ pub fn wrapper(attributes: TokenStream, item: TokenStream) -> TokenStream {
   };
 
   // body to the command wrapper or a `compile_error!` of an error occurred while parsing it.
-  let body = syn::parse::<WrapperAttributes>(attributes)
-    .map(|mut attrs| {
-      if function.sig.asyncness.is_some() {
-        attrs.execution_context = ExecutionContext::Async;
-      }
-      attrs
+  let body = syn::parse::<ExecutionContext>(attributes)
+    .map(|context| match function.sig.asyncness {
+      Some(_) => ExecutionContext::Async,
+      None => context,
     })
-    .and_then(|attrs| match attrs.execution_context {
-      ExecutionContext::Async => body_async(&function, &invoke, attrs.argument_case),
-      ExecutionContext::Blocking => body_blocking(&function, &invoke, attrs.argument_case),
+    .and_then(|context| match context {
+      ExecutionContext::Async => body_async(&function, &invoke),
+      ExecutionContext::Blocking => body_blocking(&function, &invoke),
     })
     .unwrap_or_else(syn::Error::into_compile_error);
 
@@ -150,9 +105,9 @@ pub fn wrapper(attributes: TokenStream, item: TokenStream) -> TokenStream {
 /// See the [`tauri::command`] module for all the items and traits that make this possible.
 ///
 /// [`tauri::command`]: https://docs.rs/tauri/*/tauri/runtime/index.html
-fn body_async(function: &ItemFn, invoke: &Invoke, case: ArgumentCase) -> syn::Result<TokenStream2> {
+fn body_async(function: &ItemFn, invoke: &Invoke) -> syn::Result<TokenStream2> {
   let Invoke { message, resolver } = invoke;
-  parse_args(function, message, case).map(|args| {
+  parse_args(function, message).map(|args| {
     quote! {
       #resolver.respond_async_serialized(async move {
         let result = $path(#(#args?),*);
@@ -168,13 +123,9 @@ fn body_async(function: &ItemFn, invoke: &Invoke, case: ArgumentCase) -> syn::Re
 /// See the [`tauri::command`] module for all the items and traits that make this possible.
 ///
 /// [`tauri::command`]: https://docs.rs/tauri/*/tauri/runtime/index.html
-fn body_blocking(
-  function: &ItemFn,
-  invoke: &Invoke,
-  case: ArgumentCase,
-) -> syn::Result<TokenStream2> {
+fn body_blocking(function: &ItemFn, invoke: &Invoke) -> syn::Result<TokenStream2> {
   let Invoke { message, resolver } = invoke;
-  let args = parse_args(function, message, case)?;
+  let args = parse_args(function, message)?;
 
   // the body of a `match` to early return any argument that wasn't successful in parsing.
   let match_body = quote!({
@@ -190,26 +141,17 @@ fn body_blocking(
 }
 
 /// Parse all arguments for the command wrapper to use from the signature of the command function.
-fn parse_args(
-  function: &ItemFn,
-  message: &Ident,
-  case: ArgumentCase,
-) -> syn::Result<Vec<TokenStream2>> {
+fn parse_args(function: &ItemFn, message: &Ident) -> syn::Result<Vec<TokenStream2>> {
   function
     .sig
     .inputs
     .iter()
-    .map(|arg| parse_arg(&function.sig.ident, arg, message, case))
+    .map(|arg| parse_arg(&function.sig.ident, arg, message))
     .collect()
 }
 
 /// Transform a [`FnArg`] into a command argument.
-fn parse_arg(
-  command: &Ident,
-  arg: &FnArg,
-  message: &Ident,
-  case: ArgumentCase,
-) -> syn::Result<TokenStream2> {
+fn parse_arg(command: &Ident, arg: &FnArg, message: &Ident) -> syn::Result<TokenStream2> {
   // we have no use for self arguments
   let mut arg = match arg {
     FnArg::Typed(arg) => arg.pat.as_ref().clone(),
@@ -243,13 +185,9 @@ fn parse_arg(
     ));
   }
 
-  match case {
-    ArgumentCase::Camel => {
-      key = key.to_lower_camel_case();
-    }
-    ArgumentCase::Snake => {
-      key = key.to_snake_case();
-    }
+  // snake_case -> camelCase
+  if key.as_str().contains('_') {
+    key = snake_case_to_camel_case(key.as_str());
   }
 
   Ok(quote!(::tauri::command::CommandArg::from_command(
@@ -260,3 +198,19 @@ fn parse_arg(
     }
   )))
 }
+
+/// Convert a snake_case string into camelCase, no underscores will be left.
+fn snake_case_to_camel_case(key: &str) -> String {
+  let mut camel = String::with_capacity(key.len());
+  let mut to_upper = false;
+
+  for c in key.chars() {
+    match c {
+      '_' => to_upper = true,
+      c if std::mem::take(&mut to_upper) => camel.push(c.to_ascii_uppercase()),
+      c => camel.push(c),
+    }
+  }
+
+  camel
+}

core/tauri-macros/src/command_module.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-macros/src/context.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -11,7 +11,7 @@ use syn::{
   LitStr, PathArguments, PathSegment, Token,
 };
 use tauri_codegen::{context_codegen, get_config, ContextData};
-use tauri_utils::config::parse::does_supported_file_name_exist;
+use tauri_utils::config::parse::does_supported_extension_exist;
 
 pub(crate) struct ContextItems {
   config_file: PathBuf,
@@ -36,7 +36,7 @@ impl Parse for ContextItems {
       VarError::NotUnicode(_) => "CARGO_MANIFEST_DIR env var contained invalid utf8".into(),
     })
     .and_then(|path| {
-      if does_supported_file_name_exist(&path) {
+      if does_supported_extension_exist(&path) {
         Ok(path)
       } else {
         Err(format!(

core/tauri-macros/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -88,7 +88,7 @@ pub fn derive_command_module(input: TokenStream) -> TokenStream {
 /// The `run` method takes a `tauri::endpoints::InvokeContext`
 /// and returns a `tauri::Result<tauri::endpoints::InvokeResponse>`.
 /// It matches on each enum variant and call a method with name equal to the variant name, lowercased and snake_cased,
-/// passing the context and the variant's fields as arguments.
+/// passing the the context and the variant's fields as arguments.
 /// That function must also return the same `Result<InvokeResponse>`.
 #[doc(hidden)]
 #[proc_macro_attribute]

core/tauri-macros/src/runtime.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-runtime-wry/CHANGELOG.md

@@ -1,110 +1,5 @@
 # Changelog
 
-## \[0.13.0]
-
-- Added the `additional_browser_args` option when creating a window.
-  - [3dc38b15](https://www.github.com/tauri-apps/tauri/commit/3dc38b150ea8c59c8ba67fd586f921016928f47c) feat(core): expose additional_browser_args to window config (fix: [#5757](https://www.github.com/tauri-apps/tauri/pull/5757)) ([#5799](https://www.github.com/tauri-apps/tauri/pull/5799)) on 2022-12-14
-- Added the `content_protected` option when creating a window and `Window::set_content_protected` to change it at runtime.
-  - [4ab5545b](https://www.github.com/tauri-apps/tauri/commit/4ab5545b7a831c549f3c65e74de487ede3ab7ce5) feat: add content protection api, closes [#5132](https://www.github.com/tauri-apps/tauri/pull/5132) ([#5513](https://www.github.com/tauri-apps/tauri/pull/5513)) on 2022-12-13
-- Added `Builder::device_event_filter` and `App::set_device_event_filter` methods.
-  - [73fd60ee](https://www.github.com/tauri-apps/tauri/commit/73fd60eef2b60f5dc84525ef9c315f4d80c4414f) expose set_device_event_filter in tauri ([#5562](https://www.github.com/tauri-apps/tauri/pull/5562)) on 2022-12-13
-- Fixes tray events not being delivered.
-  - [138cb8d7](https://www.github.com/tauri-apps/tauri/commit/138cb8d739b15bccdb388e555c20f17ffe16318c) fix(tauri-runtime-wry): tray event listener not registered ([#6270](https://www.github.com/tauri-apps/tauri/pull/6270)) on 2023-02-14
-- Add `is_minimized()` window method.
-  - [62144ef3](https://www.github.com/tauri-apps/tauri/commit/62144ef3be63b237869e511826edfb938e2c7174) feat: add is_minimized (fix [#3878](https://www.github.com/tauri-apps/tauri/pull/3878)) ([#5618](https://www.github.com/tauri-apps/tauri/pull/5618)) on 2022-12-13
-- Disable cursor mouse events on Linux.
-  - [8c842a54](https://www.github.com/tauri-apps/tauri/commit/8c842a54a6f3dc5327b4d737df7123dcddaa5769) feature: disable mouse event when building windows on Linux, closes [#5913](https://www.github.com/tauri-apps/tauri/pull/5913) ([#6025](https://www.github.com/tauri-apps/tauri/pull/6025)) on 2023-01-16
-- Bump minimum supported Rust version to 1.60.
-  - [5fdc616d](https://www.github.com/tauri-apps/tauri/commit/5fdc616df9bea633810dcb814ac615911d77222c) feat: Use the zbus-backed of notify-rust ([#6332](https://www.github.com/tauri-apps/tauri/pull/6332)) on 2023-03-31
-- Pin raw-window-handle to 0.5.0 to keep MSRV.
-  - [c46c09f3](https://www.github.com/tauri-apps/tauri/commit/c46c09f31d9f5169ca8a7e62406a9ea170e3a5c5) fix(deps): pin raw-window-handle to 0.5.0 ([#6480](https://www.github.com/tauri-apps/tauri/pull/6480)) on 2023-03-17
-- Add `title` getter on window.
-  - [233e43b0](https://www.github.com/tauri-apps/tauri/commit/233e43b0c34fada1ca025378533a0b76931a6540) feat: add `title` getter on window, closes [#5023](https://www.github.com/tauri-apps/tauri/pull/5023) ([#5515](https://www.github.com/tauri-apps/tauri/pull/5515)) on 2022-12-13
-- Added `TrayHandle::set_tooltip` and `SystemTray::with_tooltip`.
-  - [2265e097](https://www.github.com/tauri-apps/tauri/commit/2265e09718f6ebfeb1d200f11e1e1e069075af6e) feat(windows): implement `with_tooltip` ([#5938](https://www.github.com/tauri-apps/tauri/pull/5938)) on 2023-01-01
-- Added window's `url()` getter.
-  - [d17027e1](https://www.github.com/tauri-apps/tauri/commit/d17027e1a0db3e8c5ae81fc4f472c5918fbce611) feat: expose url method ([#5914](https://www.github.com/tauri-apps/tauri/pull/5914)) on 2022-12-26
-- On Windows, change webview theme based on Window theme for more accurate `prefers-color-scheme` support.
-  - [7a8d570d](https://www.github.com/tauri-apps/tauri/commit/7a8d570db72667367eb24b75ddc5dd07a968f7c0) fix: sync webview theme with window theme on Windows, closes [#5802](https://www.github.com/tauri-apps/tauri/pull/5802) ([#5874](https://www.github.com/tauri-apps/tauri/pull/5874)) on 2022-12-27
-- On Windows, Fix missing `WindowEvent::Focused` in `App::run` callback.
-  - [ff4ea1ea](https://www.github.com/tauri-apps/tauri/commit/ff4ea1eabbf2874b113c6b4698002929bbac737a) fix: dispatch focus event to app.run on Windows, closes [#6460](https://www.github.com/tauri-apps/tauri/pull/6460) ([#6504](https://www.github.com/tauri-apps/tauri/pull/6504)) on 2023-03-31
-- Implement the webview navigation handler.
-  - [3f35b452](https://www.github.com/tauri-apps/tauri/commit/3f35b452637ef1c794a423f1eda62a15d2ddaf42) Expose wry navigation_handler via WindowBuilder closes [#4080](https://www.github.com/tauri-apps/tauri/pull/4080) ([#5686](https://www.github.com/tauri-apps/tauri/pull/5686)) on 2022-12-27
-
-## \[0.12.3]
-
-- Block remote URLs from accessing the IPC.
-  - [9c0593c33](https://www.github.com/tauri-apps/tauri/commit/9c0593c33af52cd9e00ec784d15f63efebdf039c) feat(core): block remote URLs from accessing the IPC on 2023-04-12
-
-## \[0.12.2]
-
-- Fix compatibility with older Linux distributions.
-  - [b490308c](https://www.github.com/tauri-apps/tauri/commit/b490308c8897b893292951754607c2253abbc6e1) fix(core): compilation error on older Linux versions, fixes [#5684](https://www.github.com/tauri-apps/tauri/pull/5684) ([#5697](https://www.github.com/tauri-apps/tauri/pull/5697)) on 2022-11-28
-- Update wry to 0.23.
-  - [fdcd7733](https://www.github.com/tauri-apps/tauri/commit/fdcd77338c1a3a7ef8a8ea1907351c5c350ea7ba) chore(deps): update wry to 0.23 on 2022-12-08
-
-## \[0.12.1]
-
-- Fix `allowlist > app > show/hide` always disabled when `allowlist > app > all: false`.
-  - Bumped due to a bump in tauri-utils.
-  - [bb251087](https://www.github.com/tauri-apps/tauri/commit/bb2510876d0bdff736d36bf3a465cdbe4ad2b90c) fix(core): extend allowlist with `app`'s allowlist, closes [#5650](https://www.github.com/tauri-apps/tauri/pull/5650) ([#5652](https://www.github.com/tauri-apps/tauri/pull/5652)) on 2022-11-18
-
-## \[0.12.0]
-
-- Add `accept_first_mouse` option for macOS windows.
-  - [95f467ad](https://www.github.com/tauri-apps/tauri/commit/95f467add51448319983c54e2f382c7c09fb72d6) feat(core): add window `accept_first_mouse` option, closes [#5347](https://www.github.com/tauri-apps/tauri/pull/5347) ([#5374](https://www.github.com/tauri-apps/tauri/pull/5374)) on 2022-10-17
-- Disable automatic window tabbing on macOS when the `tabbing_identifier` option is not defined, the window is transparent or does not have decorations.
-  - [4137ab44](https://www.github.com/tauri-apps/tauri/commit/4137ab44a81d739556cbc7583485887e78952bf1) feat(macos): add `tabbing_identifier` option, closes [#2804](https://www.github.com/tauri-apps/tauri/pull/2804), [#3912](https://www.github.com/tauri-apps/tauri/pull/3912) ([#5399](https://www.github.com/tauri-apps/tauri/pull/5399)) on 2022-10-19
-- Drop the WebContext when the WebView is dropped.
-  - [9d8b3774](https://www.github.com/tauri-apps/tauri/commit/9d8b377481abf975dc37f9050d2ac7b63ce353e9) feat(tauri-runtime-wry): drop the WebContext on WebView drop ([#5240](https://www.github.com/tauri-apps/tauri/pull/5240)) on 2022-10-19
-- Readd the option to create an unfocused window via the `focused` method. The `focus` function has been deprecated.
-  - [4036e15f](https://www.github.com/tauri-apps/tauri/commit/4036e15f5af933bdc0d0913508b5103958afc143) feat(core): reimplement window initial focus flag, closes [#5120](https://www.github.com/tauri-apps/tauri/pull/5120) ([#5338](https://www.github.com/tauri-apps/tauri/pull/5338)) on 2022-10-08
-- Add `hidden_title` option for macOS windows.
-  - [321f3fed](https://www.github.com/tauri-apps/tauri/commit/321f3fed19df40c1223099bce953332b7f00f7a9) feat(macos): `title_bar_style` and `hidden_title` window options, closes [#2663](https://www.github.com/tauri-apps/tauri/pull/2663) ([#3965](https://www.github.com/tauri-apps/tauri/pull/3965)) on 2022-09-30
-- Custom protocol headers are now implemented on Linux when running on webkit2gtk 2.36 or above.
-  - [357480f4](https://www.github.com/tauri-apps/tauri/commit/357480f4ae43aa8da99f7ba61ae2ee51b4552c60) feat(core): custom protocol headers on Linux, closes [#4496](https://www.github.com/tauri-apps/tauri/pull/4496) ([#5421](https://www.github.com/tauri-apps/tauri/pull/5421)) on 2022-10-17
-- Added `Runtime::show()`, `RuntimeHandle::show()`, `Runtime::hide()`, `RuntimeHandle::hide()` for hiding/showing the entire application on macOS.
-  - [39bf895b](https://www.github.com/tauri-apps/tauri/commit/39bf895b73ec6b53f5758815396ba85dda6b9c67) feat(macOS): Add application `show` and `hide` methods ([#3689](https://www.github.com/tauri-apps/tauri/pull/3689)) on 2022-10-03
-- Fix regression in `SystemTray::with_menu_on_left_click`
-  - [f8a3becb](https://www.github.com/tauri-apps/tauri/commit/f8a3becb287942db7f7b551b5db6aeb5a2e939ee) feat(core): add option to disable tray menu on left click, closes [#4584](https://www.github.com/tauri-apps/tauri/pull/4584) ([#4587](https://www.github.com/tauri-apps/tauri/pull/4587)) on 2022-07-05
-  - [7bbf167c](https://www.github.com/tauri-apps/tauri/commit/7bbf167c1c84493ea6e2353f720edafd7daa47e4) Apply Version Updates From Current Changes ([#4560](https://www.github.com/tauri-apps/tauri/pull/4560)) on 2022-07-06
-  - [63011ca8](https://www.github.com/tauri-apps/tauri/commit/63011ca84e7a22c8c0d8bd1c1be6592140f93ff2) fix(macos): fix regression in `with_menu_on_left_click`, closes [#5220](https://www.github.com/tauri-apps/tauri/pull/5220) ([#5235](https://www.github.com/tauri-apps/tauri/pull/5235)) on 2022-09-30
-- - [7d9aa398](https://www.github.com/tauri-apps/tauri/commit/7d9aa3987efce2d697179ffc33646d086c68030c) feat: bump MSRV to 1.59 ([#5296](https://www.github.com/tauri-apps/tauri/pull/5296)) on 2022-09-28
-- Added `tabbing_identifier` to the window builder on macOS.
-  - [4137ab44](https://www.github.com/tauri-apps/tauri/commit/4137ab44a81d739556cbc7583485887e78952bf1) feat(macos): add `tabbing_identifier` option, closes [#2804](https://www.github.com/tauri-apps/tauri/pull/2804), [#3912](https://www.github.com/tauri-apps/tauri/pull/3912) ([#5399](https://www.github.com/tauri-apps/tauri/pull/5399)) on 2022-10-19
-- Add `title_bar_style` option for macOS windows.
-  - [321f3fed](https://www.github.com/tauri-apps/tauri/commit/321f3fed19df40c1223099bce953332b7f00f7a9) feat(macos): `title_bar_style` and `hidden_title` window options, closes [#2663](https://www.github.com/tauri-apps/tauri/pull/2663) ([#3965](https://www.github.com/tauri-apps/tauri/pull/3965)) on 2022-09-30
-- Fix regression introduce in tauri@1.1 which prevented removing tray icon when the app exits on Windows.
-  - [f756cd5e](https://www.github.com/tauri-apps/tauri/commit/f756cd5e7ecc86f178f8d602eded1e1b6ecb51f3) fix(core): wait for tray cleanup before exiting app, closes [#5244](https://www.github.com/tauri-apps/tauri/pull/5244) ([#5245](https://www.github.com/tauri-apps/tauri/pull/5245)) on 2022-10-04
-- Added methods to set the system tray title on macOS.
-  - [8f1ace77](https://www.github.com/tauri-apps/tauri/commit/8f1ace77956ac3477826ceb059a191e55b3fff93) feat: expose `set_title` for MacOS tray ([#5182](https://www.github.com/tauri-apps/tauri/pull/5182)) on 2022-09-30
-- Added the `user_agent` option when creating a window.
-  - [a6c94119](https://www.github.com/tauri-apps/tauri/commit/a6c94119d8545d509723b147c273ca5edfe3729f) feat(core): expose user_agent to window config ([#5317](https://www.github.com/tauri-apps/tauri/pull/5317)) on 2022-10-02
-
-## \[0.11.2]
-
-- Block remote URLs from accessing the IPC.
-  - [58ea0b452](https://www.github.com/tauri-apps/tauri/commit/58ea0b45268dbd46cbac0ebb0887353d057ca767) feat(core): block remote URLs from accessing the IPC on 2023-04-12
-
-## \[0.11.1]
-
-- Add missing allowlist config for `set_cursor_grab`, `set_cursor_visible`, `set_cursor_icon` and `set_cursor_position` APIs.
-  - Bumped due to a bump in tauri-utils.
-  - [c764408d](https://www.github.com/tauri-apps/tauri/commit/c764408da7fae123edd41115bda42fa75a4731d2) fix: Add missing allowlist config for cursor apis, closes [#5207](https://www.github.com/tauri-apps/tauri/pull/5207) ([#5211](https://www.github.com/tauri-apps/tauri/pull/5211)) on 2022-09-16
-
-## \[0.11.0]
-
-- Ignore window events with unknown IDs.
-  - [0668dd42](https://www.github.com/tauri-apps/tauri/commit/0668dd42204b163f11aaf31f45106c8551f15942) fix(tauri-runtime-wry): ignore events on unknown windows on 2022-08-29
-- Implement theme APIs for Linux.
-  - [f21cbecd](https://www.github.com/tauri-apps/tauri/commit/f21cbecdeb3571ac4ad971b9a865ff62a131a176) feat(core): implement theme APIs for Linux ([#4808](https://www.github.com/tauri-apps/tauri/pull/4808)) on 2022-08-02
-- Changed `windows` map to be stored in a `RefCell` instead of a `Mutex`.
-  - [64546cb9](https://www.github.com/tauri-apps/tauri/commit/64546cb9cca2fe56cf81cfc4aaf85c4e1d58877c) refactor: use RefCell instead of Mutex for windows map, closes [#4870](https://www.github.com/tauri-apps/tauri/pull/4870) ([#4909](https://www.github.com/tauri-apps/tauri/pull/4909)) on 2022-08-10
-- Added APIs to create a system tray at runtime.
-  - [4d063ae9](https://www.github.com/tauri-apps/tauri/commit/4d063ae9ee9538cd6fa5e01b80070c6edf8eaeb9) feat(core): create system tray at runtime, closes [#2278](https://www.github.com/tauri-apps/tauri/pull/2278) ([#4862](https://www.github.com/tauri-apps/tauri/pull/4862)) on 2022-08-09
-- Update windows to 0.39.0 and webview2-com to 0.19.1.
-  - [e6d9b670](https://www.github.com/tauri-apps/tauri/commit/e6d9b670b0b314ed667b0e164f2c8d27048e678f) refactor: remove unneeded focus code ([#5065](https://www.github.com/tauri-apps/tauri/pull/5065)) on 2022-09-03
-
 ## \[0.10.3]
 
 - Block remote URLs from accessing the IPC.

core/tauri-runtime-wry/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime-wry"
-version = "0.13.0"
+version = "0.10.3"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 categories = [ "gui", "web-programming" ]
 license = "Apache-2.0 OR MIT"
@@ -8,28 +8,29 @@ homepage = "https://tauri.app"
 repository = "https://github.com/tauri-apps/tauri"
 description = "Wry bindings to the Tauri runtime"
 edition = "2021"
-rust-version = "1.60"
-exclude = [ "CHANGELOG.md", "/target" ]
+rust-version = "1.57"
+exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
 readme = "README.md"
 
 [dependencies]
-wry = { version = "0.24.1", default-features = false, features = [ "file-drop", "protocol" ] }
-tauri-runtime = { version = "0.13.0", path = "../tauri-runtime" }
-tauri-utils = { version = "1.3.0", path = "../tauri-utils" }
+wry = { version = "0.19", default-features = false, features = [ "file-drop", "protocol" ] }
+tauri-runtime = { version = "0.10.3", path = "../tauri-runtime" }
+tauri-utils = { version = "1.0.3", path = "../tauri-utils" }
 uuid = { version = "1", features = [ "v4" ] }
 rand = "0.8"
-raw-window-handle = "=0.5.0"
+raw-window-handle = "0.4.3"
+url = "2"
 
 [target."cfg(windows)".dependencies]
-webview2-com = "0.19.1"
+webview2-com = "0.16.0"
 
   [target."cfg(windows)".dependencies.windows]
-  version = "0.39.0"
+  version = "0.37.0"
   features = [ "Win32_Foundation" ]
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 gtk = { version = "0.15", features = [ "v3_20" ] }
-webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] }
+webkit2gtk = { version = "0.18", features = [ "v2_22" ] }
 percent-encoding = "2.1"
 
 [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
@@ -47,4 +48,3 @@ macos-private-api = [
 objc-exception = [ "wry/objc-exception" ]
 global-shortcut = [ "tauri-runtime/global-shortcut" ]
 clipboard = [ "tauri-runtime/clipboard" ]
-linux-headers = [ "wry/linux-headers", "webkit2gtk/v2_36" ]

core/tauri-runtime-wry/build.rs

@@ -1,18 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-// creates a cfg alias if `has_feature` is true.
-// `alias` must be a snake case string.
-fn alias(alias: &str, has_feature: bool) {
-  if has_feature {
-    println!("cargo:rustc-cfg={alias}");
-  }
-}
-
-fn main() {
-  let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
-  let mobile = target_os == "ios" || target_os == "android";
-  alias("desktop", !mobile);
-  alias("mobile", mobile);
-}

core/tauri-runtime-wry/src/clipboard.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-runtime-wry/src/global_shortcut.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -16,10 +16,10 @@ use std::{
 use crate::{getter, Context, Message};
 
 use tauri_runtime::{Error, GlobalShortcutManager, Result, UserEvent};
-#[cfg(desktop)]
-pub use wry::application::{
+pub use wry::application::global_shortcut::ShortcutManager as WryShortcutManager;
+use wry::application::{
   accelerator::{Accelerator, AcceleratorId},
-  global_shortcut::{GlobalShortcut, ShortcutManager as WryShortcutManager},
+  global_shortcut::GlobalShortcut,
 };
 
 pub type GlobalShortcutListeners = Arc<Mutex<HashMap<AcceleratorId, Box<dyn Fn() + Send>>>>;

core/tauri-runtime-wry/src/system_tray.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
@@ -9,7 +9,6 @@ pub use tauri_runtime::{
   },
   Icon, SystemTrayEvent,
 };
-use wry::application::event_loop::EventLoopWindowTarget;
 pub use wry::application::{
   event::TrayEvent,
   event_loop::EventLoopProxy,
@@ -17,62 +16,26 @@ pub use wry::application::{
     ContextMenu as WryContextMenu, CustomMenuItem as WryCustomMenuItem, MenuItem as WryMenuItem,
   },
   system_tray::Icon as WryTrayIcon,
-  TrayId as WryTrayId,
 };
 
 #[cfg(target_os = "macos")]
-pub use wry::application::platform::macos::{
-  CustomMenuItemExtMacOS, SystemTrayBuilderExtMacOS, SystemTrayExtMacOS,
-};
+pub use wry::application::platform::macos::CustomMenuItemExtMacOS;
 
-use wry::application::system_tray::{SystemTray as WrySystemTray, SystemTrayBuilder};
+use crate::{Error, Message, Result, TrayMessage};
 
-use crate::{send_user_message, Context, Error, Message, Result, TrayId, TrayMessage};
+use tauri_runtime::{menu::MenuHash, UserEvent};
 
-use tauri_runtime::{menu::MenuHash, SystemTray, UserEvent};
+use uuid::Uuid;
 
 use std::{
   collections::HashMap,
-  fmt,
   sync::{Arc, Mutex},
 };
 
-pub type GlobalSystemTrayEventHandler = Box<dyn Fn(TrayId, &SystemTrayEvent) + Send>;
-pub type GlobalSystemTrayEventListeners = Arc<Mutex<Vec<Arc<GlobalSystemTrayEventHandler>>>>;
-
 pub type SystemTrayEventHandler = Box<dyn Fn(&SystemTrayEvent) + Send>;
-pub type SystemTrayEventListeners = Arc<Mutex<Vec<Arc<SystemTrayEventHandler>>>>;
+pub type SystemTrayEventListeners = Arc<Mutex<HashMap<Uuid, Arc<SystemTrayEventHandler>>>>;
 pub type SystemTrayItems = Arc<Mutex<HashMap<u16, WryCustomMenuItem>>>;
 
-#[derive(Clone, Default)]
-pub struct TrayContext {
-  pub tray: Arc<Mutex<Option<WrySystemTray>>>,
-  pub listeners: SystemTrayEventListeners,
-  pub items: SystemTrayItems,
-}
-
-impl fmt::Debug for TrayContext {
-  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-    f.debug_struct("TrayContext")
-      .field("items", &self.items)
-      .finish()
-  }
-}
-
-#[derive(Clone, Default)]
-pub struct SystemTrayManager {
-  pub trays: Arc<Mutex<HashMap<TrayId, TrayContext>>>,
-  pub global_listeners: GlobalSystemTrayEventListeners,
-}
-
-impl fmt::Debug for SystemTrayManager {
-  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-    f.debug_struct("SystemTrayManager")
-      .field("trays", &self.trays)
-      .finish()
-  }
-}
-
 /// Wrapper around a [`wry::application::system_tray::Icon`] that can be created from an [`WindowIcon`].
 pub struct TrayIcon(pub(crate) WryTrayIcon);
 
@@ -85,50 +48,8 @@ impl TryFrom<Icon> for TrayIcon {
   }
 }
 
-pub fn create_tray<T>(
-  id: WryTrayId,
-  system_tray: SystemTray,
-  event_loop: &EventLoopWindowTarget<T>,
-) -> crate::Result<(WrySystemTray, HashMap<u16, WryCustomMenuItem>)> {
-  let icon = TrayIcon::try_from(system_tray.icon.expect("tray icon not set"))?;
-
-  let mut items = HashMap::new();
-
-  #[allow(unused_mut)]
-  let mut builder = SystemTrayBuilder::new(
-    icon.0,
-    system_tray
-      .menu
-      .map(|menu| to_wry_context_menu(&mut items, menu)),
-  )
-  .with_id(id);
-
-  #[cfg(target_os = "macos")]
-  {
-    builder = builder
-      .with_icon_as_template(system_tray.icon_as_template)
-      .with_menu_on_left_click(system_tray.menu_on_left_click);
-
-    if let Some(title) = system_tray.title {
-      builder = builder.with_title(&title);
-    }
-  }
-
-  if let Some(tooltip) = system_tray.tooltip {
-    builder = builder.with_tooltip(&tooltip);
-  }
-
-  let tray = builder
-    .build(event_loop)
-    .map_err(|e| Error::SystemTray(Box::new(e)))?;
-
-  Ok((tray, items))
-}
-
 #[derive(Debug, Clone)]
 pub struct SystemTrayHandle<T: UserEvent> {
-  pub(crate) context: Context<T>,
-  pub(crate) id: TrayId,
   pub(crate) proxy: EventLoopProxy<super::Message<T>>,
 }
 
@@ -136,65 +57,30 @@ impl<T: UserEvent> TrayHandle for SystemTrayHandle<T> {
   fn set_icon(&self, icon: Icon) -> Result<()> {
     self
       .proxy
-      .send_event(Message::Tray(self.id, TrayMessage::UpdateIcon(icon)))
+      .send_event(Message::Tray(TrayMessage::UpdateIcon(icon)))
       .map_err(|_| Error::FailedToSendMessage)
   }
-
   fn set_menu(&self, menu: SystemTrayMenu) -> Result<()> {
     self
       .proxy
-      .send_event(Message::Tray(self.id, TrayMessage::UpdateMenu(menu)))
+      .send_event(Message::Tray(TrayMessage::UpdateMenu(menu)))
       .map_err(|_| Error::FailedToSendMessage)
   }
-
   fn update_item(&self, id: u16, update: MenuUpdate) -> Result<()> {
     self
       .proxy
-      .send_event(Message::Tray(self.id, TrayMessage::UpdateItem(id, update)))
+      .send_event(Message::Tray(TrayMessage::UpdateItem(id, update)))
       .map_err(|_| Error::FailedToSendMessage)
   }
-
   #[cfg(target_os = "macos")]
   fn set_icon_as_template(&self, is_template: bool) -> tauri_runtime::Result<()> {
     self
       .proxy
-      .send_event(Message::Tray(
-        self.id,
-        TrayMessage::UpdateIconAsTemplate(is_template),
-      ))
+      .send_event(Message::Tray(TrayMessage::UpdateIconAsTemplate(
+        is_template,
+      )))
       .map_err(|_| Error::FailedToSendMessage)
   }
-
-  #[cfg(target_os = "macos")]
-  fn set_title(&self, title: &str) -> tauri_runtime::Result<()> {
-    self
-      .proxy
-      .send_event(Message::Tray(
-        self.id,
-        TrayMessage::UpdateTitle(title.to_owned()),
-      ))
-      .map_err(|_| Error::FailedToSendMessage)
-  }
-
-  fn set_tooltip(&self, tooltip: &str) -> Result<()> {
-    self
-      .proxy
-      .send_event(Message::Tray(
-        self.id,
-        TrayMessage::UpdateTooltip(tooltip.to_owned()),
-      ))
-      .map_err(|_| Error::FailedToSendMessage)
-  }
-
-  fn destroy(&self) -> Result<()> {
-    let (tx, rx) = std::sync::mpsc::channel();
-    send_user_message(
-      &self.context,
-      Message::Tray(self.id, TrayMessage::Destroy(tx)),
-    )?;
-    rx.recv().unwrap()?;
-    Ok(())
-  }
 }
 
 impl From<SystemTrayMenuItem> for crate::MenuItemWrapper {

core/tauri-runtime-wry/src/webview.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 

core/tauri-runtime/CHANGELOG.md

@@ -1,73 +1,5 @@
 # Changelog
 
-## \[0.13.0]
-
-- Added the `additional_browser_args` option when creating a window.
-  - [3dc38b15](https://www.github.com/tauri-apps/tauri/commit/3dc38b150ea8c59c8ba67fd586f921016928f47c) feat(core): expose additional_browser_args to window config (fix: [#5757](https://www.github.com/tauri-apps/tauri/pull/5757)) ([#5799](https://www.github.com/tauri-apps/tauri/pull/5799)) on 2022-12-14
-- Added the `content_protected` option when creating a window and `Window::set_content_protected` to change it at runtime.
-  - [4ab5545b](https://www.github.com/tauri-apps/tauri/commit/4ab5545b7a831c549f3c65e74de487ede3ab7ce5) feat: add content protection api, closes [#5132](https://www.github.com/tauri-apps/tauri/pull/5132) ([#5513](https://www.github.com/tauri-apps/tauri/pull/5513)) on 2022-12-13
-- Added `Builder::device_event_filter` and `App::set_device_event_filter` methods.
-  - [73fd60ee](https://www.github.com/tauri-apps/tauri/commit/73fd60eef2b60f5dc84525ef9c315f4d80c4414f) expose set_device_event_filter in tauri ([#5562](https://www.github.com/tauri-apps/tauri/pull/5562)) on 2022-12-13
-- Add `is_minimized()` window method.
-  - [62144ef3](https://www.github.com/tauri-apps/tauri/commit/62144ef3be63b237869e511826edfb938e2c7174) feat: add is_minimized (fix [#3878](https://www.github.com/tauri-apps/tauri/pull/3878)) ([#5618](https://www.github.com/tauri-apps/tauri/pull/5618)) on 2022-12-13
-- Bump minimum supported Rust version to 1.60.
-  - [5fdc616d](https://www.github.com/tauri-apps/tauri/commit/5fdc616df9bea633810dcb814ac615911d77222c) feat: Use the zbus-backed of notify-rust ([#6332](https://www.github.com/tauri-apps/tauri/pull/6332)) on 2023-03-31
-- Pin raw-window-handle to 0.5.0 to keep MSRV.
-  - [c46c09f3](https://www.github.com/tauri-apps/tauri/commit/c46c09f31d9f5169ca8a7e62406a9ea170e3a5c5) fix(deps): pin raw-window-handle to 0.5.0 ([#6480](https://www.github.com/tauri-apps/tauri/pull/6480)) on 2023-03-17
-- Added `navigation_handler` field on `PendingWindow`.
-  - [3f35b452](https://www.github.com/tauri-apps/tauri/commit/3f35b452637ef1c794a423f1eda62a15d2ddaf42) Expose wry navigation_handler via WindowBuilder closes [#4080](https://www.github.com/tauri-apps/tauri/pull/4080) ([#5686](https://www.github.com/tauri-apps/tauri/pull/5686)) on 2022-12-27
-- Add `title` getter on window.
-  - [233e43b0](https://www.github.com/tauri-apps/tauri/commit/233e43b0c34fada1ca025378533a0b76931a6540) feat: add `title` getter on window, closes [#5023](https://www.github.com/tauri-apps/tauri/pull/5023) ([#5515](https://www.github.com/tauri-apps/tauri/pull/5515)) on 2022-12-13
-- Added `TrayHandle::set_tooltip` and `SystemTray::with_tooltip`.
-  - [2265e097](https://www.github.com/tauri-apps/tauri/commit/2265e09718f6ebfeb1d200f11e1e1e069075af6e) feat(windows): implement `with_tooltip` ([#5938](https://www.github.com/tauri-apps/tauri/pull/5938)) on 2023-01-01
-- Added window's `url()` getter.
-  - [d17027e1](https://www.github.com/tauri-apps/tauri/commit/d17027e1a0db3e8c5ae81fc4f472c5918fbce611) feat: expose url method ([#5914](https://www.github.com/tauri-apps/tauri/pull/5914)) on 2022-12-26
-- On Windows, change webview theme based on Window theme for more accurate `prefers-color-scheme` support.
-  - [7a8d570d](https://www.github.com/tauri-apps/tauri/commit/7a8d570db72667367eb24b75ddc5dd07a968f7c0) fix: sync webview theme with window theme on Windows, closes [#5802](https://www.github.com/tauri-apps/tauri/pull/5802) ([#5874](https://www.github.com/tauri-apps/tauri/pull/5874)) on 2022-12-27
-
-## \[0.12.2]
-
-- Block remote URLs from accessing the IPC.
-  - [9c0593c33](https://www.github.com/tauri-apps/tauri/commit/9c0593c33af52cd9e00ec784d15f63efebdf039c) feat(core): block remote URLs from accessing the IPC on 2023-04-12
-
-## \[0.12.1]
-
-- Fix `allowlist > app > show/hide` always disabled when `allowlist > app > all: false`.
-  - Bumped due to a bump in tauri-utils.
-  - [bb251087](https://www.github.com/tauri-apps/tauri/commit/bb2510876d0bdff736d36bf3a465cdbe4ad2b90c) fix(core): extend allowlist with `app`'s allowlist, closes [#5650](https://www.github.com/tauri-apps/tauri/pull/5650) ([#5652](https://www.github.com/tauri-apps/tauri/pull/5652)) on 2022-11-18
-
-## \[0.12.0]
-
-- Readd the option to create an unfocused window via the `focused` method. The `focus` function has been deprecated.
-  - [4036e15f](https://www.github.com/tauri-apps/tauri/commit/4036e15f5af933bdc0d0913508b5103958afc143) feat(core): reimplement window initial focus flag, closes [#5120](https://www.github.com/tauri-apps/tauri/pull/5120) ([#5338](https://www.github.com/tauri-apps/tauri/pull/5338)) on 2022-10-08
-- Added `Runtime::show()`, `RuntimeHandle::show()`, `Runtime::hide()`, `RuntimeHandle::hide()` for hiding/showing the entire application on macOS.
-  - [39bf895b](https://www.github.com/tauri-apps/tauri/commit/39bf895b73ec6b53f5758815396ba85dda6b9c67) feat(macOS): Add application `show` and `hide` methods ([#3689](https://www.github.com/tauri-apps/tauri/pull/3689)) on 2022-10-03
-- - [7d9aa398](https://www.github.com/tauri-apps/tauri/commit/7d9aa3987efce2d697179ffc33646d086c68030c) feat: bump MSRV to 1.59 ([#5296](https://www.github.com/tauri-apps/tauri/pull/5296)) on 2022-09-28
-- Added `tabbing_identifier` to the window builder on macOS.
-  - [4137ab44](https://www.github.com/tauri-apps/tauri/commit/4137ab44a81d739556cbc7583485887e78952bf1) feat(macos): add `tabbing_identifier` option, closes [#2804](https://www.github.com/tauri-apps/tauri/pull/2804), [#3912](https://www.github.com/tauri-apps/tauri/pull/3912) ([#5399](https://www.github.com/tauri-apps/tauri/pull/5399)) on 2022-10-19
-- Added methods to set the system tray title on macOS.
-  - [8f1ace77](https://www.github.com/tauri-apps/tauri/commit/8f1ace77956ac3477826ceb059a191e55b3fff93) feat: expose `set_title` for MacOS tray ([#5182](https://www.github.com/tauri-apps/tauri/pull/5182)) on 2022-09-30
-- Added the `user_agent` option when creating a window.
-  - [a6c94119](https://www.github.com/tauri-apps/tauri/commit/a6c94119d8545d509723b147c273ca5edfe3729f) feat(core): expose user_agent to window config ([#5317](https://www.github.com/tauri-apps/tauri/pull/5317)) on 2022-10-02
-
-## \[0.11.2]
-
-- Block remote URLs from accessing the IPC.
-  - [58ea0b452](https://www.github.com/tauri-apps/tauri/commit/58ea0b45268dbd46cbac0ebb0887353d057ca767) feat(core): block remote URLs from accessing the IPC on 2023-04-12
-
-## \[0.11.1]
-
-- Add missing allowlist config for `set_cursor_grab`, `set_cursor_visible`, `set_cursor_icon` and `set_cursor_position` APIs.
-  - Bumped due to a bump in tauri-utils.
-  - [c764408d](https://www.github.com/tauri-apps/tauri/commit/c764408da7fae123edd41115bda42fa75a4731d2) fix: Add missing allowlist config for cursor apis, closes [#5207](https://www.github.com/tauri-apps/tauri/pull/5207) ([#5211](https://www.github.com/tauri-apps/tauri/pull/5211)) on 2022-09-16
-
-## \[0.11.0]
-
-- Added APIs to create a system tray at runtime.
-  - [4d063ae9](https://www.github.com/tauri-apps/tauri/commit/4d063ae9ee9538cd6fa5e01b80070c6edf8eaeb9) feat(core): create system tray at runtime, closes [#2278](https://www.github.com/tauri-apps/tauri/pull/2278) ([#4862](https://www.github.com/tauri-apps/tauri/pull/4862)) on 2022-08-09
-- Update windows to 0.39.0 and webview2-com to 0.19.1.
-  - [e6d9b670](https://www.github.com/tauri-apps/tauri/commit/e6d9b670b0b314ed667b0e164f2c8d27048e678f) refactor: remove unneeded focus code ([#5065](https://www.github.com/tauri-apps/tauri/pull/5065)) on 2022-09-03
-
 ## \[0.10.3]
 
 - Block remote URLs from accessing the IPC.

core/tauri-runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime"
-version = "0.13.0"
+version = "0.10.3"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 categories = [ "gui", "web-programming" ]
 license = "Apache-2.0 OR MIT"
@@ -8,8 +8,8 @@ homepage = "https://tauri.app"
 repository = "https://github.com/tauri-apps/tauri"
 description = "Runtime for Tauri applications"
 edition = "2021"
-rust-version = "1.60"
-exclude = [ "CHANGELOG.md", "/target" ]
+rust-version = "1.57"
+exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -26,19 +26,19 @@ targets = [
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
-tauri-utils = { version = "1.3.0", path = "../tauri-utils" }
+tauri-utils = { version = "1.0.3", path = "../tauri-utils" }
 uuid = { version = "1", features = [ "v4" ] }
 http = "0.2.4"
 http-range = "0.1.4"
-raw-window-handle = "=0.5.0"
-rand = "0.8"
-url = { version = "2" }
+infer = "0.7"
+raw-window-handle = "0.4.3"
+url = "2"
 
 [target."cfg(windows)".dependencies]
-webview2-com = "0.19.1"
+webview2-com = "0.16.0"
 
   [target."cfg(windows)".dependencies.windows]
-  version = "0.39.0"
+  version = "0.37.0"
   features = [ "Win32_Foundation" ]
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]