No longer include estraneous js shims

BTMorton · Dec 13, 2015 · 7af1d56 · 7af1d56
1 parent 31775eb
commit 7af1d56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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',