From 55d57b284c1d612efa6acdf91f615dcfbfd79e55 Mon Sep 17 00:00:00 2001
From: zkldi <notzkldi@zkldi.com>
Date: Sat, 24 Apr 2021 21:15:58 +0100
Subject: [PATCH] xarrrrg

---
 server/.vscode/launch.json | 4 +---
 server/.vscode/tasks.json  | 7 +------
 server/pnpm-lock.yaml      | 6 +++---
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/server/.vscode/launch.json b/server/.vscode/launch.json
index 28f9e237e..d737823bc 100644
--- a/server/.vscode/launch.json
+++ b/server/.vscode/launch.json
@@ -9,9 +9,7 @@
             "request": "launch",
             "name": "Run Server",
             "preLaunchTask": "npm: build",
-            "env": {
-                "NODE_ENV": "dev"
-            },
+            "envFile": "${workspaceFolder}/.env",
             "program": "${workspaceFolder}/src/main.ts",
             "outFiles": [
                 "${workspaceFolder}/js/**/*.js"
diff --git a/server/.vscode/tasks.json b/server/.vscode/tasks.json
index 2e911e101..cd90b57fe 100644
--- a/server/.vscode/tasks.json
+++ b/server/.vscode/tasks.json
@@ -25,13 +25,8 @@
         },
         {
             "label": "runWithTsnode",
-            "options": {
-                "env": {
-                    "MONGO_BASE_URL": "192.168.0.13"
-                }
-            },
             "type": "shell",
-            "command": "ts-node",
+            "command": "export $(xargs < .env) && ts-node",
             "args": [
                 "${relativeFile}"
             ],
diff --git a/server/pnpm-lock.yaml b/server/pnpm-lock.yaml
index 9dff46d43..d8d7e71d4 100644
--- a/server/pnpm-lock.yaml
+++ b/server/pnpm-lock.yaml
@@ -63,7 +63,7 @@ dependencies:
   express-async-errors: 3.1.1_express@4.17.1
   express-session: 1.17.1
   fast-json-stable-hash: 1.0.1
-  kamaitachi-common: github.com/zkldi/Kamaitachi-common/6d6d476d05d697daad76320e388d7ce656d06f35
+  kamaitachi-common: github.com/zkldi/Kamaitachi-common/83778035aa6011ca1f7cf2035297cc109fad5cd1
   mongodb: 3.6.6
   monk: 7.3.4
   multer: 1.4.2
@@ -4608,8 +4608,8 @@ packages:
       '@types/yoga-layout': 1.9.2
     dev: true
 
-  github.com/zkldi/Kamaitachi-common/6d6d476d05d697daad76320e388d7ce656d06f35:
-    resolution: {tarball: https://codeload.github.com/zkldi/Kamaitachi-common/tar.gz/6d6d476d05d697daad76320e388d7ce656d06f35}
+  github.com/zkldi/Kamaitachi-common/83778035aa6011ca1f7cf2035297cc109fad5cd1:
+    resolution: {tarball: https://codeload.github.com/zkldi/Kamaitachi-common/tar.gz/83778035aa6011ca1f7cf2035297cc109fad5cd1}
     name: kamaitachi-common
     version: 0.1.0
     dependencies: