Skip to content

Commit

Permalink
Fix webpack config (by stealing Dave's config)
Browse files Browse the repository at this point in the history
Without doing something like this it's hard to use `yarn link`ed resources.
  • Loading branch information
turt2live authored and dbkr committed Jan 22, 2020
1 parent c197c2f commit 8c103b5
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ module.exports = (env, argv) => {
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(path.join(require.resolve("matrix-react-sdk/package.json"), '..', 'src'));
const jsSdkSrcDir = path.resolve(path.join(require.resolve("matrix-js-sdk/package.json"), '..', 'src'));

return {
...development,

Expand Down Expand Up @@ -117,8 +123,8 @@ module.exports = (env, argv) => {
// 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
// include node modules inside these modules, so we add 'src'.
if (f.includes(path.join('matrix-js-sdk', 'src'))) return true;
if (f.includes(path.join('matrix-react-sdk', 'src'))) return true;
if (f.startsWith(reactSdkSrcDir)) return true;
if (f.startsWith(jsSdkSrcDir)) return true;

// 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
Expand Down

0 comments on commit 8c103b5

Please sign in to comment.