Merge pull request #1652 from vector-im/rav/fix_karma_olm_warning
Karma: fix warning by ignoring olmpull/1660/head
						commit
						42b7410a5d
					
				|  | @ -36,7 +36,7 @@ module.exports = function (config) { | |||
|         proxies: { | ||||
|             "/img/": "/base/vector/img/", | ||||
|         }, | ||||
|          | ||||
| 
 | ||||
|         // preprocess matching files before serving them to the browser
 | ||||
|         // available preprocessors:
 | ||||
|         // https://npmjs.org/browse/keyword/karma-preprocessor
 | ||||
|  | @ -123,7 +123,7 @@ module.exports = function (config) { | |||
| 
 | ||||
|                     // same goes for js-sdk
 | ||||
|                     "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'), | ||||
|                      | ||||
| 
 | ||||
|                     sinon: 'sinon/pkg/sinon.js', | ||||
|                 }, | ||||
|                 root: [ | ||||
|  | @ -131,6 +131,11 @@ module.exports = function (config) { | |||
|                     path.resolve('./test'), | ||||
|                 ], | ||||
|             }, | ||||
|             plugins: [ | ||||
|                 // olm may not be installed, so avoid webpack warnings by
 | ||||
|                 // ignoring it.
 | ||||
|                 new webpack.IgnorePlugin(/^olm$/), | ||||
|             ], | ||||
|             devtool: 'inline-source-map', | ||||
|         }, | ||||
|     }); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 David Baker
						David Baker