From 27d61411abaf06e5f2656539b5762d06e483ee7f Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Sun, 25 Jun 2023 10:44:31 +0200
Subject: [PATCH] Update release instructions

---
 CHANGES.md |  4 ++++
 Makefile   | 12 +++++-------
 RELEASE.md | 22 +++++++++++-----------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 596049c9d..eda356beb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 10.1.3 (Unreleased)
+
+- Fix `dist` directory not included in NPM package
+
 ## 10.1.3 (2023-06-23)
 
 - Add the ability to set roles and affiliations via the MUC occupant modal
diff --git a/Makefile b/Makefile
index fa7b9d5d9..c75a3f625 100644
--- a/Makefile
+++ b/Makefile
@@ -104,14 +104,12 @@ release:
 	make pot
 	make po
 	make dist
-	make tars
 
-.PHONY: tars
-tars:
-	git clone git@github.com:conversejs/converse.js.git --depth 1 release/
-	cd release && make dist
-	cd release && npm pack
-	cd release/src/headless && npm pack
+.PHONY: publish
+publish:
+	git clone git@github.com:conversejs/converse.js.git --depth 1 --branch $(BRANCH) release/
+	cd release && make dist && npm pack && npm publish
+	cd release/src/headless && npm pack && npm publish
 	find ./release/ -name "converse.js-*.tgz" -exec mv {} . \;
 	find ./release/src/headless -name "converse-headless-*.tgz" -exec mv {} . \;
 	rm -rf release
diff --git a/RELEASE.md b/RELEASE.md
index 97108d321..8ae9024ab 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -2,17 +2,17 @@
 
 1. Check that weblate translations are all merged in
 2. Run `make check` to check that all tests pass.
-3. Run `make release VERSION=10.1.3`
+3. Run `make release VERSION=10.1.4`
 4. Do a `git diff` to check if things look sane.
 5. Do a quick manual test with the `dist` files (via `index.html`)
-6. `git commit -am "Release 10.1.3"`
-7. `git tag -s v10.1.3 -m "Release 10.1.3"`
-8. Run `git push && git push origin v10.1.3`
-9. Update https://conversejs.org
-    * `cd /home/conversejs/converse.js`
-    * `make deploy VERSION=10.1.3`
+6. `git commit -am "Release 10.1.4"`
+7. `git tag -s v10.1.4 -m "Release 10.1.4"`
+8. `git push && git push origin v10.1.4`
+9. `make publish BRANCH=v10.1.4`
 10. Update release page on Github
-11. `cd release && git fetch && git co v10.1.3`
-12. Run `npm publish && cd src/headless/ && npm publish`
-13. Update the repository on weblate
-14. Decide on next release number and run `make postrelease VERSION=10.1.4`
+    * Upload tar files
+11. Update https://conversejs.org
+    * `cd /home/conversejs/converse.js`
+    * `make deploy VERSION=10.1.4`
+12. Update the repository on weblate
+13. Decide on next release number and run `make postrelease VERSION=10.1.5`