Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 8731334

Browse files
committed
Remove the request-only stuff we don't need anymore
This was introduced in #2250 but can be pulled out due to matrix-org/matrix-js-sdk#770. See element-hq/element-web#7634 for more information about the future.
1 parent cf31f01 commit 8731334

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

karma.conf.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -199,25 +199,12 @@ module.exports = function (config) {
199199

200200
'matrix-react-sdk': path.resolve('test/skinned-sdk.js'),
201201
'sinon': 'sinon/pkg/sinon.js',
202-
203-
// To make webpack happy
204-
// Related: https://github.com/request/request/issues/1529
205-
// (there's no mock available for fs, so we fake a mock by using
206-
// an in-memory version of fs)
207-
"fs": "memfs",
208202
},
209203
modules: [
210204
path.resolve('./test'),
211205
"node_modules"
212206
],
213207
},
214-
node: {
215-
// Because webpack is made of fail
216-
// https://github.com/request/request/issues/1529
217-
// Note: 'mock' is the new 'empty'
218-
net: 'mock',
219-
tls: 'mock'
220-
},
221208
devtool: 'inline-source-map',
222209
externals: {
223210
// Don't try to bundle electron: leave it as a commonjs dependency

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
"lodash": "^4.13.1",
7777
"lolex": "2.3.2",
7878
"matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
79-
"memfs": "^2.10.1",
8079
"optimist": "^0.6.1",
8180
"pako": "^1.0.5",
8281
"prop-types": "^15.5.8",

0 commit comments

Comments
 (0)