From 4c823b9ff0ebc3b6550782051c73ba840443b48b Mon Sep 17 00:00:00 2001
From: Yassen Damyanov <yassen@qredo.com>
Date: Tue, 20 Jul 2021 19:46:09 +0300
Subject: [PATCH] Replace python3 http server with npm http-server

---
 Makefile                  | 2 +-
 package.json              | 3 +++
 src-tauri/tauri.conf.json | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7de4daa..63fe696 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ cargo-lock:
 
 # Start development server; build debug and run
 dev:  cargo-lock
-	yarn tauri dev
+	yarn tauri dev; kill $$(ps ax | awk '/http-server/ && !/awk/ {print $$1}')
 
 
 .PHONY: init clean cargo-lock dev
diff --git a/package.json b/package.json
index 9577f5b..811d7a3 100644
--- a/package.json
+++ b/package.json
@@ -10,5 +10,8 @@
   "devDependencies": {
     "@tauri-apps/api": "^1.0.0-beta.5",
     "@tauri-apps/cli": "^1.0.0-beta.6"
+  },
+  "dependencies": {
+    "http-server": "^0.12.3"
   }
 }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index d7efe17..2b88ba9 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -6,7 +6,7 @@
   "build": {
     "distDir": "../www",
     "devPath": "http://localhost:8000",
-    "beforeDevCommand": "python3 -m http.server -d www/",
+    "beforeDevCommand": "yarn http-server -p 8000 -c-1 www/",
     "beforeBuildCommand": "",
     "withGlobalTauri": true
   },