diff --git a/package.json b/package.json index 20125e29af..dd1db92a71 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90", "matrix-encrypt-attachment": "^1.0.3", "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", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/release.sh b/release.sh index 4742f00dea..d8c8e59fe0 100755 --- a/release.sh +++ b/release.sh @@ -12,30 +12,30 @@ cd `dirname $0` # This link seems to get eaten by the release process, so ensure it exists. yarn link matrix-js-sdk -for i in matrix-js-sdk -do - echo "Checking version of $i..." - depver=`cat package.json | jq -r .dependencies[\"$i\"]` - latestver=`yarn info -s $i dist-tags.next` - if [ "$depver" != "$latestver" ] - then - 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:" - read resp - if [ "$resp" != "u" ] && [ "$resp" != "c" ] - then - echo "Aborting." - exit 1 - fi - if [ "$resp" == "u" ] - then - echo "Upgrading $i to $latestver..." - yarn add -E $i@$latestver - git add -u - git commit -m "Upgrade $i to $latestver" - fi - fi -done +# for i in matrix-js-sdk +# do +# echo "Checking version of $i..." +# depver=`cat package.json | jq -r .dependencies[\"$i\"]` +# latestver=`yarn info -s $i dist-tags.next` +# if [ "$depver" != "$latestver" ] +# then +# 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:" +# read resp +# if [ "$resp" != "u" ] && [ "$resp" != "c" ] +# then +# echo "Aborting." +# exit 1 +# fi +# if [ "$resp" == "u" ] +# then +# echo "Upgrading $i to $latestver..." +# yarn add -E $i@$latestver +# git add -u +# git commit -m "Upgrade $i to $latestver" +# fi +# fi +# done ./node_modules/matrix-js-sdk/release.sh -z "$@" diff --git a/yarn.lock b/yarn.lock index f74939c556..324fe711c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" 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" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0.tgz#6edf2f8d05da003e98a6cf5269a4717adfe4e406" - integrity sha512-8nv+a1e6n4x4DYKiBFRS6/CIpsE22+31K+9/4Y5MB8m3iraSVBtdZ5y/9ktQnjQuo9I85TvyqHL2obRWF7UD5Q== + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b58d09aa9a7a3578c43185becb41ab0b17ce0f98" dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0"