0.8.5 fixes (#2369)

* 0.8.5 fixes * Attempt to fix binary name * bump version + add nsis installmode * (temp) Use cargo version of tauri CLI * fix cli build * Fix build env var * Bump tauri version * remove old invalid installs * Fix old shortcuts + NSIS build
2024-09-10 00:24:17 -07:00
parent b3a6393c91
commit 0b31f2eb41
23 changed files with 481 additions and 568 deletions
--- a/apps/app-frontend/package.json
+++ b/apps/app-frontend/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@modrinth/app-frontend",
  "private": true,
-  "version": "0.8.5",
+  "version": "0.8.6",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -36,7 +36,6 @@
  "devDependencies": {
    "@eslint/compat": "^1.1.1",
    "@nuxt/eslint-config": "^0.5.6",
-    "@tauri-apps/cli": "^2.0.0-rc",
    "@vitejs/plugin-vue": "^5.0.4",
    "autoprefixer": "^10.4.19",
    "eslint": "^9.9.1",
--- a/apps/app-frontend/src/pages/Settings.vue
+++ b/apps/app-frontend/src/pages/Settings.vue
@@ -17,7 +17,7 @@ import { hide_ads_window } from '@/helpers/ads.js'
 import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'

 onMounted(() => {
-  hide_ads_window()
+  hide_ads_window(true)
 })

 const pageOptions = ['Home', 'Library']
--- a/apps/app-frontend/src/pages/instance/Options.vue
+++ b/apps/app-frontend/src/pages/instance/Options.vue
@@ -596,12 +596,12 @@ const overrideJavaInstall = ref(!!props.instance.java_path)
 const optimalJava = readonly(await get_optimal_jre_key(props.instance.path).catch(handleError))
 const javaInstall = ref({ path: optimalJava.path ?? props.instance.java_path })

-const overrideJavaArgs = ref(!!props.instance.extra_launch_args)
+const overrideJavaArgs = ref(props.instance.extra_launch_args?.length !== undefined)
 const javaArgs = ref(
  (props.instance.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
 )

-const overrideEnvVars = ref(!!props.instance.custom_env_vars)
+const overrideEnvVars = ref(props.instance.custom_env_vars?.length !== undefined)
 const envVars = ref(
  (props.instance.custom_env_vars ?? globalSettings.custom_env_vars)
    .map((x) => x.join('='))
@@ -685,19 +685,15 @@ const editProfileObject = computed(() => {
  }

  if (overrideJavaArgs.value) {
-    if (javaArgs.value !== '') {
-      editProfile.extra_launch_args = javaArgs.value.trim().split(/\s+/).filter(Boolean)
-    }
+    editProfile.extra_launch_args = javaArgs.value.trim().split(/\s+/).filter(Boolean)
  }

  if (overrideEnvVars.value) {
-    if (envVars.value !== '') {
-      editProfile.custom_env_vars = envVars.value
-        .trim()
-        .split(/\s+/)
-        .filter(Boolean)
-        .map((x) => x.split('=').filter(Boolean))
-    }
+    editProfile.custom_env_vars = envVars.value
+      .trim()
+      .split(/\s+/)
+      .filter(Boolean)
+      .map((x) => x.split('=').filter(Boolean))
  }

  if (overrideMemorySettings.value) {
--- a/apps/app-frontend/src/pages/project/Gallery.vue
+++ b/apps/app-frontend/src/pages/project/Gallery.vue
@@ -20,14 +20,14 @@
      </span>
    </Card>
  </div>
-  <div v-if="expandedGalleryItem" class="expanded-image-modal" @click="expandedGalleryItem = null">
+  <div v-if="expandedGalleryItem" class="expanded-image-modal" @click="hideImage">
    <div class="content">
      <img
        class="image"
        :class="{ 'zoomed-in': zoomedIn }"
        :src="
-          expandedGalleryItem.url
-            ? expandedGalleryItem.url
+          expandedGalleryItem.raw_url
+            ? expandedGalleryItem.raw_url
            : 'https://cdn.modrinth.com/placeholder-banner.svg'
        "
        :alt="expandedGalleryItem.title ? expandedGalleryItem.title : 'gallery-image'"
@@ -45,15 +45,15 @@
        </div>
        <div class="controls">
          <div class="buttons">
-            <Button class="close" icon-only @click="expandedGalleryItem = null">
+            <Button class="close" icon-only @click="hideImage">
              <XIcon aria-hidden="true" />
            </Button>
            <a
              class="open btn icon-only"
              target="_blank"
              :href="
-                expandedGalleryItem.url
-                  ? expandedGalleryItem.url
+                expandedGalleryItem.raw_url
+                  ? expandedGalleryItem.raw_url
                  : 'https://cdn.modrinth.com/placeholder-banner.svg'
              "
            >
@@ -94,6 +94,7 @@ import {
 import { Button, Card } from '@modrinth/ui'
 import { ref } from 'vue'
 import { trackEvent } from '@/helpers/analytics'
+import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'

 const props = defineProps({
  project: {
@@ -106,6 +107,11 @@ const expandedGalleryItem = ref(null)
 const expandedGalleryIndex = ref(0)
 const zoomedIn = ref(false)

+const hideImage = () => {
+  expandedGalleryItem.value = null
+  show_ads_window()
+}
+
 const nextImage = () => {
  expandedGalleryIndex.value++
  if (expandedGalleryIndex.value >= props.project.gallery.length) {
@@ -131,6 +137,7 @@ const previousImage = () => {
 }

 const expandImage = (item, index) => {
+  hide_ads_window()
  expandedGalleryItem.value = item
  expandedGalleryIndex.value = index
  zoomedIn.value = false
@@ -140,6 +147,20 @@ const expandImage = (item, index) => {
    url: item.url,
  })
 }
+
+function keyListener(e) {
+  if (expandedGalleryItem.value) {
+    e.preventDefault()
+    if (e.key === 'Escape') {
+      hideImage()
+    } else if (e.key === 'ArrowLeft') {
+      previousImage()
+    } else if (e.key === 'ArrowRight') {
+      nextImage()
+    }
+  }
+}
+document.addEventListener('keypress', keyListener)
 </script>

 <style scoped lang="scss">
--- a/apps/app-playground/Cargo.toml
+++ b/apps/app-playground/Cargo.toml
@@ -10,7 +10,6 @@ theseus = { path = "../../packages/app-lib", features = ["cli"] }

 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = "2.0.0-rc.4"
 tokio = { version = "1", features = ["full"] }
 thiserror = "1.0"
 url = "2.2"
--- a/apps/app/Cargo.toml
+++ b/apps/app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus_gui"
-version = "0.8.5"
+version = "0.8.6"
 description = "The Modrinth App is a desktop application for managing your Minecraft mods"
 license = "GPL-3.0-only"
 repository = "https://github.com/modrinth/code/apps/app/"
@@ -8,7 +8,7 @@ edition = "2021"
 build = "build.rs"

 [build-dependencies]
-tauri-build = { version = "2.0.0-rc", features = ["codegen"] }
+tauri-build = { git = "https://github.com/modrinth/tauri", features = ["codegen"], rev = "5e29428" }

 [dependencies]
 theseus = { path = "../../packages/app-lib", features = ["tauri"] }
@@ -16,7 +16,7 @@ theseus = { path = "../../packages/app-lib", features = ["tauri"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }

-tauri = { version = "2.0.0-rc.6", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
+tauri = { git = "https://github.com/modrinth/tauri", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"], rev = "5e29428" }
 tauri-plugin-window-state = "2.0.0-rc"
 tauri-plugin-deep-link = "2.0.0-rc"
 tauri-plugin-os = "2.0.0-rc"
@@ -59,7 +59,7 @@ objc = "0.2.7"
 rand = "0.8.5"

 [target.'cfg(target_os = "linux")'.dependencies]
-tauri-plugin-updater = { version = "2.0.0-rc.1", optional = true, features = ["native-tls-vendored", "zip"], default-features = false }
+tauri-plugin-updater = { version = "2.0.0-rc", optional = true, features = ["native-tls-vendored", "zip"], default-features = false }

 [features]
 # by default Tauri runs in production mode
--- a/apps/app/README.md
+++ b/apps/app/README.md
@@ -22,6 +22,7 @@ Before you begin, ensure you have the following installed on your machine:
 Follow these steps to set up your development environment:

 ```bash
+cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5e2942876c2266594ed1db516c1d9975c873c36a
 pnpm install
 pnpm app:dev
 ```
--- a/apps/app/nsis/hooks.nsi
+++ b/apps/app/nsis/hooks.nsi
@@ -0,0 +1,41 @@
+!macro NSIS_HOOK_POSTINSTALL
+    SetShellVarContext current
+
+    IfFileExists "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe" file_found file_not_found
+    file_found:
+        Delete "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
+
+        Delete "$LOCALAPPDATA${PRODUCTNAME}\uninstall.exe"
+        RMDir "$LOCALAPPDATA${PRODUCTNAME}"
+
+        !insertmacro DeleteAppUserModelId
+
+        ; Remove start menu shortcut
+        !insertmacro MUI_STARTMENU_GETFOLDER Application $AppStartMenuFolder
+        !insertmacro IsShortcutTarget "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
+        Pop $0
+        ${If} $0 = 1
+          !insertmacro UnpinShortcut "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk"
+          Delete "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk"
+          RMDir "$SMPROGRAMS$AppStartMenuFolder"
+        ${EndIf}
+        !insertmacro IsShortcutTarget "$SMPROGRAMS${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
+        Pop $0
+        ${If} $0 = 1
+          !insertmacro UnpinShortcut "$SMPROGRAMS${PRODUCTNAME}.lnk"
+          Delete "$SMPROGRAMS${PRODUCTNAME}.lnk"
+        ${EndIf}
+
+        !insertmacro IsShortcutTarget "$DESKTOP${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
+        Pop $0
+        ${If} $0 = 1
+          !insertmacro UnpinShortcut "$DESKTOP${PRODUCTNAME}.lnk"
+          Delete "$DESKTOP${PRODUCTNAME}.lnk"
+        ${EndIf}
+
+        DeleteRegKey HKCU "${UNINSTKEY}"
+
+        goto end_of_test ;<== important for not continuing on the else branch
+    file_not_found:
+    end_of_test:
+!macroend
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -1,16 +1,13 @@
 {
  "name": "@modrinth/app",
  "scripts": {
-    "build": "tauri build",
-    "tauri": "tauri",
-    "dev": "tauri dev",
+    "build": "cargo tauri build",
+    "tauri": "cargo tauri",
+    "dev": "cargo tauri dev",
    "test": "cargo test",
    "lint": "cargo fmt --check && cargo clippy -- -D warnings",
    "fix": "cargo fmt && cargo clippy --fix"
  },
-  "devDependencies": {
-    "@tauri-apps/cli": "2.0.0-rc.5"
-  },
  "dependencies": {
    "@modrinth/app-frontend": "workspace:*",
    "@modrinth/app-lib": "workspace:*"
--- a/apps/app/src/api/ads.rs
+++ b/apps/app/src/api/ads.rs
@@ -18,6 +18,24 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
                position: None,
            }));

+            /// We refresh the ads window every 5 minutes for performance
+            let app = app.clone();
+            tauri::async_runtime::spawn(async move {
+                loop {
+                    if let Some(webview) = app.webviews().get_mut("ads-window")
+                    {
+                        let _ = webview.navigate(
+                            "https://modrinth.com/wrapper/app-ads-cookie"
+                                .parse()
+                                .unwrap(),
+                        );
+                    }
+
+                    tokio::time::sleep(std::time::Duration::from_secs(60 * 5))
+                        .await;
+                }
+            });
+
            Ok(())
        })
        .invoke_handler(tauri::generate_handler![
@@ -61,11 +79,11 @@ pub async fn init_ads_window<R: Runtime>(
            tauri::webview::WebviewBuilder::new(
                "ads-window",
                WebviewUrl::External(
-                    "https://modrinth.com/wrapper/app-ads".parse().unwrap(),
+                    "https://modrinth.com/wrapper/app-ads-cookie".parse().unwrap(),
                ),
            )
            .initialization_script(LINK_SCRIPT)
-            .user_agent("ModrinthApp Ads Webview")
+            .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36")
            .zoom_hotkeys_enabled(false)
            .transparent(true),
            if state.shown {
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -23,6 +23,10 @@
      "timestampUrl": "http://timestamp.digicert.com",
      "wix": {
        "template": "./msi/main.wxs"
+      },
+      "nsis": {
+        "installMode": "perMachine",
+        "installerHooks": "./nsis/hooks.nsi"
      }
    },
    "longDescription": "",
@@ -48,7 +52,7 @@
    ]
  },
  "productName": "Modrinth App",
-  "version": "0.8.5",
+  "version": "0.8.6",
  "identifier": "ModrinthApp",
  "plugins": {
    "deep-link": {
--- a/apps/frontend/src/pages/[type]/[id]/gallery.vue
+++ b/apps/frontend/src/pages/[type]/[id]/gallery.vue
@@ -139,8 +139,8 @@
          class="image"
          :class="{ 'zoomed-in': zoomedIn }"
          :src="
-            expandedGalleryItem.url
-              ? expandedGalleryItem.url
+            expandedGalleryItem.raw_url
+              ? expandedGalleryItem.raw_url
              : 'https://cdn.modrinth.com/placeholder-banner.svg'
          "
          :alt="expandedGalleryItem.title ? expandedGalleryItem.title : 'gallery-image'"
@@ -165,8 +165,8 @@
                class="open circle-button"
                target="_blank"
                :href="
-                  expandedGalleryItem.url
-                    ? expandedGalleryItem.url
+                  expandedGalleryItem.raw_url
+                    ? expandedGalleryItem.raw_url
                    : 'https://cdn.modrinth.com/placeholder-banner.svg'
                "
              >
--- a/apps/frontend/src/public/promo-frame.html
+++ b/apps/frontend/src/public/promo-frame.html
@@ -58,13 +58,19 @@
    ]);
  });

+  let lastUrl = null
  window.addEventListener(
    "message",
    (event) => {
-      if (event.data.modrinthOpenUrl && window.__TAURI_INTERNALS__) {
+      if (event.data.modrinthOpenUrl && window.__TAURI_INTERNALS__ && lastUrl !== event.data.modrinthOpenUrl) {
+        lastUrl = event.data.modrinthOpenUrl
        window.__TAURI_INTERNALS__.invoke("plugin:shell|open", {
          path: event.data.modrinthOpenUrl,
        });
+
+        setTimeout(() => {
+          lastUrl = null
+        }, 500)
      }
    },
    false,