From 7af1d56cda1aeac8122324e8b9ea95d0a771d979 Mon Sep 17 00:00:00 2001 From: Ben Morton Date: Sun, 13 Dec 2015 13:53:26 +0000 Subject: [PATCH] No longer include estraneous js shims --- gulpfile.js | 4 +--- karma.conf.js | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index f8f2e28..6cd5f32 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -32,9 +32,7 @@ var PATHS = { 'node_modules/angular2/bundles/angular2.min.js', 'node_modules/systemjs/dist/system.js', 'node_modules/systemjs/dist/system-polyfills.js', - 'node_modules/es6-promise/dist/es6-promise.min.js', - 'node_modules/es6-shim/es6-shim.min.js', - 'node_modules/core-js/client/shim.min.js' + 'node_modules/es6-shim/es6-shim.min.js' ], rx: 'node_modules/rxjs/**/*.js', typings: [ diff --git a/karma.conf.js b/karma.conf.js index 7e60013..bf7e711 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -13,17 +13,15 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ - 'dist/lib/shim.min.js', - 'dist/lib/system-polyfills.js', + 'node_modules/core-js/client/shim.min.js', 'dist/lib/es6-shim.min.js', - 'dist/lib/es6-promise.min.js', 'dist/lib/system.js', 'node_modules/reflect-metadata/Reflect.js', 'test-main.js', { pattern: 'node_modules/babel-core/*.js', included: false, serve: true, watch: false }, { pattern: 'node_modules/angular2/*.js', included: false, serve: true, watch: false }, { pattern: 'node_modules/angular2/src/**/*.js', included: false, serve: true, watch: false }, - { pattern: 'dist/*.js', included: false, serve: true, watch: true }, + { pattern: 'dist/**/*.js', included: false, serve: true, watch: true }, { pattern: 'rxjs/**/*.js', included: false, serve: true, watch: false }, { pattern: 'test/**/*spec.js',