summaryrefslogtreecommitdiff
path: root/karma.conf.js
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2020-10-15 16:30:44 +0200
committerPierre Ossman <ossman@cendio.se>2020-10-15 18:53:51 +0200
commit890cff921d78835762fbdcfef862571c52cb3035 (patch)
treef49bb3ff446467b3413abf450ee3ebc54dce77b3 /karma.conf.js
parentc01eb5e74da06aab5a9eb5c8b93422ce1ec95d5d (diff)
downloadnovnc-890cff921d78835762fbdcfef862571c52cb3035.tar.gz
Remove legacy conversion of modules
We no longer support Internet Explorer so we can now require that browsers support modules. Some conversion to commonjs still remains for nodejs.
Diffstat (limited to 'karma.conf.js')
-rw-r--r--karma.conf.js17
1 files changed, 7 insertions, 10 deletions
diff --git a/karma.conf.js b/karma.conf.js
index c295b1f..1ea1747 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -31,16 +31,13 @@ module.exports = (config) => {
// list of files / patterns to load in the browser (loaded in order)
files: [
- { pattern: 'app/localization.js', included: false },
- { pattern: 'app/webutil.js', included: false },
- { pattern: 'core/**/*.js', included: false },
- { pattern: 'vendor/pako/**/*.js', included: false },
- { pattern: 'vendor/browser-es-module-loader/dist/*.js*', included: false },
- { pattern: 'tests/test.*.js', included: false },
- { pattern: 'tests/fake.*.js', included: false },
- { pattern: 'tests/assertions.js', included: false },
- 'vendor/promise.js',
- 'tests/karma-test-main.js',
+ { pattern: 'app/localization.js', included: false, type: 'module' },
+ { pattern: 'app/webutil.js', included: false, type: 'module' },
+ { pattern: 'core/**/*.js', included: false, type: 'module' },
+ { pattern: 'vendor/pako/**/*.js', included: false, type: 'module' },
+ { pattern: 'tests/test.*.js', type: 'module' },
+ { pattern: 'tests/fake.*.js', included: false, type: 'module' },
+ { pattern: 'tests/assertions.js', type: 'module' },
],
client: {