Skip to content

Commit f15776e

Browse files
Merge pull request justadudewhohacks#98 from justadudewhohacks/build-commonjs-and-es6
build commonjs and es6 modules
2 parents e69df77 + 4fc2707 commit f15776e

13 files changed

+48
-991
lines changed

karma.conf.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,14 @@ module.exports = function(config) {
2525
'**/*.ts': ['karma-typescript']
2626
},
2727
karmaTypescriptConfig: {
28-
tsconfig: 'tsconfig.test.json',
29-
bundlerOptions: {
30-
transforms: [
31-
require("karma-typescript-es6-transform")()
32-
]
33-
}
28+
tsconfig: 'tsconfig.test.json'
3429
},
3530
browsers: ['Chrome'],
36-
browserNoActivityTimeout: 60000,
31+
browserNoActivityTimeout: 120000,
32+
captureTimeout: 60000,
3733
client: {
3834
jasmine: {
39-
timeoutInterval: 30000
35+
timeoutInterval: 60000
4036
}
4137
}
4238
})

0 commit comments

Comments
 (0)