OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #11956 from vector-im/travis/steal-daves-webpack 

Fix webpack config (by stealing Dave's config)
pull/11995/head
David Baker 2020-01-21 10:23:15 +00:00 committed by GitHub
parent 3e324f6544 6835f6054b
commit 18bdbe13b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webpack.config.js
View File

@ -21,6 +21,12 @@ module.exports = (env, argv) => {
development['devtool'] = 'eval-source-map'; development['devtool'] = 'eval-source-map';
} }
// Resolve the directories for the react-sdk and js-sdk for later use. We resolve these early so we
// don't have to call them over and over. We also resolve to the package.json instead of the src
// directory so we don't have to rely on a index.js or similar file existing.
const reactSdkSrcDir = path.resolve(require.resolve("matrix-react-sdk/package.json"), '..', 'src');
const jsSdkSrcDir = path.resolve(require.resolve("matrix-js-sdk/package.json"), '..', 'src');
return { return {
...development, ...development,
@ -117,8 +123,8 @@ module.exports = (env, argv) => {
// run them through babel. Because the path tested is the resolved, absolute // run them through babel. Because the path tested is the resolved, absolute
// path, these could be anywhere thanks to yarn link. We must also not // path, these could be anywhere thanks to yarn link. We must also not
// include node modules inside these modules, so we add 'src'. // include node modules inside these modules, so we add 'src'.
if (f.includes(path.join('matrix-js-sdk', 'src'))) return true; if (f.startsWith(reactSdkSrcDir)) return true;
if (f.includes(path.join('matrix-react-sdk', 'src'))) return true; if (f.startsWith(jsSdkSrcDir)) return true;
// but we can't run all of our dependencies through babel (many of them still // but we can't run all of our dependencies through babel (many of them still
// use module.exports which breaks if babel injects an 'include' for its // use module.exports which breaks if babel injects an 'include' for its