Upstream v1.11.84-rc.0: Get rid of matrix-react-sdk

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "matrix-js-sdk"]
 	path = matrix-js-sdk
 	url = https://github.com/SchildiChat/matrix-js-sdk.git
-[submodule "matrix-react-sdk"]
-	path = matrix-react-sdk
-	url = https://github.com/SchildiChat/matrix-react-sdk.git
 [submodule "element-web"]
 	path = element-web
 	url = https://github.com/SchildiChat/element-web.git

Makefile

@@ -202,7 +202,7 @@ linux-container-release: container-debian-based-release container-rpm-release
 container-local-pkgbuild: container-build-debian
 	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild
 
-bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
+bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock
 	./build-bom.sh
 bom: bom.lock
 
@@ -211,17 +211,16 @@ fix_yarn_cache:
 
 clean:
 	$(YARN) --cwd matrix-js-sdk clean
-	$(YARN) --cwd matrix-react-sdk clean
 	$(YARN) --cwd element-web clean
 	$(YARN) --cwd element-desktop clean
 	rm -f element-desktop/webapp || true
 	rm -rf element-web/dist
 	rm -rf local-pkgbuild
 	rm -f bom.lock
-	rm -f matrix-react-sdk/res/css/sc-cpd-overrides.css
+	rm -f element-web/res/css/sc-cpd-overrides.css
 
 undo_setup:
-	rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
+	rm -rf element-desktop/node_modules element-web/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
 
 fixup: undo_setup fix_yarn_cache
 	make setup

README.md

@@ -85,15 +85,14 @@ See [here](RELEASE.md).
 
 ## Building SchildiChat Web/Desktop
 
-This particular repo is a wrapper project for element-desktop, element-web, matrix-react-sdk and matrix-js-sdk. It's the recommended starting point to build SchildiChat for Web **and** Desktop.
+This particular repo is a wrapper project for element-desktop, element-web, and matrix-js-sdk. It's the recommended starting point to build SchildiChat for Web **and** Desktop.
 
 The `master` branch contains the latest release.  
 Development happens in the `sc` branch, which might be **broken at any time**!
 
 <pre><code><b>schildichat-desktop</b> <i>&lt;-- this repo</i> (recommended starting point to build SchildiChat for Web <b>and</b> Desktop)
 |-- <a href="https://github.com/SchildiChat/element-desktop">element-desktop</a> (electron wrapper)
