Merge branch 'master' into develop

10 months ago · cfa47eec00
3 changed files with 71 additions and 12 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,48 @@
+Changes in [1.7.33](https://github.com/vector-im/element-web/releases/tag/v1.7.33) (2021-07-19)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.33-rc.1...v1.7.33)
+
+ * No changes from rc.1
+
+Changes in [1.7.33-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.33-rc.1) (2021-07-14)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.32...v1.7.33-rc.1)
+
+ * Translations update from Weblate
+   [\#17991](https://github.com/vector-im/element-web/pull/17991)
+ * Revert "Don't run nginx as root in docker"
+   [\#17990](https://github.com/vector-im/element-web/pull/17990)
+ * Don't run nginx as root in docker
+   [\#17927](https://github.com/vector-im/element-web/pull/17927)
+ * Add VS Code to gitignore
+   [\#17982](https://github.com/vector-im/element-web/pull/17982)
+ * Remove canvas native dependencies from Dockerfile
+   [\#17973](https://github.com/vector-im/element-web/pull/17973)
+ * Remove node-canvas devDependency
+   [\#17967](https://github.com/vector-im/element-web/pull/17967)
+ * Add `reskindex` to development steps
+   [\#17926](https://github.com/vector-im/element-web/pull/17926)
+ * Update Modernizr and stop it from polluting classes on the html tag
+   [\#17921](https://github.com/vector-im/element-web/pull/17921)
+ * Convert a few files to TS
+   [\#17895](https://github.com/vector-im/element-web/pull/17895)
+ * Do not generate a lockfile when running in CI
+   [\#17902](https://github.com/vector-im/element-web/pull/17902)
+ * Fix lockfile to match listed dependencies
+   [\#17888](https://github.com/vector-im/element-web/pull/17888)
+ * Remove PostCSS calc() processing
+   [\#17856](https://github.com/vector-im/element-web/pull/17856)
+ * Make issue template styling more consistent and improve PR template
+   [\#17691](https://github.com/vector-im/element-web/pull/17691)
+ * Update jsrsasign to ^10.2.0 (Includes fix for CVE-2021-30246)
+   [\#17170](https://github.com/vector-im/element-web/pull/17170)
+ * Migrate to `eslint-plugin-matrix-org`
+   [\#17847](https://github.com/vector-im/element-web/pull/17847)
+ * Remove spurious overflow: auto on #matrixchat element
+   [\#17647](https://github.com/vector-im/element-web/pull/17647)
+ * Enhance security by disallowing CSP object-src rule
+   [\#17818](https://github.com/vector-im/element-web/pull/17818)
+
 Changes in [1.7.32](https://github.com/vector-im/element-web/releases/tag/v1.7.32) (2021-07-05)
 ===============================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.32-rc.1...v1.7.32)
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "element-web",
-  "version": "1.7.32",
+  "version": "1.7.33",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@ -60,8 +60,8 @@
    "highlight.js": "^10.5.0",
    "jsrsasign": "^10.2.0",
    "katex": "^0.12.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-js-sdk": "12.1.0",
+    "matrix-react-sdk": "3.26.0",
    "matrix-widget-api": "^0.1.0-beta.15",
    "prop-types": "^15.7.2",
    "react": "^17.0.2",
--- a/yarn.lock
+++ b/yarn.lock
@ -2389,6 +2389,11 @@ bluebird@^3.5.0, bluebird@^3.5.5:
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==

+blurhash@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz#dc325af7da836d07a0861d830bdd63694382483e"
+  integrity sha512-yUhPJvXexbqbyijCIE/T2NCXcj9iNPhWmOKbPTuR/cm7Q5snXYIfnVnz6m7MWOXxODMz/Cr3UcVkRdHiuDVRDw==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
  version "4.12.0"
  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
@ -7261,9 +7266,10 @@ mathml-tag-names@^2.1.3:
  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==

-matrix-js-sdk@12.0.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "12.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/284e2bb911d2dffeff4c819436d1fde20d56646b"
+matrix-js-sdk@12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.1.0.tgz#7d159dd9bc03701e45a6b2777f1fa582a7e8b970"
+  integrity sha512-/fSqOjD+mTlMD+/B3s3Ja6BfI46FnTDl43ojzGDUOsHRRmSYUmoONb83qkH5Fjm8cI2q5ZBJMsBfjuZwLVeiZw==
  dependencies:
    "@babel/runtime" "^7.12.5"
    another-json "^0.2.0"
@ -7284,12 +7290,14 @@ matrix-mock-request@^1.2.3:
    bluebird "^3.5.0"
    expect "^1.20.2"

-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.24.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e290fdaabcb0259b26412b34b3ec4cd11e76164a"
+matrix-react-sdk@3.26.0:
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.26.0.tgz#c6e9471acaaeba5852f5b836612e5ad6eae5d0d8"
+  integrity sha512-HM2RnPP8Ad6MOMveJUXN3u2+itsYzp8pCLz/9CNEmSCSpbNXqAoDCHadgGeJbfcyC1swjbD9N3wzF6Or68MNjg==
  dependencies:
    "@babel/runtime" "^7.12.5"
    await-lock "^2.1.0"
+    blurhash "^1.1.3"
    browser-encrypt-attachment "^0.3.0"
    browser-request "^0.3.3"
    cheerio "^1.0.0-rc.9"
@ -7313,8 +7321,8 @@ matrix-mock-request@^1.2.3:
    katex "^0.12.0"
    linkifyjs "^2.1.9"
    lodash "^4.17.20"
-    matrix-js-sdk "12.0.0"
-    matrix-widget-api "^0.1.0-beta.14"
+    matrix-js-sdk "12.1.0"
+    matrix-widget-api "^0.1.0-beta.15"
    minimist "^1.2.5"
    opus-recorder "^8.0.3"
    pako "^2.0.3"
@ -7324,7 +7332,8 @@ matrix-mock-request@^1.2.3:
    qrcode "^1.4.4"
    re-resizable "^6.9.0"
    react "^17.0.2"
-    react-beautiful-dnd "^4.0.1"
+    react-beautiful-dnd "^13.1.0"
+    react-blurhash "^0.1.3"
    react-dom "^17.0.2"
    react-focus-lock "^2.5.0"
    react-transition-group "^4.4.1"
@ -9561,6 +9570,11 @@ react-beautiful-dnd@^4.0.1:
    redux-thunk "^2.2.0"
    reselect "^3.0.1"

+react-blurhash@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/react-blurhash/-/react-blurhash-0.1.3.tgz#735f28f8f07fb358d7efe7e7e6dc65a7272bf89e"
+  integrity sha512-Q9lqbXg92NU6/2DoIl/cBM8YWL+Z4X66OiG4aT9ozOgjBwx104LHFCH5stf6aF+s0Q9Wf310Ul+dG+VXJltmPg==
+
 react-clientside-effect@^1.2.2:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.3.tgz#95c95f520addfb71743608b990bfe01eb002012b"