From 457e63f24ee79f064679ccc5d7ab48e21e9a357f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 15 Jan 2020 10:25:36 -0700 Subject: [PATCH 1/2] Fix reference to js-sdk lint config --- .eslintrc.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 0721c1c8d2..6a0576c58a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -5,7 +5,10 @@ const path = require('path'); // but only if they come from a module that starts with eslint-config- // So we load the filename directly (and it could be in node_modules/ // or or ../node_modules/ etc) -const matrixJsSdkPath = path.dirname(require.resolve('matrix-js-sdk')); +// +// We add a `..` to the end because the js-sdk lives out of lib/, but the eslint +// config is at the project root. +const matrixJsSdkPath = path.join(path.dirname(require.resolve('matrix-js-sdk')), '..'); module.exports = { parser: "babel-eslint", From 8f37f8638d9009d7bf65e3cbad864133e8d916b3 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 15 Jan 2020 10:28:27 -0700 Subject: [PATCH 2/2] Build the js-sdk for Jest tests This is theoretically a fix for the tests failing post-sourcemaps. --- scripts/ci/install-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh index 6484ebab29..a2e2e59a45 100755 --- a/scripts/ci/install-deps.sh +++ b/scripts/ci/install-deps.sh @@ -7,6 +7,7 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk pushd matrix-js-sdk yarn link yarn install +yarn build popd yarn link matrix-js-sdk