Skip to content

Commit a38661c

Browse files
authored
Merge pull request element-hq#7387 from vector-im/matthew/webpack4
Webpack4
2 parents a371bed + c4f6158 commit a38661c

File tree

5 files changed

+6110
-1243
lines changed

5 files changed

+6110
-1243
lines changed

karma.conf.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ const olm_entry = webpack_config.entry['olm'];
3232
// 'preprocessors' config below)
3333
delete webpack_config['entry'];
3434

35+
// make sure we're flagged as development to avoid wasting time optimising
36+
webpack_config.mode = 'development';
37+
3538
// add ./test as a search path for js
36-
webpack_config.module.loaders.unshift({
37-
test: /\.js$/, loader: "babel",
39+
webpack_config.module.rules.unshift({
40+
test: /\.js$/, use: "babel-loader",
3841
include: [path.resolve('./src'), path.resolve('./test')],
3942
});
4043

@@ -46,8 +49,9 @@ webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
4649
// ?
4750
webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';
4851

49-
webpack_config.resolve.root = [
52+
webpack_config.resolve.modules = [
5053
path.resolve('./test'),
54+
"node_modules"
5155
];
5256

5357
webpack_config.devtool = 'inline-source-map';

0 commit comments

Comments
 (0)