-|-- <a href="https://github.com/SchildiChat/element-web">element-web</a> ("skin" for matrix-react-sdk)
-|-- <a href="https://github.com/SchildiChat/matrix-react-sdk">matrix-react-sdk</a> (most of the development happens here)
+|-- <a href="https://github.com/SchildiChat/element-web">element-web</a> (most of the development happens here)
 `-- <a href="https://github.com/SchildiChat/matrix-js-sdk">matrix-js-sdk</a> (Matrix client js sdk)
 </code></pre>
 

apply_patches.sh

@@ -16,10 +16,8 @@ pushd "$mydir" > /dev/null
 source ./merge_helpers.sh
 
 # Apply our patches
-print_section "Apply patches to matrix-js-sdk"
-apply_patches matrix-js-sdk
-print_section "Apply patches to matrix-react-sdk"
-apply_patches matrix-react-sdk
+#print_section "Apply patches to matrix-js-sdk"
+#apply_patches matrix-js-sdk
 print_section "Apply patches to element-web"
 apply_patches element-web
 print_section "Apply patches to element-desktop"

build-bom.sh

@@ -5,8 +5,6 @@ cat element-web/yarn.lock >> bom.lock
 echo "" >> bom.lock
 cat matrix-js-sdk/yarn.lock >> bom.lock
 echo "" >> bom.lock
-cat matrix-react-sdk/yarn.lock >> bom.lock
-echo "" >> bom.lock
 
 # matrix-seshat
 cat << EOF >> bom.lock

generate_patches.sh

@@ -24,8 +24,10 @@ persist_patches() {
         echo "Creating new patch dir $patch_dir..."
         mkdir "$patch_dir"
     fi
-    echo "Creating new patches"
-    git format-patch -k upstream/master.. -o "$patch_dir"
+    # Assume we forked from a tag starting with 'v' (our own tags start with sc_)
+    local fork_point=`git describe --tags --match 'v*'| sed 's|-[^-]*-[^-]*$||'`
+    echo "Creating new patches from $fork_point"
+    git format-patch -k "$fork_point".. -o "$patch_dir"
     echo "Clearing automated commits from patches"
     find "$patch_dir" -name "*-Automatic-package.json-adjustment.patch" -exec rm {} \;
     find "$patch_dir" -name "*-Automatic-icon-update.patch" -exec rm {} \;
@@ -37,7 +39,6 @@ persist_patches() {
 
 persist_patches element-desktop
 persist_patches element-web
-persist_patches matrix-react-sdk
-persist_patches matrix-js-sdk
+#persist_patches matrix-js-sdk
 
 popd > /dev/null

merge_helpers.sh

@@ -21,7 +21,7 @@ add_upstream() {
     if echo "$sc_remote" | grep -q matrix-js-sdk; then
         # matrix.org repo
         local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|matrix-org|')"
-    elif echo "$sc_remote" | grep -q "element\\|matrix-react-sdk\\|compound-web"; then
+    elif echo "$sc_remote" | grep -q "element\\|compound-web"; then
         # vector-im repo
         local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|element-hq|')"
     else
@@ -34,7 +34,7 @@ add_upstream() {
 }
 
 forall_repos() {
-    for repo in "matrix-js-sdk" "matrix-react-sdk" "element-web" "element-desktop" "compound-web"; do
+    for repo in "matrix-js-sdk" "element-web" "element-desktop" "compound-web"; do
         pushd "$SCHILDI_ROOT/$repo" > /dev/null
         "$@"
         popd > /dev/null
@@ -99,13 +99,8 @@ automatic_i18n_reversion() {
     get_current_upstream_tag
 
     local current_mxjssdk_tag
-    local current_mxreactsdk_tag
     get_current_mxsdk_tags
 
-    pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
-    revert_i18n_changes "$i18n_path" "$current_mxreactsdk_tag" "$skip_commit"
-    popd > /dev/null
-
     pushd "$SCHILDI_ROOT/element-web" > /dev/null
     revert_i18n_changes "$i18n_path" "$current_upstream_tag" "$skip_commit"
     popd > /dev/null
@@ -116,13 +111,6 @@ automatic_i18n_reversion() {
 }
 
 automatic_i18n_adjustment() {
-    # matrix-react-sdk
-    pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
-    $yarn i18n
-    node "$i18n_helper_path" "$SCHILDI_ROOT/matrix-react-sdk/$i18n_path" "$i18n_overlay_path/matrix-react-sdk"
-    apply_i18n_changes "$i18n_path"
-    popd > /dev/null
-
     # element-web
     pushd "$SCHILDI_ROOT/element-web" > /dev/null
     $yarn i18n
@@ -248,7 +236,6 @@ get_current_upstream_tag() {
 }
 
 get_current_mxsdk_tags() {
-    current_mxreactsdk_tag="v$(cat "$SCHILDI_ROOT/element-web/package.json" | jq '.dependencies["matrix-react-sdk"]' -r)"
     current_mxjssdk_tag="v$(cat "$SCHILDI_ROOT/element-web/package.json" | jq '.dependencies["matrix-js-sdk"]' -r)"
 }
 

merge_upstream.sh

@@ -45,18 +45,14 @@ pushd "matrix-js-sdk" > /dev/null
 git checkout "$current_mxjssdk_tag" -B "$sc_branch_name"
 popd > /dev/null
 
-pushd "matrix-react-sdk" > /dev/null
-git checkout "$current_mxreactsdk_tag" -B "$sc_branch_name"
-popd > /dev/null
-
 # Refresh environment
 make clean
 make setup
 forall_repos commit_if_dirty "Automatic setup commit"
 
 ./apply_patches.sh
 
-compound_web_version=`cat matrix-react-sdk/package.json|grep compound-web|sed 's|.*: \"\(.*\)",|\1|;s|\^||'`
+compound_web_version=`cat element-web/package.json|grep compound-web|sed 's|.*: \"\(.*\)",|\1|;s|\^||'`
 echo "TODO: merge compound web at $compound_web_version"
 
 popd > /dev/null