Merge branch 'develop' into foldleft/12014-big-previews-2

This commit is contained in:
Zoe 2020-05-11 10:19:09 +01:00
commit 22704382fe
95 changed files with 2259 additions and 3512 deletions

View file

@ -19,6 +19,8 @@ module.exports = (env, argv) => {
// This makes the sourcemaps human readable for developers. We use eval-source-map
// because the plain source-map devtool ruins the alignment.
development['devtool'] = 'eval-source-map';
} else {
development['devtool'] = 'nosources-source-map';
}
// Resolve the directories for the react-sdk and js-sdk for later use. We resolve these early so we
@ -335,6 +337,20 @@ module.exports = (env, argv) => {
chunks: ['mobileguide'],
}),
// These are the static error pages for when the javascript env is *really unsupported*
new HtmlWebpackPlugin({
template: './src/vector/static/unable-to-load.html',
filename: 'static/unable-to-load.html',
minify: argv.mode === 'production',
chunks: [],
}),
new HtmlWebpackPlugin({
template: './src/vector/static/incompatible-browser.html',
filename: 'static/incompatible-browser.html',
minify: argv.mode === 'production',
chunks: [],
}),
// This is the usercontent sandbox's entry point (separate for iframing)
new HtmlWebpackPlugin({
template: './node_modules/matrix-react-sdk/src/usercontent/index.html',