From e5d07f5a415c118132f3a6b408ec4051846c3600 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 5 Sep 2019 15:04:16 +0200
Subject: [PATCH] Build resources before running tests

---
 Makefile     | 13 +++++++++++--
 package.json |  3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4bc623b69..23b98265f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ help:
 	@echo " clean		Remove all NPM packages."
 	@echo " check		Run all tests."
 	@echo " css			Generate CSS from the Sass files."
-	@echo " dev			Set up the development environment and start the webpack dev server. To force a fresh start, run 'make clean' first."
+	@echo " dev			Set up the development environment and build unminified resources. To force a fresh start, run 'make clean' first."
+	@echo " devserver	Set up the development environment and start the webpack dev server."
 	@echo " html		Make standalone HTML files of the documentation."
 	@echo " po			Generate gettext PO files for each i18n language."
 	@echo " pot			Generate a gettext POT file to be used for translations."
@@ -122,12 +123,20 @@ clean:
 dev: stamp-npm
 	npm run dev
 
+.PHONY: devserver
+devserver: stamp-npm
+	npm run serve
+
 ########################################################################
 ## Builds
 
 .PHONY: css
 css: sass/*.scss dist/website.css dist/website.min.css
 
+dist/converse.js:: stamp-npm dev
+
+dist/converse.css:: stamp-npm dev
+
 dist/website.css:: stamp-npm sass
 	$(SASS) --source-map true --include-path $(BOOTSTRAP) sass/website.scss $@
 
@@ -188,7 +197,7 @@ eslint: stamp-npm
 	$(ESLINT) spec/
 
 .PHONY: check
-check: eslint build
+check: eslint dev
 	LOG_CR_VERBOSITY=INFO $(CHROMIUM) --disable-gpu --no-sandbox http://localhost:$(HTTPSERVE_PORT)/tests/index.html
 
 ########################################################################
diff --git a/package.json b/package.json
index a8bfcba56..370023d49 100644
--- a/package.json
+++ b/package.json
@@ -15,12 +15,13 @@
     "src/"
   ],
   "scripts": {
-    "dev": "webpack-dev-server --config webpack.serve.js",
+    "serve": "webpack-dev-server --config webpack.serve.js",
     "clean": "rm -rf node_modules stamp-npm dist *.zip",
     "converse-headless.js": "webpack --mode=development --type=headless",
     "converse-headless.min.js": "npm run converse-headless.js && webpack --mode=production --type=headless",
     "nodeps": "webpack --config webpack.nodeps.js",
     "build": "webpack --config webpack.prod.js",
+    "dev": "webpack --config webpack.dev.js",
     "watch": "webpack --watch --config webpack.dev.js",
     "lerna": "lerna bootstrap --hoist --ignore-scripts",
     "prepare": "npm run lerna && npm run build"