Skip to content

Commit

Permalink
feat(angular): support RC6
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Lewis committed Sep 3, 2016
1 parent 1f9c33b commit d5b18cc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = function(config) {

// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['mocha'],
frameworks: ['jasmine'],

// list of files / patterns to load in the browser
files: [
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
},
"homepage": "https://github.com/mattlewis92/angular2-resizable#readme",
"devDependencies": {
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"@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",
"chai": "~3.5.0",
"commitizen": "~2.8.1",
"concurrently": "~2.2.0",
Expand All @@ -51,17 +51,17 @@
"es6-shim": "~0.35.0",
"ghooks": "~1.3.2",
"imports-loader": "~0.6.5",
"jasmine-core": "~2.5.0",
"karma": "~1.2.0",
"karma-coverage": "~1.1.0",
"karma-mocha": "~1.1.1",
"karma-jasmine": "~1.0.2",
"karma-phantomjs-launcher": "~1.0.0",
"karma-remap-istanbul": "~0.2.1",
"karma-sourcemap-loader": "~0.3.7",
"karma-webpack": "~1.8.0",
"mocha": "~3.0.2",
"phantomjs-prebuilt": "~2.1.7",
"reflect-metadata": "~0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.11",
"sinon": "~1.17.4",
"sinon-chai": "~2.8.0",
"sourcemap-istanbul-instrumenter-loader": "~0.2.0",
Expand All @@ -78,7 +78,7 @@
"zone.js": "~0.6.12"
},
"peerDependencies": {
"@angular/core": "2.0.0-rc.5"
"@angular/core": ">=2.0.0-rc.5 <=2.0.0-rc.6"
},
"files": [
"angular2-resizable.js",
Expand Down
4 changes: 4 additions & 0 deletions test/entry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import 'reflect-metadata';
import 'zone.js/dist/zone';
import 'zone.js/dist/long-stack-trace-zone';
import 'zone.js/dist/async-test';
import 'zone.js/dist/fake-async-test';
import 'zone.js/dist/sync-test';
import 'zone.js/dist/proxy';
import 'zone.js/dist/jasmine-patch';
import 'rxjs';
import {
TestBed
Expand Down
2 changes: 1 addition & 1 deletion typings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"globalDevDependencies": {
"chai": "registry:dt/chai#3.4.0+20160601211834",
"mocha": "registry:dt/mocha#2.2.5+20160720003353",
"jasmine": "registry:dt/jasmine#2.2.0+20160621224255",
"sinon": "registry:dt/sinon#1.16.0+20160517064723",
"sinon-chai": "registry:dt/sinon-chai#2.7.0+20160317120654"
}
Expand Down

0 comments on commit d5b18cc

Please sign in to comment.