OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Reset matrix-js-sdk back to develop branch

pull/21833/head
RiotRobot 2022-04-12 10:38:05 +01:00
parent 28512f20d3
commit 42dbe14f36
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -89,7 +89,7 @@
"matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90", "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90",
"matrix-encrypt-attachment": "^1.0.3", "matrix-encrypt-attachment": "^1.0.3",
"matrix-events-sdk": "^0.0.1-beta.7", "matrix-events-sdk": "^0.0.1-beta.7",
"matrix-js-sdk": "17.0.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-widget-api": "^0.1.0-beta.18", "matrix-widget-api": "^0.1.0-beta.18",
"minimist": "^1.2.5", "minimist": "^1.2.5",
"opus-recorder": "^8.0.3", "opus-recorder": "^8.0.3",

48
release.sh
View File

@ -12,30 +12,30 @@ cd `dirname $0`
# This link seems to get eaten by the release process, so ensure it exists. # This link seems to get eaten by the release process, so ensure it exists.
yarn link matrix-js-sdk yarn link matrix-js-sdk
for i in matrix-js-sdk # for i in matrix-js-sdk
do # do
echo "Checking version of $i..." # echo "Checking version of $i..."
depver=`cat package.json | jq -r .dependencies[\"$i\"]` # depver=`cat package.json | jq -r .dependencies[\"$i\"]`
latestver=`yarn info -s $i dist-tags.next` # latestver=`yarn info -s $i dist-tags.next`
if [ "$depver" != "$latestver" ] # if [ "$depver" != "$latestver" ]
then # then
echo "The latest version of $i is $latestver but package.json depends on $depver." # echo "The latest version of $i is $latestver but package.json depends on $depver."
echo -n "Type 'u' to auto-upgrade, 'c' to continue anyway, or 'a' to abort:" # echo -n "Type 'u' to auto-upgrade, 'c' to continue anyway, or 'a' to abort:"
read resp # read resp
if [ "$resp" != "u" ] && [ "$resp" != "c" ] # if [ "$resp" != "u" ] && [ "$resp" != "c" ]
then # then
echo "Aborting." # echo "Aborting."
exit 1 # exit 1
fi # fi
if [ "$resp" == "u" ] # if [ "$resp" == "u" ]
then # then
echo "Upgrading $i to $latestver..." # echo "Upgrading $i to $latestver..."
yarn add -E $i@$latestver # yarn add -E $i@$latestver
git add -u # git add -u
git commit -m "Upgrade $i to $latestver" # git commit -m "Upgrade $i to $latestver"
fi # fi
fi # fi
done # done
./node_modules/matrix-js-sdk/release.sh -z "$@" ./node_modules/matrix-js-sdk/release.sh -z "$@"

5
yarn.lock
View File

@ -6244,10 +6244,9 @@ matrix-events-sdk@^0.0.1-beta.7:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
matrix-js-sdk@17.0.0: "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "17.0.0" version "17.0.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0.tgz#6edf2f8d05da003e98a6cf5269a4717adfe4e406" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b58d09aa9a7a3578c43185becb41ab0b17ce0f98"
integrity sha512-8nv+a1e6n4x4DYKiBFRS6/CIpsE22+31K+9/4Y5MB8m3iraSVBtdZ5y/9ktQnjQuo9I85TvyqHL2obRWF7UD5Q==
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
another-json "^0.2.0" another-json "^0.2.0"