fix frontend build for windows

bisohns · Nov 13, 2022 · d6dc5b0 · d6dc5b0
1 parent dd45025
commit d6dc5b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,10 @@
 version=fake
 ifeq ($(OS),Windows_NT)
 bin=main.exe
+export=set
 else
 bin=main
+export=export
 endif
 # Example:
 #   make
@@ -40,6 +42,7 @@ endif
 dependencies:
 ifeq ($(bin),main.exe)
 	@make prep-ci-local-windows
+	yarn add react-scripts@latest
 else
 	@make prep-ci-local
 endif
@@ -48,7 +51,7 @@ endif
 
 .PHONY: build-frontend
 build-frontend:
-	cd web && yarn build && cd ..
+	cd web && $(export) BUILD_PATH=../cmd/build && CI=false yarn build && cd ..
 
 .PHONY: serve-backend
 serve-backend:

diff --git a/web/package.json b/web/package.json
@@ -28,7 +28,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "BUILD_PATH='../cmd/build' react-scripts build",
+    "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
@@ -50,4 +50,4 @@
       "last 1 safari version"
     ]
   }
-}
+}