From 5d8d5d70d05f7c1d0a281bb1ba96ec482db82676 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 20 Jan 2020 18:00:38 +0000 Subject: [PATCH 1/2] Fix build to not babel modules inside js/react sdk Adds 'src' to react-sdk & js-sdk babel test path so we don't run node modules inside js & react sdk through babel --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index f0dd47f791..01d3833973 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -112,8 +112,8 @@ module.exports = (env, argv) => { include: (f) => { // we use the original source files of react-sdk and js-sdk, so we need to // run them through babel. - if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-js-sdk'))) return true; - if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-react-sdk'))) return true; + if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-js-sdk', 'src'))) return true; + if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-react-sdk', 'src'))) 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 // polyfills: probably fixable but babeling all our dependencies is probably From 42743c3ead17ff92a693fab2f233f731428c37a1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 20 Jan 2020 18:20:41 +0000 Subject: [PATCH 2/2] Third try at fixing build --- webpack.config.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 01d3833973..95087f7df6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -110,21 +110,21 @@ module.exports = (env, argv) => { { test: /\.(ts|js)x?$/, 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 - // run them through babel. - if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-js-sdk', 'src'))) return true; - if (f.startsWith(path.resolve(__dirname, 'node_modules', 'matrix-react-sdk', 'src'))) return true; + // 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; + // 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 // polyfills: probably fixable but babeling all our dependencies is probably - // not necessary anyway). - if (f.startsWith(path.resolve(__dirname, 'node_modules'))) 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; + // not necessary anyway). So, for anything else, don't babel. + return false; }, loader: 'babel-loader', options: {