Merge branch 'main' into feature/946-fix_prepend_after_interpolation_and_add_to_cli

package.json

@@ -5,7 +5,6 @@
     "packages/bruno-app",
     "packages/bruno-electron",
     "packages/bruno-cli",
-    "packages/bruno-tauri",
     "packages/bruno-schema",
     "packages/bruno-query",
     "packages/bruno-js",

packages/bruno-electron/src/index.js

@@ -18,7 +18,7 @@ const lastOpenedCollections = new LastOpenedCollections();
 const contentSecurityPolicy = [
   "default-src 'self'",
   "script-src * 'unsafe-inline' 'unsafe-eval'",
-  "connect-src 'self' api.github.com",
+  "connect-src 'self' api.github.com app.posthog.com",
   "font-src 'self' https:",
   "form-action 'none'",
   "img-src 'self' blob: data: https:",

packages/bruno-tauri/.gitignore

@@ -1,9 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-
-node_modules
-jspm_packages/
-pnpm-lock.yaml
-yarn.lock
-package-lock.json

packages/bruno-tauri/Cargo.toml

@@ -1,28 +0,0 @@
-[package]
-name = "app"
-version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
-license = ""
-repository = ""
-default-run = "app"
-edition = "2021"
-rust-version = "1.57"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[build-dependencies]
-tauri-build = { version = "1.1.1", features = [] }
-
-[dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.1.1", features = ["api-all"] }
-
-[features]
-# by default Tauri runs in production mode
-# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
-default = [ "custom-protocol" ]
-# this feature is used for production builds where `devPath` points to the filesystem
-# DO NOT remove this
-custom-protocol = [ "tauri/custom-protocol" ]

packages/bruno-tauri/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-  tauri_build::build()
-}

packages/bruno-tauri/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "@usebruno/bruno-tauri",
-  "private": true,
-  "main": "src/index.js",
-  "scripts": {
-    "dev": "node src/next-server.js",
-    "dev:tauri": "tauri dev"
-  },
-  "devDependencies": {
-    "@tauri-apps/cli": "^1.1.1",
-    "electron-next": "^3.1.5"
-  }
-}

packages/bruno-tauri/src/main.rs

@@ -1,10 +0,0 @@
-#![cfg_attr(
-  all(not(debug_assertions), target_os = "windows"),
-  windows_subsystem = "windows"
-)]
-
-fn main() {
-  tauri::Builder::default()
-    .run(tauri::generate_context!())
-    .expect("error while running tauri application");
-}

packages/bruno-tauri/src/next-server.js

@@ -1,23 +0,0 @@
-const { createServer } = require('http');
-
-const devServer = async (dir, port) => {
-  const next = require('next')({ dev: true, dir });
-  const requestHandler = next.getRequestHandler();
-
-  // Build the renderer code and watch the files
-  await next.prepare();
-
-  // Next.js Server
-  const server = createServer(requestHandler);
-
-  server.listen(port || 8000, () => {
-    // Todo: Need to listen to tauri close event and close the server
-    // app.on('before-quit', () => server.close())
-  });
-};
-
-const run = async () => {
-  await devServer('../../renderer', 8000);
-};
-
-run();

packages/bruno-tauri/tauri.conf.json

@@ -1,66 +0,0 @@
-{
-  "$schema": "./node_modules/@tauri-apps/cli/schema.json",
-  "build": {
-    "beforeBuildCommand": "npm run build",
-    "beforeDevCommand": "npm run dev",
-    "devPath": "http://localhost:8000",
-    "distDir": "./"
-  },
-  "package": {
-    "productName": "bruno",
-    "version": "0.1.0"
-  },
-  "tauri": {
-    "allowlist": {
-      "all": true
-    },
-    "bundle": {
-      "active": true,
-      "category": "DeveloperTool",
-      "copyright": "",
-      "deb": {
-        "depends": []
-      },
-      "externalBin": [],
-      "icon": [
-        "icons/32x32.png",
-        "icons/128x128.png",
-        "icons/128x128@2x.png",
-        "icons/icon.icns",
-        "icons/icon.ico"
-      ],
-      "identifier": "com.usebruno.dev",
-      "longDescription": "",
-      "macOS": {
-        "entitlements": null,
-        "exceptionDomain": "",
-        "frameworks": [],
-        "providerShortName": null,
-        "signingIdentity": null
-      },
-      "resources": [],
-      "shortDescription": "",
-      "targets": "all",
-      "windows": {
-        "certificateThumbprint": null,
-        "digestAlgorithm": "sha256",
-        "timestampUrl": ""
-      }
-    },
-    "security": {
-      "csp": null
-    },
-    "updater": {
-      "active": false
-    },
-    "windows": [
-      {
-        "fullscreen": false,
-        "height": 600,
-        "resizable": true,
-        "title": "bruno",
-        "width": 800
-      }
-    ]
-  }
-}