PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3722 from matrix-org/travis/babel7

Browse source 
[BREAKING] Refactor the entire build process for babel@7 and TypeScript (chunk 1 of many)
This commit is contained in:
Travis Ralston 2019-12-17 10:44:20 -07:00 committed by GitHub
commit 38e75aaae0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.babelrc
View file

@ -5,8 +5,7 @@
"targets": { "targets": {
"browsers": [ "browsers": [
"last 2 versions" "last 2 versions"
], ]
"node": 12
}, },
"modules": "commonjs" "modules": "commonjs"
}], }],

5
src/MatrixClientPeg.js
View file

@ -247,5 +247,10 @@ class _MatrixClientPeg {
if (!global.mxMatrixClientPeg) { if (!global.mxMatrixClientPeg) {
global.mxMatrixClientPeg = new _MatrixClientPeg(); global.mxMatrixClientPeg = new _MatrixClientPeg();
} }
// We export both because the syntax is slightly different with
// our babel changes. We maintain both for backwards compatibility
// and for babel to be happy.
// TODO: Convert this to a single export
export default global.mxMatrixClientPeg; export default global.mxMatrixClientPeg;
export const MatrixClientPeg = global.mxMatrixClientPeg; export const MatrixClientPeg = global.mxMatrixClientPeg;