Merge branch 'main' into next

FullStackWithLawrence · Jan 9, 2024 · 9f18668 · 9f18668
2 parents 4b01d5e + be99e7e
commit 9f18668
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -41,22 +41,22 @@ pre-commit:
 # ---------------------------------------------------------
 init:
 	make clean
-	npm install && \
 	$(PYTHON) -m venv venv && \
 	$(ACTIVATE_VENV) && \
 	$(PIP) install --upgrade pip && \
 	$(PIP) install -r requirements/prod.txt && \
-	deactivate && \
-	pre-commit install
+	deactivate
 
 # ---------------------------------------------------------
 # create python virtual environments for dev
 # ---------------------------------------------------------
 init-dev:
-	make init
+	make init && \
+	npm install && \
 	$(ACTIVATE_VENV) && \
 	$(PIP) install -r requirements/dev.txt && \
-	deactivate
+	deactivate && \
+	pre-commit install
 
 test:
 	python -m unittest discover -s app/