diff options
author | Daniel Schaal <daniel@schaal.email> | 2017-06-18 12:19:38 +0200 |
---|---|---|
committer | Bernhard Posselt <BernhardPosselt@users.noreply.github.com> | 2017-06-18 12:19:38 +0200 |
commit | fd630242dade58b7f58de638d64ef1f0db7ae36d (patch) | |
tree | 0e5fc827c0bb489af4595870ced3d0c3a5744b19 /js/karma.conf.js | |
parent | c32d85c11954fdd7592856d1e403c41cb2253fb0 (diff) |
Remove bower, install everything using npm (#197)
* Remove bower, install everything using npm
Remove js-url and use a simple function to get the query param.
* Bundle all js scripts in app.min.js
* Move jquery to devDependencies
* Remove es6-shim, most common browsers support es6 natively.
Diffstat (limited to 'js/karma.conf.js')
-rw-r--r-- | js/karma.conf.js | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/js/karma.conf.js b/js/karma.conf.js index 68bb0fee1..590cb598a 100644 --- a/js/karma.conf.js +++ b/js/karma.conf.js @@ -16,14 +16,12 @@ module.exports = function (config) { // list of files / patterns to load in the browser files: [ - 'vendor/js-url/url.min.js', - 'vendor/es6-shim/es6-shim.min.js', - 'vendor/jquery/dist/jquery.js', - 'vendor/moment/min/moment-with-locales.js', - 'vendor/angular/angular.js', - 'vendor/angular-mocks/angular-mocks.js', - 'vendor/angular-route/angular-route.js', - 'vendor/angular-sanitize/angular-sanitize.js', + 'node_modules/jquery/dist/jquery.js', + 'node_modules/moment/min/moment-with-locales.js', + 'node_modules/angular/angular.js', + 'node_modules/angular-mocks/angular-mocks.js', + 'node_modules/angular-route/angular-route.js', + 'node_modules/angular-sanitize/angular-sanitize.js', 'tests/unit/stubs/App.js', 'tests/unit/stubs/OC.js', 'controller/**/*.js', |