From bfc91eb29611696e9a2b0d6f9114b680dc5bc897 Mon Sep 17 00:00:00 2001 From: Lauri Nevala Date: Thu, 20 Aug 2020 13:46:07 +0300 Subject: [PATCH] Fix windows dev env Signed-off-by: Lauri Nevala --- Makefile | 6 +++++- package.json | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 86cdf24e95..6e078ca082 100644 --- a/Makefile +++ b/Makefile @@ -20,8 +20,12 @@ compile-dev: yarn compile:renderer --cache dev: +ifeq "$(DETECTED_OS)" "Windows" + make init +else test -f out/main.js || make init - yarn dev # run electron and watch files +endif + yarn dev lint: yarn lint diff --git a/package.json b/package.json index bdfb91473e..c032cf5d8c 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ }, "scripts": { "dev": "concurrently -k \"yarn dev-run -C\" \"yarn dev:main\" \"yarn dev:renderer\"", - "dev-run": "nodemon --watch static/build/main.js --exec \"electron --inspect .\" $@", - "dev:main": "env DEBUG=true yarn compile:main --watch $@", - "dev:renderer": "env DEBUG=true yarn compile:renderer --watch $@", + "dev-run": "nodemon --watch static/build/main.js --exec \"electron --inspect .\"", + "dev:main": "yarn compile:main --watch", + "dev:renderer": "yarn compile:renderer --watch", "compile": "env NODE_ENV=production concurrently yarn:compile:*", "compile:main": "webpack --config webpack.main.ts", "compile:renderer": "webpack --config webpack.renderer.ts",