mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into travis/fix-ci

Browse source
This commit is contained in:
Travis Ralston 2020-01-16 09:25:10 -07:00
commit 4e37f8aa88
11 changed files with 1492 additions and 850 deletions
Download patch file Download diff file Expand all files Collapse all files

11
webpack.config.js
View file

@ -93,22 +93,13 @@ module.exports = (env, argv) => {
// optimised, so there is little to gain by us uglifying it.
/olm[\\\/](javascript[\\\/])?olm\.js$/,
],
rules: [
rules: [
{
test: /\.(ts|js)x?$/,
exclude: /node_modules/,
loader: 'babel-loader',
options: {
cacheDirectory: true,
// These two options are needed to load the babelrc file and
// apply it to node_modules (ie: react-sdk and js-sdk). We
// could put the babel config in this block instead, but we
// publish riot-web to npm for some reason and that seems to
// ship a lib directory. Therefore, we need the babel config
// in a place where babel and babel-loader can reach it.
babelrc: true,
configFile: path.resolve(__dirname, ".babelrc"),
}
},
{