From 8059b4401e3a6f281fa5343e769fbc72ad79bcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Thu, 15 Sep 2016 22:13:30 +0200 Subject: [PATCH] feat(*): support angular 2.0.0 Closes #658 Closes #659 --- karma.conf.js | 6 ++++-- package.json | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index e2c4ce59f..266d30ba1 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -13,8 +13,10 @@ module.exports = function(config) { } }, files: [ - {pattern: 'node_modules/core-js/client/core.js', included: true, watched: true}, + 'node_modules/systemjs/dist/system-polyfills.js', + 'node_modules/core-js/client/core.js', 'node_modules/reflect-metadata/Reflect.js', + 'node_modules/zone.js/dist/zone.js', 'node_modules/zone.js/dist/long-stack-trace-zone.js', 'node_modules/zone.js/dist/proxy.js', @@ -22,7 +24,7 @@ module.exports = function(config) { 'node_modules/zone.js/dist/jasmine-patch.js', 'node_modules/zone.js/dist/async-test.js', 'node_modules/zone.js/dist/fake-async-test.js', - {pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: true, watched: false }, + {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true}, {pattern: 'karma-systemjs-config.js', included: true, watched: true}, diff --git a/package.json b/package.json index 06be31a83..72cc99f72 100644 --- a/package.json +++ b/package.json @@ -23,13 +23,13 @@ }, "homepage": "https://github.com/SebastianM/angular2-google-maps#readme", "dependencies": { - "@angular/common": "2.0.0-rc.6", - "@angular/compiler": "2.0.0-rc.6", - "@angular/core": "2.0.0-rc.6", - "@angular/platform-browser": "2.0.0-rc.6", - "@angular/platform-browser-dynamic": "2.0.0-rc.6", - "rxjs": "5.0.0-beta.11", - "zone.js": "^0.6.17" + "@angular/common": "^2.0.0", + "@angular/compiler": "^2.0.0", + "@angular/core": "^2.0.0", + "@angular/platform-browser": "^2.0.0", + "@angular/platform-browser-dynamic": "^2.0.0", + "rxjs": "^5.0.0-beta.12", + "zone.js": "^0.6.21" }, "devDependencies": { "babel-eslint": "6.0.4", @@ -70,13 +70,13 @@ "jspm": { "jspmNodeConversion": false, "dependencies": { - "@angular/common": "2.0.0-rc.6", - "@angular/compiler": "2.0.0-rc.6", - "@angular/core": "2.0.0-rc.6", - "@angular/platform-browser": "2.0.0-rc.6", - "@angular/platform-browser-dynamic": "2.0.0-rc.6", - "rxjs": "5.0.0-beta.11", - "zone.js": "^0.6.17" + "@angular/common": "^2.0.0", + "@angular/compiler": "^2.0.0", + "@angular/core": "^2.0.0", + "@angular/platform-browser": "^2.0.0", + "@angular/platform-browser-dynamic": "^2.0.0", + "rxjs": "^5.0.0-beta.12", + "zone.js": "^0.6.21" } } }