Merge matrix-react-sdk into element-web

Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

scripts/ci/install-deps.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# This installs other Matrix dependencies that are often
+# developed in parallel with react-sdk, using fetchdep.sh
+# for branch matching.
+# This will set up a working react-sdk environment, so is
+# used for running react-sdk standalone tests. To set up a
+# build of element-web, use layered.sh
+
+set -ex
+
+scripts/fetchdep.sh matrix-org matrix-js-sdk develop
+pushd matrix-js-sdk
+[ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF
+yarn link
+yarn install --frozen-lockfile $@
+popd
+
+scripts/fetchdep.sh matrix-org matrix-analytics-events
+# We don't pass a default branch so cloning may fail when we are not in a PR
+# This is expected as this project does not share a release cycle but we still branch match it
+if [ -d matrix-analytics-events ]; then
+    pushd matrix-analytics-events
+    yarn link
+    yarn install --frozen-lockfile $@
+    yarn build:ts
+    popd
+fi
+
+yarn link matrix-js-sdk
+[ -d matrix-analytics-events ] && yarn link @matrix-org/analytics-events
+yarn install --frozen-lockfile $@

scripts/ci/layered.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -ex
+
+# Creates a layered environment with the full repo for the app and SDKs cloned
+# and linked. This gives an element-web dev environment ready to build with
+# the current react-sdk branch and any matching branches of react-sdk's dependencies
+# so that changes can be tested in element-web.
+
+# Note that this style is different from the recommended developer setup: this
+# file nests js-sdk inside element-web, while the local
+# development setup places them all at the same level. We are nesting them here
+# because some CI systems do not allow moving to a directory above the checkout
+# for the primary repo (react-sdk in this case).
+
+# Set up the js-sdk first
+scripts/fetchdep.sh matrix-org matrix-js-sdk develop
+pushd matrix-js-sdk
+[ -n "$JS_SDK_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $JS_SDK_GITHUB_BASE_REF && git checkout $JS_SDK_GITHUB_BASE_REF
+yarn link
+yarn install --frozen-lockfile
+popd
+
+# Also set up matrix-analytics-events for branch with matching name
+scripts/fetchdep.sh matrix-org matrix-analytics-events
+# We don't pass a default branch so cloning may fail when we are not in a PR
+# This is expected as this project does not share a release cycle but we still branch match it
+if [ -d matrix-analytics-events ]; then
+    pushd matrix-analytics-events
+    yarn link
+    yarn install --frozen-lockfile
+    yarn build:ts
+    popd
+fi
+
+# Finally, set up element-web
+scripts/fetchdep.sh vector-im element-web develop
+pushd element-web
+[ -n "$ELEMENT_WEB_GITHUB_BASE_REF" ] && git fetch --depth 1 origin $ELEMENT_WEB_GITHUB_BASE_REF && git checkout $ELEMENT_WEB_GITHUB_BASE_REF
+yarn link matrix-js-sdk
+yarn install --frozen-lockfile
+yarn build:res
+popd