From 4bf6ddec9fe3f20c4a3ba22cdcfd895c92a20e8e Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Fri, 9 Aug 2024 06:49:18 -0700
Subject: [PATCH] Run vendor as separate script

---
 .github/workflows/release.yml             | 10 ++++++---
 package.json                              |  7 +++---
 src-tauri/yaak_plugin_runtime/src/main.rs | 26 -----------------------
 3 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 src-tauri/yaak_plugin_runtime/src/main.rs

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 63165aac..ccc3acc5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -83,13 +83,17 @@ jobs:
       - name: Install yaak CLI
         run: go install github.com/yaakapp/yaakcli@latest
 
+      - name: Run lint
+        run: npm run lint
+
+      - name: Vendor things for the app
+        run: npm run vendor
+
+      # NOTE: vendored things need to exist for tests to build
       - name: Rust test
         working-directory: src-tauri
         run: cargo test --all
 
-      - name: Run lint
-        run: npm run lint
-
       - name: Checkout yaakapp/plugins
         uses: actions/checkout@v4
         with:
diff --git a/package.json b/package.json
index 9a1480bb..26411158 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,11 @@
     "build:icon:dev": "tauri icon design/icon-dev.png --output ./src-tauri/icons/dev",
     "build": "run-p build:*",
     "build:js": "vite build",
-    "build:vendor-protoc": "node scripts/vendor-protoc.cjs",
-    "build:vendor-plugins": "node scripts/vendor-plugins.cjs",
-    "build:vendor-node": "node scripts/vendor-node.cjs",
     "build:plugin-runtime": "npm run --prefix plugin-runtime build",
+    "vendor": "run-p vendor:*",
+    "vendor:vendor-protoc": "node scripts/vendor-protoc.cjs",
+    "vendor:vendor-plugins": "node scripts/vendor-plugins.cjs",
+    "vendor:vendor-node": "node scripts/vendor-node.cjs",
     "prepare": "husky install",
     "replace-version": "node scripts/replace-version.cjs"
   },
diff --git a/src-tauri/yaak_plugin_runtime/src/main.rs b/src-tauri/yaak_plugin_runtime/src/main.rs
deleted file mode 100644
index 2382c9e8..00000000
--- a/src-tauri/yaak_plugin_runtime/src/main.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // let dir = env::var("YAAK_PLUGINS_DIR").expect("YAAK_PLUGINS_DIR not set");
-    // 
-    // let plugin_dirs: Vec<String> = match read_dir(dir) {
-    //     Ok(result) => {
-    //         let mut dirs: Vec<String> = vec![];
-    //         for entry_result in result {
-    //             match entry_result {
-    //                 Ok(entry) => {
-    //                     if entry.path().is_dir() {
-    //                         dirs.push(entry.path().to_string_lossy().to_string())
-    //                     }
-    //                 }
-    //                 Err(_) => {
-    //                     continue;
-    //                 }
-    //             }
-    //         };
-    //         dirs
-    //     }
-    //     Err(_) => vec![],
-    // };
-    // start_server(plugin_dirs).await.unwrap();
-    Ok(())
-}