Merge pull request #125 from fosslife/master

release V3.3.2
fosslife · Nov 14, 2024 · e45ea9e · e45ea9e
2 parents 2da24e9 + 7225e0c
commit e45ea9e
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 58 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "devtools-x",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "license": "MIT",
   "type": "module",
   "scripts": {

diff --git a/scripts/sign.mjs b/scripts/sign.mjs
@@ -28,10 +28,10 @@ const releaseData = {
   notes: `https://github.com/${repoMetaData.owner}/${repoMetaData.repo}/releases/tag/${latestRelease.tag_name}`,
   pub_date: new Date().toISOString(),
   platforms: {
-    // "darwin-aarch64": {
-    //   signature: "",
-    //   url: "",
-    // },
+    "darwin-aarch64": {
+      signature: "",
+      url: "",
+    },
     "darwin-x86_64": {
       signature: "",
       url: "",
@@ -51,39 +51,45 @@ const promises = latestRelease.assets.map(
   async ({ name, browser_download_url }) => {
     const signature = await getSignature(browser_download_url);
 
-    if (name.endsWith(".app.tar.gz")) {
-      // releaseData.platforms["darwin-aarch64"].url = browser_download_url;
-      releaseData.platforms["darwin-x86_64"].url = browser_download_url;
+    // For Mac
+    if (name.includes("_aarch64.app.tar.gz")) {
+      releaseData.platforms["darwin-aarch64"].url = browser_download_url;
     }
-
-    if (name.endsWith(".app.tar.gz.sig")) {
-      // releaseData.platforms["darwin-aarch64"].signature = signature;
-      releaseData.platforms["darwin-x86_64"].signature = signature;
+    if (name.includes("_x64.app.tar.gz")) {
+      releaseData.platforms["darwin-x86_64"].url = browser_download_url;
     }
 
-    if (name.endsWith(".AppImage.tar.gz")) {
+    // For Linux
+    if (name.includes("_amd64.AppImage") && !name.endsWith(".sig")) {
       releaseData.platforms["linux-x86_64"].url = browser_download_url;
     }
 
-    if (name.endsWith(".AppImage.tar.gz.sig")) {
-      releaseData.platforms["linux-x86_64"].signature = signature;
-    }
-
-    if (name.endsWith(".msi.zip")) {
+    // For Windows
+    if (name.includes("_x64_en-US.msi") && !name.endsWith(".sig")) {
       releaseData.platforms["windows-x86_64"].url = browser_download_url;
     }
 
-    if (name.endsWith(".msi.zip.sig")) {
+    // Signatures
+    if (name.includes("_aarch64.app.tar.gz.sig")) {
+      releaseData.platforms["darwin-aarch64"].signature = signature;
+    }
+    if (name.includes("_x64.app.tar.gz.sig")) {
+      releaseData.platforms["darwin-x86_64"].signature = signature;
+    }
+    if (name.includes("_amd64.AppImage.sig")) {
+      releaseData.platforms["linux-x86_64"].signature = signature;
+    }
+    if (name.includes("_x64_en-US.msi.sig")) {
       releaseData.platforms["windows-x86_64"].signature = signature;
     }
   }
 );
 
 await Promise.allSettled(promises);
 
-// if (!releaseData.platforms["darwin-aarch64"].url) {
-//   throw new Error("Failed to get release for MacOS");
-// }
+if (!releaseData.platforms["darwin-aarch64"].url) {
+  throw new Error("Failed to get release for MacOS");
+}
 
 if (!releaseData.platforms["linux-x86_64"].url) {
   throw new Error("Failed to get release for Linux");

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "devtools-x"
-version = "3.3.0"
+version = "3.3.2"
 description = "Developer tools desktop application"
 authors = ["Sparkenstein"]
 license = "MIT"

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -169,21 +169,19 @@ fn main() {
       read_qr
     ])
     .setup(|app| {
+      #[cfg(desktop)]
+      let res = app
+        .handle()
+        .plugin(tauri_plugin_updater::Builder::new().build());
+      if res.is_err() {
+        println!("Error: {:?}", res.err());
+      }
+
       WebviewWindowBuilder::new(app, "main", WebviewUrl::App("index.html".into()))
         .title("DevTools-X")
-        .inner_size(1000.0, 650.0)
+        .inner_size(1000.0, 850.0)
         .resizable(true)
         .fullscreen(false)
-        .on_web_resource_request(|_, res| {
-          res.headers_mut().insert(
-            "Cross-Origin-Embedder-Policy",
-            "require-corp".try_into().unwrap(),
-          );
-          res.headers_mut().append(
-            "Cross-Origin-Opener-Policy",
-            "same-origin".try_into().unwrap(),
-          );
-        })
         .build()?;
       // #[cfg(debug_assertions)]
       let process_arg: Vec<String> = env::args().collect();

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -44,13 +44,11 @@
   },
   "productName": "devtools-x",
   "mainBinaryName": "devtools-x",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "identifier": "com.fosslife.devtoolsx",
   "plugins": {
     "sql": {
-      "preload": [
-        "sqlite:devtools.db"
-      ]
+      "preload": ["sqlite:devtools.db"]
     },
     "updater": {
       "endpoints": [
@@ -63,13 +61,9 @@
     "security": {
       "assetProtocol": {
         "enable": true,
-        "scope": [
-          "http://asset.localhost"
-        ]
+        "scope": ["http://asset.localhost"]
       },
-      "dangerousDisableAssetCspModification": [
-        "style-src"
-      ],
+      "dangerousDisableAssetCspModification": ["style-src"],
       "csp": {
         "default-src": [
           "'self'",
@@ -82,19 +76,9 @@
           "https:",
           "tauri:"
         ],
-        "worker-src": [
-          "'self'",
-          "blob:",
-          "https://unpkg.com"
-        ],
-        "script-src": [
-          "'self'",
-          "'unsafe-inline'"
-        ],
-        "style-src": [
-          "'self'",
-          "'unsafe-inline'"
-        ]
+        "worker-src": ["'self'", "blob:", "https://unpkg.com"],
+        "script-src": ["'self'", "'unsafe-inline'"],
+        "style-src": ["'self'", "'unsafe-inline'"]
       }
     },
     "windows": []