From 1d03e295782fdc4a4da24c36aad8667caaaf914a Mon Sep 17 00:00:00 2001
From: mose <mose@mose.com>
Date: Tue, 8 Aug 2023 15:56:00 +0800
Subject: [PATCH] build converse another way, and upgrade to v10

---
 .gitignore                     |  1 +
 .gitmodules                    |  3 ---
 conversejs/build-conversejs.sh | 13 ++++++++-----
 vendor/converse.js             |  1 -
 4 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 160000 vendor/converse.js

diff --git a/.gitignore b/.gitignore
index 09c0f6fd..7d4fe7e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ support/documentation/content/translations/**/*.md
 support/documentation/i18n
 public
 vendor/prosody-appimage
+vendor/conversejs-*
diff --git a/.gitmodules b/.gitmodules
index cf15b6e9..07b974b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "vendor/converse.js"]
-	path = vendor/converse.js
-	url = https://github.com/conversejs/converse.js.git
 [submodule "documentation/themes/hugo-theme-learn"]
 	path = support/documentation/themes/hugo-theme-learn
 	url = https://github.com/matcornic/hugo-theme-learn.git
diff --git a/conversejs/build-conversejs.sh b/conversejs/build-conversejs.sh
index 4817e42c..b32b6e02 100644
--- a/conversejs/build-conversejs.sh
+++ b/conversejs/build-conversejs.sh
@@ -3,10 +3,13 @@
 set -euo pipefail
 set -x
 
+CONVERSE_VERSION="v10.1.5"
+CONVERSE_REPO="https://github.com/conversejs/converse.js.git"
+
 rootdir="$(pwd)"
 src_dir="$rootdir/conversejs"
-converse_src_dir="$rootdir/vendor/converse.js"
-converse_build_dir="$rootdir/build/converse.js"
+converse_src_dir="$src_dir/conversejs-$CONVERSE_VERSION"
+converse_build_dir="$rootdir/build/conversejs"
 converse_destination_dir="$rootdir/dist/client/conversejs"
 
 if [[ ! -d $src_dir ]]; then
@@ -15,8 +18,8 @@ if [[ ! -d $src_dir ]]; then
 fi
 
 if [[ ! -d "$converse_src_dir" ]]; then
-  echo "ConverseJS sources are not here. Please be sure to have all the submodules downloaded ('git pull --recurse-submodules')."
-  exit 1
+  git clone --depth=1 --branch $CONVERSE_VERSION $CONVERSE_REPO $converse_src_dir
+  rm -rf "$converse_build_dir"
 fi
 
 if cmp -s "$converse_src_dir/package.json" "$converse_build_dir/package.json"; then
@@ -38,7 +41,7 @@ mv "$converse_build_dir/custom/webpack.livechat.js" "$converse_build_dir/"
 if [[ ! -d "$converse_build_dir/node_modules" ]]; then
   echo "Missing node_modules directory, seems we have to call the makefile..."
   cd "$converse_build_dir"
-  make node_modules src/*
+  make dist
   cd $rootdir
 fi
 
diff --git a/vendor/converse.js b/vendor/converse.js
deleted file mode 160000
index d5deed08..00000000
--- a/vendor/converse.js
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d5deed087195e9835452503d31fe51e5fef53b10