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

Merge pull request #11949 from vector-im/dbkr/fix_webpack_build_fix

Browse source 
Fix build to not babel modules inside js/react sdk
This commit is contained in:
David Baker 2020-01-20 18:31:06 +00:00 committed by GitHub
commit be64e86cc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
webpack.config.js
View file

@ -110,21 +110,21 @@ module.exports = (env, argv) => {
{ {
test: /\.(ts|js)x?$/, test: /\.(ts|js)x?$/,
include: (f) => { include: (f) => {
// our own source needs babel-ing
if (f.startsWith(path.resolve(__dirname, 'src'))) return true;
// we use the original source files of react-sdk and js-sdk, so we need to // we use the original source files of react-sdk and js-sdk, so we need to
// run them through babel. // run them through babel. Because the path tested is the resolved, absolute
if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-js-sdk'))) return true; // path, these could be anywhere thanks to yarn link. We must also not
if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-react-sdk'))) return true; // 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;
// 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
// polyfills: probably fixable but babeling all our dependencies is probably // polyfills: probably fixable but babeling all our dependencies is probably
// not necessary anyway). // not necessary anyway). So, for anything else, don't babel.
if (f.startsWith(path.resolve(__dirname, 'node_modules'))) return false; return false;
// anything else gets babeled (our own source files, and also modules that
// are yarn linked from somewhere else because this tests the absolute,
// resolved path, so react-sdk and js-sdk fall under this case in a standard
// dev setup. This will presumably start running any other module through
// babel if yarn linked... caveat emptor.
return true;
}, },
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {