Skip to content

Commit

Permalink
feat: support angular 2.0.0-rc.5
Browse files Browse the repository at this point in the history
Closes #564
  • Loading branch information
sebholstein committed Aug 15, 2016
1 parent a0ba861 commit 43df74e
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 23 deletions.
4 changes: 2 additions & 2 deletions karma-test-shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ System.import('base/karma-systemjs-config.js').then(function() {
var testing = providers[0];
var testingBrowser = providers[1];

testing.setBaseTestProviders(testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
testing.TestBed.initTestEnvironment(testingBrowser.BrowserDynamicTestingModule,
testingBrowser.platformBrowserDynamicTesting());
});
}).then(function() {
return Promise.all(
Expand Down
9 changes: 4 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ module.exports = function(config) {
}
},
files: [
{pattern: 'node_modules/es6-shim/es6-shim.js', included: true, watched: true},
{pattern: 'node_modules/core-js/client/core.js', included: true, watched: true},
{pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: true},
//Needed for async testsing {https://github.com/angular/angular/issues/8232}
// Needed for async testsing {https://github.com/angular/angular/issues/8232}
{pattern: 'node_modules/zone.js/dist/async-test.js', included: true, watched: true},
{pattern: 'node_modules/reflect-metadata/Reflect.js', included: true, watched: true},
{pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: true, watched: false },
{pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: true},

Expand All @@ -38,8 +37,8 @@ module.exports = function(config) {

// paths loaded via Angular's component compiler
// (these paths need to be rewritten, see proxies section)
{pattern: 'dist/**/*.html', included: false, watched: true},
{pattern: 'dist/**/*.css', included: false, watched: true},
// {pattern: 'dist/**/*.html', included: false, watched: true},
// {pattern: 'dist/**/*.css', included: false, watched: true},

// paths to support debugging with source maps in dev tools
{pattern: 'dist/**/*.ts', included: false, watched: false},
Expand Down
26 changes: 14 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
},
"homepage": "https://github.com/SebastianM/angular2-google-maps#readme",
"dependencies": {
"@angular/common": "2.0.0-rc.4",
"@angular/compiler": "2.0.0-rc.4",
"@angular/core": "2.0.0-rc.4",
"@angular/platform-browser": "2.0.0-rc.4",
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
"es6-shim": "^0.35.0",
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/http": "2.0.0-rc.5",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.12"
Expand Down Expand Up @@ -72,12 +73,13 @@
"jspm": {
"jspmNodeConversion": false,
"dependencies": {
"@angular/common": "2.0.0-rc.4",
"@angular/compiler": "2.0.0-rc.4",
"@angular/core": "2.0.0-rc.4",
"@angular/platform-browser": "2.0.0-rc.4",
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
"es6-shim": "^0.35.0",
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/http": "2.0.0-rc.5",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"core-js": "^2.4.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.12"
Expand Down
2 changes: 1 addition & 1 deletion test/services/managers/marker-manager.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NgZone} from '@angular/core';
import {addProviders, async, describe, inject, it} from '@angular/core/testing';
import {addProviders, async, inject} from '@angular/core/testing';

import {SebmGoogleMapMarker} from '../../../src/core/directives/google-map-marker';
import {GoogleMapsAPIWrapper} from '../../../src/core/services/google-maps-api-wrapper';
Expand Down
2 changes: 1 addition & 1 deletion test/services/maps-api-loader/lazy-maps-api-loader.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {addProviders, describe, inject, it} from '@angular/core/testing';
import {addProviders, inject} from '@angular/core/testing';

import {LazyMapsAPILoader} from '../../../src/core/services/maps-api-loader/lazy-maps-api-loader';
import {MapsAPILoader} from '../../../src/core/services/maps-api-loader/maps-api-loader';
Expand Down
6 changes: 4 additions & 2 deletions typings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"name": "angular2-google-maps",
"globalDevDependencies": {
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4"
"jasmine": "registry:dt/jasmine#2.2.0+20160505161446"
},
"globalDependencies": {
"core-js": "registry:dt/core-js#0.0.0+20160317120654"
}
}

0 comments on commit 43df74e

Please sign in to comment.