Merge pull request #122 from fosslife/master

release: v3.1,0

index.html

@@ -17,7 +17,7 @@
     <script>
       const global = globalThis;
     </script>
-    <style>
+    <style nonce="123">
       @media print {
         html,
         body {

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "dev-tools",
-  "version": "3.0.0",
+  "name": "devtools-x",
+  "version": "3.1.0",
   "license": "MIT",
   "type": "module",
   "scripts": {

scripts/compress.mjs

@@ -10,9 +10,10 @@ function findBinary(dir) {
   for (const file of files) {
     const filePath = path.join(dir, file);
     const stat = fs.statSync(filePath);
+    console.log(file);
     if (stat.isDirectory()) {
       // ignore
-    } else if (file === "dev-tools" || file === "dev-tools.exe") {
+    } else if (file === "devtools-x" || file === "devtools-x.exe") {
       return filePath;
     }
   }
@@ -36,7 +37,7 @@ if (binaryPath) {
     console.log("UPX compression completed successfully.");
   } catch (error) {
     console.error("Error during UPX compression:", error);
-    process.exit(1);
+    // process.exit(1);
   }
 } else {
   console.error("Binary not found");

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "devtools-x"
-version = "3.0.0"
+version = "3.1.0"
 description = "Developer tools desktop application"
 authors = ["Sparkenstein"]
 license = "MIT"

src-tauri/tauri.conf.json

@@ -33,7 +33,7 @@
       }
     },
     "licenseFile": "LICENSE",
-    "createUpdaterArtifacts": "v1Compatible"
+    "createUpdaterArtifacts": true
   },
   "build": {
     "beforeBundleCommand": "node scripts/compress.mjs",
@@ -42,9 +42,9 @@
     "beforeBuildCommand": "yarn build",
     "devUrl": "http://localhost:3000"
   },
-  "productName": "dev-tools",
-  "mainBinaryName": "dev-tools",
-  "version": "3.0.0",
+  "productName": "devtools-x",
+  "mainBinaryName": "devtools-x",
+  "version": "3.1.0",
   "identifier": "com.fosslife.devtoolsx",
   "plugins": {
     "updater": {
@@ -58,10 +58,39 @@
     "security": {
       "assetProtocol": {
         "enable": true,
-        "scope": ["http://asset.localhost"]
+        "scope": [
+          "http://asset.localhost"
+        ]
       },
-      "dangerousDisableAssetCspModification": false,
-      "csp": "default-src 'self' blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline'; worker-src blob: 'self' https://unpkg.com; script-src 'self' 'unsafe-eval' 'unsafe-inline';"
+      "dangerousDisableAssetCspModification": [
+        "style-src"
+      ],
+      "csp": {
+        "default-src": [
+          "'self'",
+          "blob:",
+          "data:",
+          "filesystem:",
+          "ws:",
+          "wss:",
+          "http:",
+          "https:",
+          "tauri:"
+        ],
+        "worker-src": [
+          "'self'",
+          "blob:",
+          "https://unpkg.com"
+        ],
+        "script-src": [
+          "'self'",
+          "'unsafe-inline'"
+        ],
+        "style-src": [
+          "'self'",
+          "'unsafe-inline'"
+        ]
+      }
     },
     "windows": []
   }